On 06/22, Chao Yu wrote:
> On 2022/6/19 8:35, Chao Yu wrote:
> > On 2022/6/18 6:31, 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: <sta...@vger.kernel.org>
> > > Fixes: 677a82b44ebf ("f2fs: fix to do sanity check for inline inode")
> > > Signed-off-by: Jaegeuk Kim <jaeg...@kernel.org>
> > > ---
> > >    fs/f2fs/namei.c | 16 ++++++++++------
> > >    1 file changed, 10 insertions(+), 6 deletions(-)
> > > 
> > > diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c
> > > index c549acb52ac4..a841abe6a071 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,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);
> > 
> > if (is_inode_set_flag()) {
> >     clear_inode_flag();
> >     stat_dec_inline_inode();
> > }
> 
> Missed to send new version to mailing list?
> 
> https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git/commit/?h=dev&id=4cde00d50707c2ef6647b9b96b2cb40b6eb24397

I'm testing the new version.

> 
> Thanks,
> 
> > 
> > Thanks,
> > 
> > >                   set_compress_context(inode);
> > >                   return;
> > >           }
> > 
> > 
> > _______________________________________________
> > Linux-f2fs-devel mailing list
> > Linux-f2fs-devel@lists.sourceforge.net
> > https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel


_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

Reply via email to