Unverified Commit bc924136 authored by NeilBrown's avatar NeilBrown Committed by Christian Brauner
Browse files

VFS: change old_dir and new_dir in struct renamedata to dentrys 



all users of 'struct renamedata' have the dentry for the old and new
directories, and often have no use for the inode except to store it in
the renamedata.

This patch changes struct renamedata to hold the dentry, rather than
the inode, for the old and new directories, and changes callers to
match.  The names are also changed from a _dir suffix to _parent.  This
is consistent with other usage in namei.c and elsewhere.

This results in the removal of several local variables and several
dereferences of ->d_inode at the cost of adding ->d_inode dereferences
to vfs_rename().

Acked-by: default avatarMiklos Szeredi <miklos@szeredi.hu>
Reviewed-by: default avatarChuck Lever <chuck.lever@oracle.com>
Reviewed-by: default avatarNamjae Jeon <linkinjeon@kernel.org>
Signed-off-by: default avatarNeilBrown <neil@brown.name>
Link: https://lore.kernel.org/174977089072.608730.4244531834577097454@noble.neil.brown.name


Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent b5ba648a

fs/cachefiles/namei.c

+2 −2
Original line number Diff line number Diff line
@@ -388,10 +388,10 @@ int cachefiles_bury_object(struct cachefiles_cache *cache, 
	} else {

		struct renamedata rd = {

			.old_mnt_idmap	= &nop_mnt_idmap,

			.old_dir	= d_inode(dir),

			.old_parent	= dir,

			.old_dentry	= rep,

			.new_mnt_idmap	= &nop_mnt_idmap,

			.new_dir	= d_inode(cache->graveyard),

			.new_parent	= cache->graveyard,

			.new_dentry	= grave,

		};

		trace_cachefiles_rename(object, d_inode(rep)->i_ino, why);

fs/ecryptfs/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -635,10 +635,10 @@ ecryptfs_rename(struct mnt_idmap *idmap, struct inode *old_dir, 
	}



	rd.old_mnt_idmap	= &nop_mnt_idmap;

	rd.old_dir		= d_inode(lower_old_dir_dentry);

	rd.old_parent		= lower_old_dir_dentry;

	rd.old_dentry		= lower_old_dentry;

	rd.new_mnt_idmap	= &nop_mnt_idmap;

	rd.new_dir		= d_inode(lower_new_dir_dentry);

	rd.new_parent		= lower_new_dir_dentry;

	rd.new_dentry		= lower_new_dentry;

	rc = vfs_rename(&rd);

	if (rc)

fs/namei.c

+4 −3
Original line number Diff line number Diff line
@@ -5007,7 +5007,8 @@ SYSCALL_DEFINE2(link, const char __user *, oldname, const char __user *, newname 
int vfs_rename(struct renamedata *rd)

{

	int error;

	struct inode *old_dir = rd->old_dir, *new_dir = rd->new_dir;

	struct inode *old_dir = d_inode(rd->old_parent);

	struct inode *new_dir = d_inode(rd->new_parent);

	struct dentry *old_dentry = rd->old_dentry;

	struct dentry *new_dentry = rd->new_dentry;

	struct inode **delegated_inode = rd->delegated_inode;
@@ -5266,10 +5267,10 @@ int do_renameat2(int olddfd, struct filename *from, int newdfd, 
	if (error)

		goto exit5;



	rd.old_dir	   = old_path.dentry->d_inode;

	rd.old_parent	   = old_path.dentry;

	rd.old_dentry	   = old_dentry;

	rd.old_mnt_idmap   = mnt_idmap(old_path.mnt);

	rd.new_dir	   = new_path.dentry->d_inode;

	rd.new_parent	   = new_path.dentry;

	rd.new_dentry	   = new_dentry;

	rd.new_mnt_idmap   = mnt_idmap(new_path.mnt);

	rd.delegated_inode = &delegated_inode;

fs/nfsd/vfs.c

+2 −5
Original line number Diff line number Diff line
@@ -1864,7 +1864,6 @@ nfsd_rename(struct svc_rqst *rqstp, struct svc_fh *ffhp, char *fname, int flen, 
			    struct svc_fh *tfhp, char *tname, int tlen)

{

	struct dentry	*fdentry, *tdentry, *odentry, *ndentry, *trap;

	struct inode	*fdir, *tdir;

	int		type = S_IFDIR;

	__be32		err;

	int		host_err;
@@ -1880,10 +1879,8 @@ nfsd_rename(struct svc_rqst *rqstp, struct svc_fh *ffhp, char *fname, int flen, 
		goto out;



	fdentry = ffhp->fh_dentry;

	fdir = d_inode(fdentry);



	tdentry = tfhp->fh_dentry;

	tdir = d_inode(tdentry);



	err = nfserr_perm;

	if (!flen || isdotent(fname, flen) || !tlen || isdotent(tname, tlen))
@@ -1944,10 +1941,10 @@ nfsd_rename(struct svc_rqst *rqstp, struct svc_fh *ffhp, char *fname, int flen, 
	} else {

		struct renamedata rd = {

			.old_mnt_idmap	= &nop_mnt_idmap,

			.old_dir	= fdir,

			.old_parent	= fdentry,

			.old_dentry	= odentry,

			.new_mnt_idmap	= &nop_mnt_idmap,

			.new_dir	= tdir,

			.new_parent	= tdentry,

			.new_dentry	= ndentry,

		};

		int retries;

fs/overlayfs/copy_up.c

+3 −3
Original line number Diff line number Diff line
@@ -563,7 +563,7 @@ static int ovl_create_index(struct dentry *dentry, const struct ovl_fh *fh, 
	if (IS_ERR(index)) {

		err = PTR_ERR(index);

	} else {

		err = ovl_do_rename(ofs, dir, temp, dir, index, 0);

		err = ovl_do_rename(ofs, indexdir, temp, indexdir, index, 0);

		dput(index);

	}

out:
@@ -762,7 +762,7 @@ static int ovl_copy_up_workdir(struct ovl_copy_up_ctx *c) 
{

	struct ovl_fs *ofs = OVL_FS(c->dentry->d_sb);

	struct inode *inode;

	struct inode *udir = d_inode(c->destdir), *wdir = d_inode(c->workdir);

	struct inode *wdir = d_inode(c->workdir);

	struct path path = { .mnt = ovl_upper_mnt(ofs) };

	struct dentry *temp, *upper, *trap;

	struct ovl_cu_creds cc;
@@ -829,7 +829,7 @@ static int ovl_copy_up_workdir(struct ovl_copy_up_ctx *c) 
	if (IS_ERR(upper))

		goto cleanup;



	err = ovl_do_rename(ofs, wdir, temp, udir, upper, 0);

	err = ovl_do_rename(ofs, c->workdir, temp, c->destdir, upper, 0);

	dput(upper);

	if (err)

		goto cleanup;