Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6bfa1a1 authored by Bryan Schumaker's avatar Bryan Schumaker Committed by Trond Myklebust
Browse files

NFS: Remove nfs4_setup_sequence from generic rename code 



This is an NFS v4 specific operation, so it belongs in the NFS v4 code
and not the generic client.

Signed-off-by: default avatarBryan Schumaker <bjschuma@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 34e137cc

fs/nfs/nfs3proc.c

+6 −0
Original line number Diff line number Diff line
@@ -450,6 +450,11 @@ nfs3_proc_rename_setup(struct rpc_message *msg, struct inode *dir) 
	msg->rpc_proc = &nfs3_procedures[NFS3PROC_RENAME];

}



static void nfs3_proc_rename_rpc_prepare(struct rpc_task *task, struct nfs_renamedata *data)

{

	rpc_call_start(task);

}



static int

nfs3_proc_rename_done(struct rpc_task *task, struct inode *old_dir,

		      struct inode *new_dir)
@@ -883,6 +888,7 @@ const struct nfs_rpc_ops nfs_v3_clientops = { 
	.unlink_done	= nfs3_proc_unlink_done,

	.rename		= nfs3_proc_rename,

	.rename_setup	= nfs3_proc_rename_setup,

	.rename_rpc_prepare = nfs3_proc_rename_rpc_prepare,

	.rename_done	= nfs3_proc_rename_done,

	.link		= nfs3_proc_link,

	.symlink	= nfs3_proc_symlink,

fs/nfs/nfs4proc.c

+11 −0
Original line number Diff line number Diff line
@@ -2814,6 +2814,16 @@ static void nfs4_proc_rename_setup(struct rpc_message *msg, struct inode *dir) 
	nfs41_init_sequence(&arg->seq_args, &res->seq_res, 1);

}



static void nfs4_proc_rename_rpc_prepare(struct rpc_task *task, struct nfs_renamedata *data)

{

	if (nfs4_setup_sequence(NFS_SERVER(data->old_dir),

				&data->args.seq_args,

				&data->res.seq_res,

				task))

		return;

	rpc_call_start(task);

}



static int nfs4_proc_rename_done(struct rpc_task *task, struct inode *old_dir,

				 struct inode *new_dir)

{
@@ -6465,6 +6475,7 @@ const struct nfs_rpc_ops nfs_v4_clientops = { 
	.unlink_done	= nfs4_proc_unlink_done,

	.rename		= nfs4_proc_rename,

	.rename_setup	= nfs4_proc_rename_setup,

	.rename_rpc_prepare = nfs4_proc_rename_rpc_prepare,

	.rename_done	= nfs4_proc_rename_done,

	.link		= nfs4_proc_link,

	.symlink	= nfs4_proc_symlink,

fs/nfs/proc.c

+6 −0
Original line number Diff line number Diff line
@@ -377,6 +377,11 @@ nfs_proc_rename_setup(struct rpc_message *msg, struct inode *dir) 
	msg->rpc_proc = &nfs_procedures[NFSPROC_RENAME];

}



static void nfs_proc_rename_rpc_prepare(struct rpc_task *task, struct nfs_renamedata *data)

{

	rpc_call_start(task);

}



static int

nfs_proc_rename_done(struct rpc_task *task, struct inode *old_dir,

		     struct inode *new_dir)
@@ -740,6 +745,7 @@ const struct nfs_rpc_ops nfs_v2_clientops = { 
	.unlink_done	= nfs_proc_unlink_done,

	.rename		= nfs_proc_rename,

	.rename_setup	= nfs_proc_rename_setup,

	.rename_rpc_prepare = nfs_proc_rename_rpc_prepare,

	.rename_done	= nfs_proc_rename_done,

	.link		= nfs_proc_link,

	.symlink	= nfs_proc_symlink,

fs/nfs/unlink.c

+1 −22
Original line number Diff line number Diff line
@@ -323,18 +323,6 @@ nfs_cancel_async_unlink(struct dentry *dentry) 
	spin_unlock(&dentry->d_lock);

}



struct nfs_renamedata {

	struct nfs_renameargs	args;

	struct nfs_renameres	res;

	struct rpc_cred		*cred;

	struct inode		*old_dir;

	struct dentry		*old_dentry;

	struct nfs_fattr	old_fattr;

	struct inode		*new_dir;

	struct dentry		*new_dentry;

	struct nfs_fattr	new_fattr;

};



/**

 * nfs_async_rename_done - Sillyrename post-processing

 * @task: rpc_task of the sillyrename
@@ -385,25 +373,16 @@ static void nfs_async_rename_release(void *calldata) 
	kfree(data);

}



#if defined(CONFIG_NFS_V4_1)

static void nfs_rename_prepare(struct rpc_task *task, void *calldata)

{

	struct nfs_renamedata *data = calldata;

	struct nfs_server *server = NFS_SERVER(data->old_dir);



	if (nfs4_setup_sequence(server, &data->args.seq_args,

				&data->res.seq_res, task))

		return;

	rpc_call_start(task);

	NFS_PROTO(data->old_dir)->rename_rpc_prepare(task, data);

}

#endif /* CONFIG_NFS_V4_1 */



static const struct rpc_call_ops nfs_rename_ops = {

	.rpc_call_done = nfs_async_rename_done,

	.rpc_release = nfs_async_rename_release,

#if defined(CONFIG_NFS_V4_1)

	.rpc_call_prepare = nfs_rename_prepare,

#endif /* CONFIG_NFS_V4_1 */

};



/**

include/linux/nfs_xdr.h

+13 −0
Original line number Diff line number Diff line
@@ -1201,6 +1201,18 @@ struct nfs_unlinkdata { 
	struct nfs_fattr dir_attr;

};



struct nfs_renamedata {

	struct nfs_renameargs	args;

	struct nfs_renameres	res;

	struct rpc_cred		*cred;

	struct inode		*old_dir;

	struct dentry		*old_dentry;

	struct nfs_fattr	old_fattr;

	struct inode		*new_dir;

	struct dentry		*new_dentry;

	struct nfs_fattr	new_fattr;

};



struct nfs_access_entry;

struct nfs_client;

struct rpc_timeout;
@@ -1235,6 +1247,7 @@ struct nfs_rpc_ops { 
	int	(*rename)  (struct inode *, struct qstr *,

			    struct inode *, struct qstr *);

	void	(*rename_setup)  (struct rpc_message *msg, struct inode *dir);

	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 *, struct qstr *);

	int	(*symlink) (struct inode *, struct dentry *, struct page *,