* [f2fs-dev] [PATCH v3 2/2] f2fs: cleanup F2FS_I_SB in f2fs_setattr()
2025-06-18 6:43 [f2fs-dev] [PATCH v3 1/2] f2fs: don't allow unaligned truncation to smaller/equal size on pinned file wangzijie
@ 2025-06-18 6:43 ` wangzijie
2025-06-23 17:54 ` [f2fs-dev] [PATCH v3 1/2] f2fs: don't allow unaligned truncation to smaller/equal size on pinned file Jaegeuk Kim via Linux-f2fs-devel
1 sibling, 0 replies; 3+ messages in thread
From: wangzijie @ 2025-06-18 6:43 UTC (permalink / raw)
To: jaegeuk, chao; +Cc: feng.han, linux-kernel, linux-f2fs-devel, wangzijie
After introduce sbi in f2fs_setattr(), cleanup F2FS_I_SB. No logic change.
Signed-off-by: wangzijie <wangzijie1@honor.com>
---
fs/f2fs/file.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index 9e0f1c98f..4809f0fd6 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -1029,7 +1029,7 @@ int f2fs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
int err;
- if (unlikely(f2fs_cp_error(F2FS_I_SB(inode))))
+ if (unlikely(f2fs_cp_error(sbi)))
return -EIO;
if (unlikely(IS_IMMUTABLE(inode)))
@@ -1080,12 +1080,11 @@ int f2fs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
}
if (i_uid_needs_update(idmap, attr, inode) ||
i_gid_needs_update(idmap, attr, inode)) {
- f2fs_lock_op(F2FS_I_SB(inode));
+ f2fs_lock_op(sbi);
err = dquot_transfer(idmap, inode, attr);
if (err) {
- set_sbi_flag(F2FS_I_SB(inode),
- SBI_QUOTA_NEED_REPAIR);
- f2fs_unlock_op(F2FS_I_SB(inode));
+ set_sbi_flag(sbi, SBI_QUOTA_NEED_REPAIR);
+ f2fs_unlock_op(sbi);
return err;
}
/*
@@ -1095,7 +1094,7 @@ int f2fs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
i_uid_update(idmap, attr, inode);
i_gid_update(idmap, attr, inode);
f2fs_mark_inode_dirty_sync(inode, true);
- f2fs_unlock_op(F2FS_I_SB(inode));
+ f2fs_unlock_op(sbi);
}
if (attr->ia_valid & ATTR_SIZE) {
@@ -1156,7 +1155,7 @@ int f2fs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
f2fs_mark_inode_dirty_sync(inode, true);
/* inode change will produce dirty node pages flushed by checkpoint */
- f2fs_balance_fs(F2FS_I_SB(inode), true);
+ f2fs_balance_fs(sbi, true);
return err;
}
--
2.25.1
_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [f2fs-dev] [PATCH v3 1/2] f2fs: don't allow unaligned truncation to smaller/equal size on pinned file
2025-06-18 6:43 [f2fs-dev] [PATCH v3 1/2] f2fs: don't allow unaligned truncation to smaller/equal size on pinned file wangzijie
2025-06-18 6:43 ` [f2fs-dev] [PATCH v3 2/2] f2fs: cleanup F2FS_I_SB in f2fs_setattr() wangzijie
@ 2025-06-23 17:54 ` Jaegeuk Kim via Linux-f2fs-devel
1 sibling, 0 replies; 3+ messages in thread
From: Jaegeuk Kim via Linux-f2fs-devel @ 2025-06-23 17:54 UTC (permalink / raw)
To: wangzijie; +Cc: feng.han, linux-kernel, linux-f2fs-devel
Hi,
Please do sbi conversion first, and apply this change.
On 06/18, wangzijie wrote:
> To prevent scattered pin block generation, don't allow non-section aligned truncation
> to smaller or equal size on pinned file. But for truncation to larger size, after
> commit 3fdd89b452c2("f2fs: prevent writing without fallocate() for pinned files"),
> we only support overwrite IO to pinned file, so we don't need to consider
> attr->ia_size > i_size case.
>
> Signed-off-by: wangzijie <wangzijie1@honor.com>
> ---
> v3:
> - cover attr->ia_size == i_size case
> v2:
> - add comments and change a proper subject
> ---
> fs/f2fs/file.c | 12 ++++++++++++
> 1 file changed, 12 insertions(+)
>
> diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
> index 6bd3de64f..9e0f1c98f 100644
> --- a/fs/f2fs/file.c
> +++ b/fs/f2fs/file.c
> @@ -1026,6 +1026,7 @@ int f2fs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
> {
> struct inode *inode = d_inode(dentry);
> struct f2fs_inode_info *fi = F2FS_I(inode);
> + struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
> int err;
>
> if (unlikely(f2fs_cp_error(F2FS_I_SB(inode))))
> @@ -1047,6 +1048,17 @@ int f2fs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
> !IS_ALIGNED(attr->ia_size,
> F2FS_BLK_TO_BYTES(fi->i_cluster_size)))
> return -EINVAL;
> + /*
> + * To prevent scattered pin block generation, we don't allow
> + * smaller/equal size unaligned truncation for pinned file.
> + * We only support overwrite IO to pinned file, so don't
> + * care about larger size truncation.
> + */
> + if (f2fs_is_pinned_file(inode) &&
> + attr->ia_size <= i_size_read(inode) &&
> + !IS_ALIGNED(attr->ia_size,
> + F2FS_BLK_TO_BYTES(CAP_BLKS_PER_SEC(sbi))))
> + return -EINVAL;
> }
>
> err = setattr_prepare(idmap, dentry, attr);
> --
> 2.25.1
_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
^ permalink raw reply [flat|nested] 3+ messages in thread