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

Commit 84115e1c authored by Trond Myklebust's avatar Trond Myklebust
Browse files

SUNRPC: Cleanup of rpc_task initialisation 



Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent e8914c65

fs/nfs/direct.c

+28 −8
Original line number Diff line number Diff line
@@ -272,6 +272,11 @@ static ssize_t nfs_direct_read_schedule_segment(struct nfs_direct_req *dreq, 
	unsigned long user_addr = (unsigned long)iov->iov_base;

	size_t count = iov->iov_len;

	size_t rsize = NFS_SERVER(inode)->rsize;

	struct rpc_task_setup task_setup_data = {

		.rpc_client = NFS_CLIENT(inode),

		.callback_ops = &nfs_read_direct_ops,

		.flags = RPC_TASK_ASYNC,

	};

	unsigned int pgbase;

	int result;

	ssize_t started = 0;
@@ -322,8 +327,8 @@ static ssize_t nfs_direct_read_schedule_segment(struct nfs_direct_req *dreq, 
		data->res.eof = 0;

		data->res.count = bytes;



		rpc_init_task(&data->task, NFS_CLIENT(inode), RPC_TASK_ASYNC,

				&nfs_read_direct_ops, data);

		task_setup_data.callback_data = data;

		rpc_init_task(&data->task, &task_setup_data);

		NFS_PROTO(inode)->read_setup(data);



		data->task.tk_cookie = (unsigned long) inode;
@@ -431,6 +436,11 @@ static void nfs_direct_write_reschedule(struct nfs_direct_req *dreq) 
	struct inode *inode = dreq->inode;

	struct list_head *p;

	struct nfs_write_data *data;

	struct rpc_task_setup task_setup_data = {

		.rpc_client = NFS_CLIENT(inode),

		.callback_ops = &nfs_write_direct_ops,

		.flags = RPC_TASK_ASYNC,

	};



	dreq->count = 0;

	get_dreq(dreq);
@@ -451,8 +461,8 @@ static void nfs_direct_write_reschedule(struct nfs_direct_req *dreq) 
		 * Reuse data->task; data->args should not have changed

		 * since the original request was sent.

		 */

		rpc_init_task(&data->task, NFS_CLIENT(inode), RPC_TASK_ASYNC,

				&nfs_write_direct_ops, data);

		task_setup_data.callback_data = data;

		rpc_init_task(&data->task, &task_setup_data);

		NFS_PROTO(inode)->write_setup(data, FLUSH_STABLE);



		data->task.tk_priority = RPC_PRIORITY_NORMAL;
@@ -504,6 +514,12 @@ static const struct rpc_call_ops nfs_commit_direct_ops = { 
static void nfs_direct_commit_schedule(struct nfs_direct_req *dreq)

{

	struct nfs_write_data *data = dreq->commit_data;

	struct rpc_task_setup task_setup_data = {

		.rpc_client = NFS_CLIENT(dreq->inode),

		.callback_ops = &nfs_commit_direct_ops,

		.callback_data = data,

		.flags = RPC_TASK_ASYNC,

	};



	data->inode = dreq->inode;

	data->cred = dreq->ctx->cred;
@@ -515,8 +531,7 @@ static void nfs_direct_commit_schedule(struct nfs_direct_req *dreq) 
	data->res.fattr = &data->fattr;

	data->res.verf = &data->verf;



	rpc_init_task(&data->task, NFS_CLIENT(dreq->inode), RPC_TASK_ASYNC,

				&nfs_commit_direct_ops, data);

	rpc_init_task(&data->task, &task_setup_data);

	NFS_PROTO(data->inode)->commit_setup(data, 0);



	data->task.tk_priority = RPC_PRIORITY_NORMAL;
@@ -641,6 +656,11 @@ static ssize_t nfs_direct_write_schedule_segment(struct nfs_direct_req *dreq, 
	struct inode *inode = ctx->path.dentry->d_inode;

	unsigned long user_addr = (unsigned long)iov->iov_base;

	size_t count = iov->iov_len;

	struct rpc_task_setup task_setup_data = {

		.rpc_client = NFS_CLIENT(inode),

		.callback_ops = &nfs_write_direct_ops,

		.flags = RPC_TASK_ASYNC,

	};

	size_t wsize = NFS_SERVER(inode)->wsize;

	unsigned int pgbase;

	int result;
@@ -694,8 +714,8 @@ static ssize_t nfs_direct_write_schedule_segment(struct nfs_direct_req *dreq, 
		data->res.count = bytes;

		data->res.verf = &data->verf;



		rpc_init_task(&data->task, NFS_CLIENT(inode), RPC_TASK_ASYNC,

				&nfs_write_direct_ops, data);

		task_setup_data.callback_data = data;

		rpc_init_task(&data->task, &task_setup_data);

		NFS_PROTO(inode)->write_setup(data, sync);



		data->task.tk_priority = RPC_PRIORITY_NORMAL;

fs/nfs/read.c

+10 −5
Original line number Diff line number Diff line
@@ -160,11 +160,17 @@ static void nfs_read_rpcsetup(struct nfs_page *req, struct nfs_read_data *data, 
		const struct rpc_call_ops *call_ops,

		unsigned int count, unsigned int offset)

{

	struct inode		*inode;

	int flags;

	struct inode *inode = req->wb_context->path.dentry->d_inode;

	int swap_flags = IS_SWAPFILE(inode) ? NFS_RPC_SWAPFLAGS : 0;

	struct rpc_task_setup task_setup_data = {

		.rpc_client = NFS_CLIENT(inode),

		.callback_ops = call_ops,

		.callback_data = data,

		.flags = RPC_TASK_ASYNC | swap_flags,

	};



	data->req	  = req;

	data->inode	  = inode = req->wb_context->path.dentry->d_inode;

	data->inode	  = inode;

	data->cred	  = req->wb_context->cred;



	data->args.fh     = NFS_FH(inode);
@@ -180,8 +186,7 @@ static void nfs_read_rpcsetup(struct nfs_page *req, struct nfs_read_data *data, 
	nfs_fattr_init(&data->fattr);



	/* Set up the initial task struct. */

	flags = RPC_TASK_ASYNC | (IS_SWAPFILE(inode)? NFS_RPC_SWAPFLAGS : 0);

	rpc_init_task(&data->task, NFS_CLIENT(inode), flags, call_ops, data);

	rpc_init_task(&data->task, &task_setup_data);

	NFS_PROTO(inode)->read_setup(data);



	data->task.tk_cookie = (unsigned long)inode;

fs/nfs/write.c

+19 −11
Original line number Diff line number Diff line
@@ -773,8 +773,14 @@ static void nfs_write_rpcsetup(struct nfs_page *req, 
		unsigned int count, unsigned int offset,

		int how)

{

	struct inode		*inode;

	int flags;

	struct inode *inode = req->wb_context->path.dentry->d_inode;

	int flags = (how & FLUSH_SYNC) ? 0 : RPC_TASK_ASYNC;

	struct rpc_task_setup task_setup_data = {

		.rpc_client = NFS_CLIENT(inode),

		.callback_ops = call_ops,

		.callback_data = data,

		.flags = flags,

	};



	/* Set up the RPC argument and reply structs

	 * NB: take care not to mess about with data->commit et al. */
@@ -796,8 +802,7 @@ static void nfs_write_rpcsetup(struct nfs_page *req, 
	nfs_fattr_init(&data->fattr);



	/* Set up the initial task struct.  */

	flags = (how & FLUSH_SYNC) ? 0 : RPC_TASK_ASYNC;

	rpc_init_task(&data->task, NFS_CLIENT(inode), flags, call_ops, data);

	rpc_init_task(&data->task, &task_setup_data);

	NFS_PROTO(inode)->write_setup(data, how);



	data->task.tk_priority = flush_task_priority(how);
@@ -1144,16 +1149,20 @@ static void nfs_commit_rpcsetup(struct list_head *head, 
		struct nfs_write_data *data,

		int how)

{

	struct nfs_page		*first;

	struct inode		*inode;

	int flags;

	struct nfs_page *first = nfs_list_entry(head->next);

	struct inode *inode = first->wb_context->path.dentry->d_inode;

	int flags = (how & FLUSH_SYNC) ? 0 : RPC_TASK_ASYNC;

	struct rpc_task_setup task_setup_data = {

		.rpc_client = NFS_CLIENT(inode),

		.callback_ops = &nfs_commit_ops,

		.callback_data = data,

		.flags = flags,

	};



	/* Set up the RPC argument and reply structs

	 * NB: take care not to mess about with data->commit et al. */



	list_splice_init(head, &data->pages);

	first = nfs_list_entry(data->pages.next);

	inode = first->wb_context->path.dentry->d_inode;



	data->inode	  = inode;

	data->cred	  = first->wb_context->cred;
@@ -1168,8 +1177,7 @@ static void nfs_commit_rpcsetup(struct list_head *head, 
	nfs_fattr_init(&data->fattr);



	/* Set up the initial task struct.  */

	flags = (how & FLUSH_SYNC) ? 0 : RPC_TASK_ASYNC;

	rpc_init_task(&data->task, NFS_CLIENT(inode), flags, &nfs_commit_ops, data);

	rpc_init_task(&data->task, &task_setup_data);

	NFS_PROTO(inode)->commit_setup(data, how);



	data->task.tk_priority = flush_task_priority(how);

include/linux/sunrpc/clnt.h

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ int rpcb_register(u32, u32, int, unsigned short, int *); 
int		rpcb_getport_sync(struct sockaddr_in *, __u32, __u32, int);

void		rpcb_getport_async(struct rpc_task *);



void		rpc_call_setup(struct rpc_task *, struct rpc_message *, int);

void		rpc_call_setup(struct rpc_task *, const struct rpc_message *, int);



int		rpc_call_async(struct rpc_clnt *clnt, struct rpc_message *msg,

			       int flags, const struct rpc_call_ops *tk_ops,

include/linux/sunrpc/sched.h

+9 −5
Original line number Diff line number Diff line
@@ -117,6 +117,13 @@ struct rpc_call_ops { 
	void (*rpc_release)(void *);

};



struct rpc_task_setup {

	struct rpc_clnt *rpc_client;

	const struct rpc_message *rpc_message;

	const struct rpc_call_ops *callback_ops;

	void *callback_data;

	unsigned short flags;

};



/*

 * RPC task flags
@@ -236,13 +243,10 @@ struct rpc_wait_queue { 
/*

 * Function prototypes

 */

struct rpc_task *rpc_new_task(struct rpc_clnt *, int flags,

				const struct rpc_call_ops *ops, void *data);

struct rpc_task *rpc_new_task(const struct rpc_task_setup *);

struct rpc_task *rpc_run_task(struct rpc_clnt *clnt, int flags,

				const struct rpc_call_ops *ops, void *data);

void		rpc_init_task(struct rpc_task *task, struct rpc_clnt *clnt,

				int flags, const struct rpc_call_ops *ops,

				void *data);

void		rpc_init_task(struct rpc_task *task, const struct rpc_task_setup *);

void		rpc_put_task(struct rpc_task *);

void		rpc_exit_task(struct rpc_task *);

void		rpc_release_calldata(const struct rpc_call_ops *, void *);