Messages in this thread | | | Date | Tue, 28 Jun 2022 15:46:28 +0800 | Subject | Re: [f2fs-dev] [PATCH 1/3 v2] f2fs: attach inline_data after setting compression | From | Chao Yu <> |
| |
On 2022/6/23 0:53, Jaegeuk Kim wrote: > 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> > --- > fs/f2fs/namei.c | 17 +++++++++++------ > 1 file changed, 11 insertions(+), 6 deletions(-) > > diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c > index c549acb52ac4..bf00d5057abb 100644 > --- a/fs/f2fs/namei.c > +++ b/fs/f2fs/namei.c > @@ -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,9 @@ 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 */ > + stat_dec_inline_inode(inode); > + clear_inode_flag(inode, FI_INLINE_DATA);
It looks we don't need to dirty inode if there is no inline_data flag.
Thanks,
> set_compress_context(inode); > return; > }
| |