Friendly ping... On Fri, Oct 21, 2022 at 10:31:36AM +0800, qixiaoyu1 wrote: > Currently IPU policy for fdatasync is coupled with F2FS_IPU_FSYNC. > Fix to apply it to all IPU policy. > > Signed-off-by: qixiaoyu1 <qixiao...@xiaomi.com> > --- > fs/f2fs/data.c | 8 +++----- > fs/f2fs/file.c | 4 +++- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c > index a71e818cd67b..fec8e15fe820 100644 > --- a/fs/f2fs/data.c > +++ b/fs/f2fs/data.c > @@ -2518,6 +2518,9 @@ static inline bool check_inplace_update_policy(struct > inode *inode, > if (policy & (0x1 << F2FS_IPU_HONOR_OPU_WRITE) && > is_inode_flag_set(inode, FI_OPU_WRITE)) > return false; > + /* this is set by fdatasync or F2FS_IPU_FSYNC policy */ > + if (is_inode_flag_set(inode, FI_NEED_IPU)) > + return true; > if (policy & (0x1 << F2FS_IPU_FORCE)) > return true; > if (policy & (0x1 << F2FS_IPU_SSR) && f2fs_need_SSR(sbi)) > @@ -2538,11 +2541,6 @@ static inline bool check_inplace_update_policy(struct > inode *inode, > !IS_ENCRYPTED(inode)) > return true; > > - /* this is only set during fdatasync */ > - if (policy & (0x1 << F2FS_IPU_FSYNC) && > - is_inode_flag_set(inode, FI_NEED_IPU)) > - return true; > - > if (unlikely(fio && is_sbi_flag_set(sbi, SBI_CP_DISABLED) && > !f2fs_is_checkpointed_data(sbi, fio->old_blkaddr))) > return true; > diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c > index 82cda1258227..08091550cdf2 100644 > --- a/fs/f2fs/file.c > +++ b/fs/f2fs/file.c > @@ -270,8 +270,10 @@ static int f2fs_do_sync_file(struct file *file, loff_t > start, loff_t end, > goto go_write; > > /* if fdatasync is triggered, let's do in-place-update */ > - if (datasync || get_dirty_pages(inode) <= SM_I(sbi)->min_fsync_blocks) > + if (datasync || (SM_I(sbi)->ipu_policy & (0x1 << F2FS_IPU_FSYNC) && > + get_dirty_pages(inode) <= SM_I(sbi)->min_fsync_blocks)) > set_inode_flag(inode, FI_NEED_IPU); > + > ret = file_write_and_wait_range(file, start, end); > clear_inode_flag(inode, FI_NEED_IPU); > > -- > 2.36.1 >
_______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
