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

trondmypd · amschuma-ntap · commit f2c2c552f119 · 2018-04-10T16:06:22.000-04:00
Move the delegation recall out of the generic code, and into the NFSv4
specific callback.

Signed-off-by: Trond Myklebust &lt;trond.myklebust@primarydata.com&gt;
Signed-off-by: Anna Schumaker &lt;Anna.Schumaker@Netapp.com&gt;
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
@@ -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);
diff --git a/fs/nfs/nfs3proc.c b/fs/nfs/nfs3proc.c
@@ -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];
 }
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
@@ -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);
 }
 
diff --git a/fs/nfs/proc.c b/fs/nfs/proc.c
@@ -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];
 }
diff --git a/fs/nfs/unlink.c b/fs/nfs/unlink.c
@@ -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;
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
@@ -1594,7 +1594,9 @@ struct nfs_rpc_ops {
 	void	(*unlink_setup)  (struct rpc_message *, struct inode *dir);
 	void	(*unlink_rpc_prepare) (struct rpc_task *, struct nfs_unlinkdata *);
 	int	(*unlink_done) (struct rpc_task *, struct inode *);
-	void	(*rename_setup)  (struct rpc_message *msg, struct inode *dir);
+	void	(*rename_setup)  (struct rpc_message *msg,
+			struct dentry *old_dentry,
+			struct dentry *new_dentry);
 	void	(*rename_rpc_prepare)(struct rpc_task *task, struct nfs_renamedata *);
 	int	(*rename_done) (struct rpc_task *task, struct inode *old_dir, struct inode *new_dir);
 	int	(*link)    (struct inode *, struct inode *, const struct qstr *);

Original file line number	Diff line number	Diff line change
`@@ -2020,10 +2020,6 @@ int nfs_rename(struct inode old_dir, struct dentry old_dentry,`
`2020`	`2020`	`}`
`2021`	`2021`	`}`
`2022`	`2022`
`2023`		`- NFS_PROTO(old_inode)->return_delegation(old_inode);`
`2024`		`- if (new_inode != NULL)`
`2025`		`- NFS_PROTO(new_inode)->return_delegation(new_inode);`
`2026`		`-`
`2027`	`2023`	`task = nfs_async_rename(old_dir, new_dir, old_dentry, new_dentry, NULL);`
`2028`	`2024`	`if (IS_ERR(task)) {`
`2029`	`2025`	`error = PTR_ERR(task);`
Original file line number	Diff line number	Diff line change
`@@ -433,7 +433,9 @@ nfs3_proc_unlink_done(struct rpc_task task, struct inode dir)`
`433`	`433`	`}`
`434`	`434`
`435`	`435`	`static void`
`436`		`-nfs3_proc_rename_setup(struct rpc_message msg, struct inode dir)`
	`436`	`+nfs3_proc_rename_setup(struct rpc_message *msg,`
	`437`	`+ struct dentry *old_dentry,`
	`438`	`+ struct dentry *new_dentry)`
`437`	`439`	`{`
`438`	`440`	`msg->rpc_proc = &nfs3_procedures[NFS3PROC_RENAME];`
`439`	`441`	`}`
Original file line number	Diff line number	Diff line change
`@@ -338,7 +338,9 @@ static int nfs_proc_unlink_done(struct rpc_task task, struct inode dir)`
`338`	`338`	`}`
`339`	`339`
`340`	`340`	`static void`
`341`		`-nfs_proc_rename_setup(struct rpc_message msg, struct inode dir)`
	`341`	`+nfs_proc_rename_setup(struct rpc_message *msg,`
	`342`	`+ struct dentry *old_dentry,`
	`343`	`+ struct dentry *new_dentry)`
`342`	`344`	`{`
`343`	`345`	`msg->rpc_proc = &nfs_procedures[NFSPROC_RENAME];`
`344`	`346`	`}`