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

Commit bdc7f021 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFS: Clean up the (commit|read|write)_setup() callback routines 



Move the common code for setting up the nfs_write_data and nfs_read_data
structures into fs/nfs/read.c, fs/nfs/write.c and fs/nfs/direct.c.

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

fs/nfs/direct.c

+36 −9
Original line number Diff line number Diff line
@@ -272,8 +272,12 @@ 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_message msg = {

		.rpc_cred = ctx->cred,

	};

	struct rpc_task_setup task_setup_data = {

		.rpc_client = NFS_CLIENT(inode),

		.rpc_message = &msg,

		.callback_ops = &nfs_read_direct_ops,

		.flags = RPC_TASK_ASYNC,

	};
@@ -316,7 +320,7 @@ static ssize_t nfs_direct_read_schedule_segment(struct nfs_direct_req *dreq, 


		data->req = (struct nfs_page *) dreq;

		data->inode = inode;

		data->cred = ctx->cred;

		data->cred = msg.rpc_cred;

		data->args.fh = NFS_FH(inode);

		data->args.context = ctx;

		data->args.offset = pos;
@@ -326,10 +330,12 @@ static ssize_t nfs_direct_read_schedule_segment(struct nfs_direct_req *dreq, 
		data->res.fattr = &data->fattr;

		data->res.eof = 0;

		data->res.count = bytes;

		msg.rpc_argp = &data->args;

		msg.rpc_resp = &data->res;



		task_setup_data.callback_data = data;

		NFS_PROTO(inode)->read_setup(data, &msg);

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

		NFS_PROTO(inode)->read_setup(data);



		rpc_execute(&data->task);
@@ -434,6 +440,9 @@ 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_message msg = {

		.rpc_cred = dreq->ctx->cred,

	};

	struct rpc_task_setup task_setup_data = {

		.rpc_client = NFS_CLIENT(inode),

		.callback_ops = &nfs_write_direct_ops,
@@ -448,6 +457,9 @@ static void nfs_direct_write_reschedule(struct nfs_direct_req *dreq) 


		get_dreq(dreq);



		/* Use stable writes */

		data->args.stable = NFS_FILE_SYNC;



		/*

		 * Reset data->res.

		 */
@@ -460,8 +472,10 @@ static void nfs_direct_write_reschedule(struct nfs_direct_req *dreq) 
		 * since the original request was sent.

		 */

		task_setup_data.callback_data = data;

		msg.rpc_argp = &data->args;

		msg.rpc_resp = &data->res;

		NFS_PROTO(inode)->write_setup(data, &msg);

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

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



		/*

		 * We're called via an RPC callback, so BKL is already held.
@@ -509,15 +523,21 @@ 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_message msg = {

		.rpc_argp = &data->args,

		.rpc_resp = &data->res,

		.rpc_cred = dreq->ctx->cred,

	};

	struct rpc_task_setup task_setup_data = {

		.rpc_client = NFS_CLIENT(dreq->inode),

		.rpc_message = &msg,

		.callback_ops = &nfs_commit_direct_ops,

		.callback_data = data,

		.flags = RPC_TASK_ASYNC,

	};



	data->inode = dreq->inode;

	data->cred = dreq->ctx->cred;

	data->cred = msg.rpc_cred;



	data->args.fh = NFS_FH(data->inode);

	data->args.offset = 0;
@@ -526,8 +546,8 @@ static void nfs_direct_commit_schedule(struct nfs_direct_req *dreq) 
	data->res.fattr = &data->fattr;

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



	NFS_PROTO(data->inode)->commit_setup(data, &msg);

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

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



	/* Note: task.tk_ops->rpc_release will free dreq->commit_data */

	dreq->commit_data = NULL;
@@ -649,8 +669,12 @@ 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_message msg = {

		.rpc_cred = ctx->cred,

	};

	struct rpc_task_setup task_setup_data = {

		.rpc_client = NFS_CLIENT(inode),

		.rpc_message = &msg,

		.callback_ops = &nfs_write_direct_ops,

		.flags = RPC_TASK_ASYNC,

	};
@@ -696,20 +720,23 @@ static ssize_t nfs_direct_write_schedule_segment(struct nfs_direct_req *dreq, 


		data->req = (struct nfs_page *) dreq;

		data->inode = inode;

		data->cred = ctx->cred;

		data->cred = msg.rpc_cred;

		data->args.fh = NFS_FH(inode);

		data->args.context = ctx;

		data->args.offset = pos;

		data->args.pgbase = pgbase;

		data->args.pages = data->pagevec;

		data->args.count = bytes;

		data->args.stable = sync;

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

		data->res.count = bytes;

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



		task_setup_data.callback_data = data;

		msg.rpc_argp = &data->args;

		msg.rpc_resp = &data->res;

		NFS_PROTO(inode)->write_setup(data, &msg);

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

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



		rpc_execute(&data->task);
@@ -782,7 +809,7 @@ static ssize_t nfs_direct_write(struct kiocb *iocb, const struct iovec *iov, 
	struct rpc_clnt *clnt = NFS_CLIENT(inode);

	struct nfs_direct_req *dreq;

	size_t wsize = NFS_SERVER(inode)->wsize;

	int sync = 0;

	int sync = NFS_UNSTABLE;



	dreq = nfs_direct_req_alloc();

	if (!dreq)
@@ -790,7 +817,7 @@ static ssize_t nfs_direct_write(struct kiocb *iocb, const struct iovec *iov, 
	nfs_alloc_commit_data(dreq);



	if (dreq->commit_data == NULL || count < wsize)

		sync = FLUSH_STABLE;

		sync = NFS_FILE_SYNC;



	dreq->inode = inode;

	dreq->ctx = get_nfs_open_context(nfs_file_open_context(iocb->ki_filp));

fs/nfs/nfs3proc.c

+6 −35
Original line number Diff line number Diff line
@@ -732,16 +732,9 @@ static int nfs3_read_done(struct rpc_task *task, struct nfs_read_data *data) 
	return 0;

}



static void nfs3_proc_read_setup(struct nfs_read_data *data)

static void nfs3_proc_read_setup(struct nfs_read_data *data, struct rpc_message *msg)

{

	struct rpc_message	msg = {

		.rpc_proc	= &nfs3_procedures[NFS3PROC_READ],

		.rpc_argp	= &data->args,

		.rpc_resp	= &data->res,

		.rpc_cred	= data->cred,

	};



	rpc_call_setup(&data->task, &msg, 0);

	msg->rpc_proc = &nfs3_procedures[NFS3PROC_READ];

}



static int nfs3_write_done(struct rpc_task *task, struct nfs_write_data *data)
@@ -753,24 +746,9 @@ static int nfs3_write_done(struct rpc_task *task, struct nfs_write_data *data) 
	return 0;

}



static void nfs3_proc_write_setup(struct nfs_write_data *data, int how)

static void nfs3_proc_write_setup(struct nfs_write_data *data, struct rpc_message *msg)

{

	struct rpc_message	msg = {

		.rpc_proc	= &nfs3_procedures[NFS3PROC_WRITE],

		.rpc_argp	= &data->args,

		.rpc_resp	= &data->res,

		.rpc_cred	= data->cred,

	};



	data->args.stable = NFS_UNSTABLE;

	if (how & FLUSH_STABLE) {

		data->args.stable = NFS_FILE_SYNC;

		if (NFS_I(data->inode)->ncommit)

			data->args.stable = NFS_DATA_SYNC;

	}



	/* Finalize the task. */

	rpc_call_setup(&data->task, &msg, 0);

	msg->rpc_proc = &nfs3_procedures[NFS3PROC_WRITE];

}



static int nfs3_commit_done(struct rpc_task *task, struct nfs_write_data *data)
@@ -781,16 +759,9 @@ static int nfs3_commit_done(struct rpc_task *task, struct nfs_write_data *data) 
	return 0;

}



static void nfs3_proc_commit_setup(struct nfs_write_data *data, int how)

static void nfs3_proc_commit_setup(struct nfs_write_data *data, struct rpc_message *msg)

{

	struct rpc_message	msg = {

		.rpc_proc	= &nfs3_procedures[NFS3PROC_COMMIT],

		.rpc_argp	= &data->args,

		.rpc_resp	= &data->res,

		.rpc_cred	= data->cred,

	};



	rpc_call_setup(&data->task, &msg, 0);

	msg->rpc_proc = &nfs3_procedures[NFS3PROC_COMMIT];

}



static int

fs/nfs/nfs4proc.c

+8 −41
Original line number Diff line number Diff line
@@ -2432,18 +2432,10 @@ static int nfs4_read_done(struct rpc_task *task, struct nfs_read_data *data) 
	return 0;

}



static void nfs4_proc_read_setup(struct nfs_read_data *data)

static void nfs4_proc_read_setup(struct nfs_read_data *data, struct rpc_message *msg)

{

	struct rpc_message msg = {

		.rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_READ],

		.rpc_argp = &data->args,

		.rpc_resp = &data->res,

		.rpc_cred = data->cred,

	};



	data->timestamp   = jiffies;



	rpc_call_setup(&data->task, &msg, 0);

	msg->rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_READ];

}



