Commit f2c2c552 authored by Trond Myklebust's avatar Trond Myklebust Committed by Anna Schumaker
Browse files

NFS: Move delegation recall into the NFSv4 callback for rename_setup() 



Move the delegation recall out of the generic code, and into the NFSv4
specific callback.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 912678db

fs/nfs/dir.c

+0 −4
Original line number Diff line number Diff line
@@ -2020,10 +2020,6 @@ int nfs_rename(struct inode *old_dir, struct dentry *old_dentry, 
		}

	}



	NFS_PROTO(old_inode)->return_delegation(old_inode);

	if (new_inode != NULL)

		NFS_PROTO(new_inode)->return_delegation(new_inode);



	task = nfs_async_rename(old_dir, new_dir, old_dentry, new_dentry, NULL);

	if (IS_ERR(task)) {

		error = PTR_ERR(task);

fs/nfs/nfs3proc.c

+3 −1
Original line number Diff line number Diff line
@@ -433,7 +433,9 @@ nfs3_proc_unlink_done(struct rpc_task *task, struct inode *dir) 
}



static void

nfs3_proc_rename_setup(struct rpc_message *msg, struct inode *dir)

nfs3_proc_rename_setup(struct rpc_message *msg,

		struct dentry *old_dentry,

		struct dentry *new_dentry)

{

	msg->rpc_proc = &nfs3_procedures[NFS3PROC_RENAME];

}

fs/nfs/nfs4proc.c

+10 −3
Original line number Diff line number Diff line
@@ -4267,14 +4267,21 @@ static int nfs4_proc_unlink_done(struct rpc_task *task, struct inode *dir) 
	return 1;

}



static void nfs4_proc_rename_setup(struct rpc_message *msg, struct inode *dir)

static void nfs4_proc_rename_setup(struct rpc_message *msg,

		struct dentry *old_dentry,

		struct dentry *new_dentry)

{

	struct nfs_server *server = NFS_SERVER(dir);

	struct nfs_renameargs *arg = msg->rpc_argp;

	struct nfs_renameres *res = msg->rpc_resp;

	struct inode *old_inode = d_inode(old_dentry);

	struct inode *new_inode = d_inode(new_dentry);



	if (old_inode)

		nfs4_inode_return_delegation(old_inode);

	if (new_inode)

		nfs4_inode_return_delegation(new_inode);

	msg->rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_RENAME];

	res->server = server;

	res->server = NFS_SB(old_dentry->d_sb);

	nfs4_init_sequence(&arg->seq_args, &res->seq_res, 1);

}

fs/nfs/proc.c

+3 −1
Original line number Diff line number Diff line
@@ -338,7 +338,9 @@ static int nfs_proc_unlink_done(struct rpc_task *task, struct inode *dir) 
}



static void

nfs_proc_rename_setup(struct rpc_message *msg, struct inode *dir)

nfs_proc_rename_setup(struct rpc_message *msg,

		struct dentry *old_dentry,

		struct dentry *new_dentry)

{

	msg->rpc_proc = &nfs_procedures[NFSPROC_RENAME];

}

fs/nfs/unlink.c

+1 −4
Original line number Diff line number Diff line
@@ -386,7 +386,7 @@ nfs_async_rename(struct inode *old_dir, struct inode *new_dir, 


	nfs_sb_active(old_dir->i_sb);



	NFS_PROTO(data->old_dir)->rename_setup(&msg, old_dir);

	NFS_PROTO(data->old_dir)->rename_setup(&msg, old_dentry, new_dentry);



	return rpc_run_task(&task_setup_data);

}
@@ -463,9 +463,6 @@ nfs_sillyrename(struct inode *dir, struct dentry *dentry) 


	fileid = NFS_FILEID(d_inode(dentry));



	/* Return delegation in anticipation of the rename */

	NFS_PROTO(d_inode(dentry))->return_delegation(d_inode(dentry));



	sdentry = NULL;

	do {

		int slen;