Commit b0f6c808 authored by Chuck Lever's avatar Chuck Lever Committed by Wen Zhiwei
Browse files

libfs: Add simple_offset_rename() API 

stable inclusion
from stable-v6.6.75
commit 753828d6775e9b2cff8d2b865beae65817fcc5eb
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IBSPQB

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=753828d6775e9b2cff8d2b865beae65817fcc5eb



--------------------------------

[ 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: default avatarChuck Lever <chuck.lever@oracle.com>
Link: https://lore.kernel.org/r/20240415152057.4605-3-cel@kernel.org


Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent eb80da1e

fs/libfs.c

+21 −0
Original line number Diff line number Diff line
@@ -343,6 +343,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

include/linux/fs.h

+2 −0
Original line number Diff line number Diff line
@@ -3287,6 +3287,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,

mm/shmem.c

+1 −2
Original line number Diff line number Diff line
@@ -3775,8 +3775,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;