static int nfs4_write_done(struct rpc_task *task, struct nfs_write_data *data)
@@ -2461,33 +2453,15 @@ static int nfs4_write_done(struct rpc_task *task, struct nfs_write_data *data) 
	return 0;

}



static void nfs4_proc_write_setup(struct nfs_write_data *data, int how)

static void nfs4_proc_write_setup(struct nfs_write_data *data, struct rpc_message *msg)

{

	struct rpc_message msg = {

		.rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_WRITE],

		.rpc_argp = &data->args,

		.rpc_resp = &data->res,

		.rpc_cred = data->cred,

	};

	struct inode *inode = data->inode;

	struct nfs_server *server = NFS_SERVER(inode);

	int stable;

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



	if (how & FLUSH_STABLE) {

		if (!NFS_I(inode)->ncommit)

			stable = NFS_FILE_SYNC;

		else

			stable = NFS_DATA_SYNC;

	} else

		stable = NFS_UNSTABLE;

	data->args.stable = stable;

	data->args.bitmask = server->attr_bitmask;

	data->res.server = server;



	data->timestamp   = jiffies;



	/* Finalize the task. */

	rpc_call_setup(&data->task, &msg, 0);

	msg->rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_WRITE];

}



static int nfs4_commit_done(struct rpc_task *task, struct nfs_write_data *data)
@@ -2502,20 +2476,13 @@ static int nfs4_commit_done(struct rpc_task *task, struct nfs_write_data *data) 
	return 0;

}



