lkml.org 
[lkml]   [2022]   [Jun]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.18 127/181] f2fs: attach inline_data after setting compression
    Date
    From: Jaegeuk Kim <jaegeuk@kernel.org>

    commit 4cde00d50707c2ef6647b9b96b2cb40b6eb24397 upstream.

    This fixes the below corruption.

    [345393.335389] F2FS-fs (vdb): sanity_check_inode: inode (ino=6d0, mode=33206) should not have inline_data, run fsck to fix

    Cc: <stable@vger.kernel.org>
    Fixes: 677a82b44ebf ("f2fs: fix to do sanity check for inline inode")
    Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    fs/f2fs/namei.c | 17 +++++++++++------
    1 file changed, 11 insertions(+), 6 deletions(-)

    --- a/fs/f2fs/namei.c
    +++ b/fs/f2fs/namei.c
    @@ -92,8 +92,6 @@ static struct inode *f2fs_new_inode(stru
    if (test_opt(sbi, INLINE_XATTR))
    set_inode_flag(inode, FI_INLINE_XATTR);

    - if (test_opt(sbi, INLINE_DATA) && f2fs_may_inline_data(inode))
    - set_inode_flag(inode, FI_INLINE_DATA);
    if (f2fs_may_inline_dentry(inode))
    set_inode_flag(inode, FI_INLINE_DENTRY);

    @@ -110,10 +108,6 @@ static struct inode *f2fs_new_inode(stru

    f2fs_init_extent_tree(inode, NULL);

    - stat_inc_inline_xattr(inode);
    - stat_inc_inline_inode(inode);
    - stat_inc_inline_dir(inode);
    -
    F2FS_I(inode)->i_flags =
    f2fs_mask_flags(mode, F2FS_I(dir)->i_flags & F2FS_FL_INHERITED);

    @@ -130,6 +124,14 @@ static struct inode *f2fs_new_inode(stru
    set_compress_context(inode);
    }

    + /* Should enable inline_data after compression set */
    + if (test_opt(sbi, INLINE_DATA) && f2fs_may_inline_data(inode))
    + set_inode_flag(inode, FI_INLINE_DATA);
    +
    + stat_inc_inline_xattr(inode);
    + stat_inc_inline_inode(inode);
    + stat_inc_inline_dir(inode);
    +
    f2fs_set_inode_flags(inode);

    trace_f2fs_new_inode(inode, 0);
    @@ -328,6 +330,9 @@ static void set_compress_inode(struct f2
    if (!is_extension_exist(name, ext[i], false))
    continue;

    + /* Do not use inline_data with compression */
    + stat_dec_inline_inode(inode);
    + clear_inode_flag(inode, FI_INLINE_DATA);
    set_compress_context(inode);
    return;
    }

    \
     
     \ /
      Last update: 2022-06-27 13:59    [W:4.257 / U:0.160 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site