f2fs: attach inline_data after setting compression
Jaegeuk Kim
maintainerPATCH 1/1 f2fs: attach inline_data after setting compression
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
Fixes 677a82b44ebf ("f2fs: fix to do sanity check for inline inode")
Signed-off-by Jaegeuk Kim <[email protected]>
--- fs/f2fs/namei.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
fs/f2fs/namei.c +10 -6
@@ -89,8 +89,6 @@ static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns,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 );
@@ -107,10 +105,6 @@ static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns,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 );
@@ -127,6 +121,14 @@ static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns,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 );
@@ -325,6 +327,8 @@ static void set_compress_inode(struct f2fs_sb_info *sbi, struct inode *inode,if (!is_extension_exist (name, ext[i], false))continue ; +/* Do not use inline_data with compression */ +clear_inode_flag (inode,FI_INLINE_DATA );set_compress_context (inode);return ; }
Signature · 1 line
2.36.1.255.ge46751e96f-goog