libfs: Add simple_offset_rename() API

[ Upstream commit 5a1a25be995e1014abd01600479915683e356f5c ]

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>
Stable-dep-of: ad191eb6d694 ("shmem: Fix shmem_rename2()")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/libfs.c b/fs/libfs.c
index c9516f3e14bb731bba6da8416432bd5376f6a113..bb6731fa63059d10c50c1fb4de8f9aba9ec38334 100644 (file)
--- a/fs/libfs.c
+++ b/fs/libfs.c
@@ -356,6 +356,27 @@ int simple_offset_empty(struct dentry *dentry)
        return ret;
 }
 
+/**
+ * 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/include/linux/fs.h b/include/linux/fs.h
index 3350f875ca91c58c7c7e25b63220f80194021685..10e32c8ef1e9c2e56196df0447e9c8117a154384 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -3268,6 +3268,8 @@ 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_empty(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/mm/shmem.c b/mm/shmem.c
index 0e951fe9f44cc2fb357169a5213120087c6d033a..935f3647bb3a1078adf47dd2a320f22265e7eaff 100644 (file)
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -3434,8 +3434,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;