mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-27 21:03:32 +00:00
libfs: Add simple_offset_rename() API
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>
This commit is contained in:
parent
23cdd0eed3
commit
5a1a25be99
3 changed files with 24 additions and 2 deletions
21
fs/libfs.c
21
fs/libfs.c
|
@ -357,6 +357,27 @@ int simple_offset_empty(struct dentry *dentry)
|
||||||
return ret;
|
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
|
* simple_offset_rename_exchange - exchange rename with directory offsets
|
||||||
* @old_dir: parent of dentry being moved
|
* @old_dir: parent of dentry being moved
|
||||||
|
|
|
@ -3338,6 +3338,8 @@ void simple_offset_init(struct offset_ctx *octx);
|
||||||
int simple_offset_add(struct offset_ctx *octx, struct dentry *dentry);
|
int simple_offset_add(struct offset_ctx *octx, struct dentry *dentry);
|
||||||
void simple_offset_remove(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_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,
|
int simple_offset_rename_exchange(struct inode *old_dir,
|
||||||
struct dentry *old_dentry,
|
struct dentry *old_dentry,
|
||||||
struct inode *new_dir,
|
struct inode *new_dir,
|
||||||
|
|
|
@ -3473,8 +3473,7 @@ static int shmem_rename2(struct mnt_idmap *idmap,
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
|
|
||||||
simple_offset_remove(shmem_get_offset_ctx(old_dir), old_dentry);
|
error = simple_offset_rename(old_dir, old_dentry, new_dir, new_dentry);
|
||||||
error = simple_offset_add(shmem_get_offset_ctx(new_dir), old_dentry);
|
|
||||||
if (error)
|
if (error)
|
||||||
return error;
|
return error;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue