From: Chuck Lever chuck.lever@oracle.com
mainline inclusion from mainline-v6.10-rc1 commit 5a1a25be995e1014abd01600479915683e356f5c bugzilla: https://gitee.com/src-openeuler/kernel/issues/IANSAC
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?i...
--------------------------------
I'm about to fix a tmpfs rename bug that requires the use of internal simple_offset helpers that are not available in mm/shmem.c
Signed-off-by: Chuck Lever chuck.lever@oracle.com Link: https://lore.kernel.org/r/20240415152057.4605-3-cel@kernel.org Signed-off-by: Christian Brauner brauner@kernel.org Conflicts: fs/libfs.c include/linux/fs.h [Context differences] Signed-off-by: Yifan Qiao qiaoyifan4@huawei.com --- include/linux/fs.h | 2 ++ fs/libfs.c | 21 +++++++++++++++++++++ mm/shmem.c | 3 +-- 3 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/include/linux/fs.h b/include/linux/fs.h index e4ea5c34b90c..60541d17d038 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -3255,6 +3255,8 @@ struct offset_ctx { void simple_offset_init(struct offset_ctx *octx); int simple_offset_add(struct offset_ctx *octx, struct dentry *dentry); void simple_offset_remove(struct offset_ctx *octx, struct dentry *dentry); +int simple_offset_rename(struct inode *old_dir, struct dentry *old_dentry, + struct inode *new_dir, struct dentry *new_dentry); int simple_offset_rename_exchange(struct inode *old_dir, struct dentry *old_dentry, struct inode *new_dir, diff --git a/fs/libfs.c b/fs/libfs.c index 4e50155d317c..8dd6e0e37e9c 100644 --- a/fs/libfs.c +++ b/fs/libfs.c @@ -321,6 +321,27 @@ void simple_offset_remove(struct offset_ctx *octx, struct dentry *dentry) offset_set(dentry, 0); }
+/** + * simple_offset_rename - handle directory offsets for rename + * @old_dir: parent directory of source entry + * @old_dentry: dentry of source entry + * @new_dir: parent_directory of destination entry + * @new_dentry: dentry of destination + * + * Caller provides appropriate serialization. + * + * Returns zero on success, a negative errno value on failure. + */ +int simple_offset_rename(struct inode *old_dir, struct dentry *old_dentry, + struct inode *new_dir, struct dentry *new_dentry) +{ + struct offset_ctx *old_ctx = old_dir->i_op->get_offset_ctx(old_dir); + struct offset_ctx *new_ctx = new_dir->i_op->get_offset_ctx(new_dir); + + simple_offset_remove(old_ctx, old_dentry); + return simple_offset_add(new_ctx, old_dentry); +} + /** * simple_offset_rename_exchange - exchange rename with directory offsets * @old_dir: parent of dentry being moved diff --git a/mm/shmem.c b/mm/shmem.c index 0b82806727cf..f259850950fb 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -3448,8 +3448,7 @@ static int shmem_rename2(struct mnt_idmap *idmap, return error; }
- simple_offset_remove(shmem_get_offset_ctx(old_dir), old_dentry); - error = simple_offset_add(shmem_get_offset_ctx(new_dir), old_dentry); + error = simple_offset_rename(old_dir, old_dentry, new_dir, new_dentry); if (error) return error;