static void nfs4_proc_commit_setup(struct nfs_write_data *data, int how)

static void nfs4_proc_commit_setup(struct nfs_write_data *data, struct rpc_message *msg)

{

	struct rpc_message msg = {

		.rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_COMMIT],

		.rpc_argp = &data->args,

		.rpc_resp = &data->res,

		.rpc_cred = data->cred,

	};	

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

	

	data->args.bitmask = server->attr_bitmask;

	data->res.server = server;



	rpc_call_setup(&data->task, &msg, 0);

	msg->rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_COMMIT];

}



/*

fs/nfs/proc.c

+5 −21
Original line number Diff line number Diff line
@@ -565,16 +565,9 @@ static int nfs_read_done(struct rpc_task *task, struct nfs_read_data *data) 
	return 0;

}



static void nfs_proc_read_setup(struct nfs_read_data *data)

static void nfs_proc_read_setup(struct nfs_read_data *data, struct rpc_message *msg)

{

	struct rpc_message	msg = {

		.rpc_proc	= &nfs_procedures[NFSPROC_READ],

		.rpc_argp	= &data->args,

		.rpc_resp	= &data->res,

		.rpc_cred	= data->cred,

	};



	rpc_call_setup(&data->task, &msg, 0);

	msg->rpc_proc = &nfs_procedures[NFSPROC_READ];

}



static int nfs_write_done(struct rpc_task *task, struct nfs_write_data *data)
@@ -584,24 +577,15 @@ static int nfs_write_done(struct rpc_task *task, struct nfs_write_data *data) 
	return 0;

}



static void nfs_proc_write_setup(struct nfs_write_data *data, int how)

static void nfs_proc_write_setup(struct nfs_write_data *data, struct rpc_message *msg)

{

	struct rpc_message	msg = {

		.rpc_proc	= &nfs_procedures[NFSPROC_WRITE],

		.rpc_argp	= &data->args,

		.rpc_resp	= &data->res,

		.rpc_cred	= data->cred,

	};



	/* Note: NFSv2 ignores @stable and always uses NFS_FILE_SYNC */

	data->args.stable = NFS_FILE_SYNC;



	/* Finalize the task. */

	rpc_call_setup(&data->task, &msg, 0);

	msg->rpc_proc = &nfs_procedures[NFSPROC_WRITE];

}



