lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.16 0013/1039] f2fs: avoid EINVAL by SBI_NEED_FSCK when pinning a file
    Date
    From: Jaegeuk Kim <jaegeuk@kernel.org>

    commit 19bdba5265624ba6b9d9dd936a0c6ccc167cfe80 upstream.

    Android OTA failed due to SBI_NEED_FSCK flag when pinning the file. Let's avoid
    it since we can do in-place-updates.

    Cc: stable@vger.kernel.org
    Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    fs/f2fs/data.c | 7 +++++--
    fs/f2fs/file.c | 10 +++++-----
    2 files changed, 10 insertions(+), 7 deletions(-)

    --- a/fs/f2fs/data.c
    +++ b/fs/f2fs/data.c
    @@ -2617,6 +2617,11 @@ bool f2fs_should_update_outplace(struct
    {
    struct f2fs_sb_info *sbi = F2FS_I_SB(inode);

    + /* The below cases were checked when setting it. */
    + if (f2fs_is_pinned_file(inode))
    + return false;
    + if (fio && is_sbi_flag_set(sbi, SBI_NEED_FSCK))
    + return true;
    if (f2fs_lfs_mode(sbi))
    return true;
    if (S_ISDIR(inode->i_mode))
    @@ -2625,8 +2630,6 @@ bool f2fs_should_update_outplace(struct
    return true;
    if (f2fs_is_atomic_file(inode))
    return true;
    - if (is_sbi_flag_set(sbi, SBI_NEED_FSCK))
    - return true;

    /* swap file is migrating in aligned write mode */
    if (is_inode_flag_set(inode, FI_ALIGNED_WRITE))
    --- a/fs/f2fs/file.c
    +++ b/fs/f2fs/file.c
    @@ -3143,17 +3143,17 @@ static int f2fs_ioc_set_pin_file(struct

    inode_lock(inode);

    - if (f2fs_should_update_outplace(inode, NULL)) {
    - ret = -EINVAL;
    - goto out;
    - }
    -
    if (!pin) {
    clear_inode_flag(inode, FI_PIN_FILE);
    f2fs_i_gc_failures_write(inode, 0);
    goto done;
    }

    + if (f2fs_should_update_outplace(inode, NULL)) {
    + ret = -EINVAL;
    + goto out;
    + }
    +
    if (f2fs_pin_file_control(inode, false)) {
    ret = -EAGAIN;
    goto out;

    \
     
     \ /
      Last update: 2022-01-24 23:10    [W:3.248 / U:25.808 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site