static void

nfs_proc_commit_setup(struct nfs_write_data *data, int how)

nfs_proc_commit_setup(struct nfs_write_data *data, struct rpc_message *msg)

{

	BUG();

}

fs/nfs/read.c

+20 −18
Original line number Diff line number Diff line
@@ -153,6 +153,16 @@ static void nfs_readpage_release(struct nfs_page *req) 
	nfs_release_request(req);

}



static void nfs_execute_read(struct nfs_read_data *data)

{

	struct rpc_clnt *clnt = NFS_CLIENT(data->inode);

	sigset_t oldset;



	rpc_clnt_sigmask(clnt, &oldset);

	rpc_execute(&data->task);

	rpc_clnt_sigunmask(clnt, &oldset);

}



/*

 * Set up the NFS read request struct

 */
@@ -162,8 +172,14 @@ static void nfs_read_rpcsetup(struct nfs_page *req, struct nfs_read_data *data, 
{

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

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

	struct rpc_message msg = {

		.rpc_argp = &data->args,

		.rpc_resp = &data->res,

		.rpc_cred = req->wb_context->cred,

	};

	struct rpc_task_setup task_setup_data = {

		.rpc_client = NFS_CLIENT(inode),

		.rpc_message = &msg,

		.callback_ops = call_ops,

		.callback_data = data,

		.flags = RPC_TASK_ASYNC | swap_flags,
@@ -171,7 +187,7 @@ static void nfs_read_rpcsetup(struct nfs_page *req, struct nfs_read_data *data, 


	data->req	  = req;

	data->inode	  = inode;

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

	data->cred	  = msg.rpc_cred;



	data->args.fh     = NFS_FH(inode);

	data->args.offset = req_offset(req) + offset;
@@ -186,8 +202,8 @@ 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. */

	NFS_PROTO(inode)->read_setup(data, &msg);

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

	NFS_PROTO(inode)->read_setup(data);



	dprintk("NFS: %5u initiated read call (req %s/%Ld, %u bytes @ offset %Lu)\n",

			data->task.tk_pid,
@@ -195,6 +211,8 @@ static void nfs_read_rpcsetup(struct nfs_page *req, struct nfs_read_data *data, 
			(long long)NFS_FILEID(inode),

			count,

			(unsigned long long)data->args.offset);



	nfs_execute_read(data);

}



static void
@@ -210,19 +228,6 @@ nfs_async_read_error(struct list_head *head) 
	}

}



/*

 * Start an async read operation

 */

static void nfs_execute_read(struct nfs_read_data *data)

{

	struct rpc_clnt *clnt = NFS_CLIENT(data->inode);

	sigset_t oldset;



	rpc_clnt_sigmask(clnt, &oldset);

	rpc_execute(&data->task);

	rpc_clnt_sigunmask(clnt, &oldset);

}



/*

 * Generate multiple requests to fill a single page.

 *
@@ -277,7 +282,6 @@ static int nfs_pagein_multi(struct inode *inode, struct list_head *head, unsigne 
				  rsize, offset);

		offset += rsize;

		nbytes -= rsize;

		nfs_execute_read(data);

	} while (nbytes != 0);



	return 0;
@@ -315,8 +319,6 @@ static int nfs_pagein_one(struct inode *inode, struct list_head *head, unsigned 
	req = nfs_list_entry(data->pages.next);



	nfs_read_rpcsetup(req, data, &nfs_read_full_ops, count, 0);



	nfs_execute_read(data);

	return 0;

out_bad:

	nfs_async_read_error(head);