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

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

NFS: Create a common initiate_pgio() function 



Most of this code is the same for both the read and write paths, so
combine everything and use the rw_ops when necessary.

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

fs/nfs/internal.h

+2 −7
Original line number Diff line number Diff line
@@ -241,6 +241,8 @@ struct nfs_rw_header *nfs_rw_header_alloc(const struct nfs_rw_ops *); 
void nfs_rw_header_free(struct nfs_pgio_header *);

void nfs_pgio_data_release(struct nfs_pgio_data *);

int nfs_generic_pgio(struct nfs_pageio_descriptor *, struct nfs_pgio_header *);

int nfs_initiate_pgio(struct rpc_clnt *, struct nfs_pgio_data *,

		      const struct rpc_call_ops *, int, int);



static inline void nfs_iocounter_init(struct nfs_io_counter *c)

{
@@ -402,9 +404,6 @@ struct nfs_pgio_completion_ops; 
extern void nfs_pageio_init_read(struct nfs_pageio_descriptor *pgio,

			struct inode *inode, bool force_mds,

			const struct nfs_pgio_completion_ops *compl_ops);

extern int nfs_initiate_read(struct rpc_clnt *clnt,

			     struct nfs_pgio_data *data,

			     const struct rpc_call_ops *call_ops, int flags);

extern void nfs_read_prepare(struct rpc_task *task, void *calldata);

extern void nfs_pageio_reset_read_mds(struct nfs_pageio_descriptor *pgio);
@@ -425,10 +424,6 @@ extern void nfs_pageio_init_write(struct nfs_pageio_descriptor *pgio, 
			const struct nfs_pgio_completion_ops *compl_ops);

extern void nfs_pageio_reset_write_mds(struct nfs_pageio_descriptor *pgio);

extern void nfs_commit_free(struct nfs_commit_data *p);

extern int nfs_initiate_write(struct rpc_clnt *clnt,

			      struct nfs_pgio_data *data,

			      const struct rpc_call_ops *call_ops,

			      int how, int flags);

extern void nfs_write_prepare(struct rpc_task *task, void *calldata);

extern void nfs_commit_prepare(struct rpc_task *task, void *calldata);

extern int nfs_initiate_commit(struct rpc_clnt *clnt,

fs/nfs/nfs4filelayout.c

+3 −3
Original line number Diff line number Diff line
@@ -568,8 +568,8 @@ filelayout_read_pagelist(struct nfs_pgio_data *data) 
	data->mds_offset = offset;



	/* Perform an asynchronous read to ds */

	nfs_initiate_read(ds_clnt, data,

				  &filelayout_read_call_ops, RPC_TASK_SOFTCONN);

	nfs_initiate_pgio(ds_clnt, data,

			    &filelayout_read_call_ops, 0, RPC_TASK_SOFTCONN);

	return PNFS_ATTEMPTED;

}
@@ -613,7 +613,7 @@ filelayout_write_pagelist(struct nfs_pgio_data *data, int sync) 
	data->args.offset = filelayout_get_dserver_offset(lseg, offset);



	/* Perform an asynchronous write */

	nfs_initiate_write(ds_clnt, data,

	nfs_initiate_pgio(ds_clnt, data,

				    &filelayout_write_call_ops, sync,

				    RPC_TASK_SOFTCONN);

	return PNFS_ATTEMPTED;

fs/nfs/pagelist.c

+46 −0
Original line number Diff line number Diff line
@@ -447,6 +447,52 @@ static void nfs_pgio_prepare(struct rpc_task *task, void *calldata) 
		rpc_exit(task, err);

}



int nfs_initiate_pgio(struct rpc_clnt *clnt, struct nfs_pgio_data *data,

		      const struct rpc_call_ops *call_ops, int how, int flags)

{

	struct rpc_task *task;

	struct rpc_message msg = {

		.rpc_argp = &data->args,

		.rpc_resp = &data->res,

		.rpc_cred = data->header->cred,

	};

	struct rpc_task_setup task_setup_data = {

		.rpc_client = clnt,

		.task = &data->task,

		.rpc_message = &msg,

		.callback_ops = call_ops,

		.callback_data = data,

		.workqueue = nfsiod_workqueue,

		.flags = RPC_TASK_ASYNC | flags,

	};

	int ret = 0;



	data->header->rw_ops->rw_initiate(data, &msg, &task_setup_data, how);



	dprintk("NFS: %5u initiated pgio call "

		"(req %s/%llu, %u bytes @ offset %llu)\n",

		data->task.tk_pid,

		data->header->inode->i_sb->s_id,

		(unsigned long long)NFS_FILEID(data->header->inode),

		data->args.count,

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



	task = rpc_run_task(&task_setup_data);

	if (IS_ERR(task)) {

		ret = PTR_ERR(task);

		goto out;

	}

	if (how & FLUSH_SYNC) {

		ret = rpc_wait_for_completion_task(task);

		if (ret == 0)

			ret = task->tk_status;

	}

	rpc_put_task(task);

out:

	return ret;

}

EXPORT_SYMBOL_GPL(nfs_initiate_pgio);



/**

 * nfs_pgio_error - Clean up from a pageio error

 * @desc: IO descriptor

fs/nfs/read.c

+6 −36
Original line number Diff line number Diff line
@@ -151,53 +151,22 @@ static void nfs_read_completion(struct nfs_pgio_header *hdr) 
	hdr->release(hdr);

}



int nfs_initiate_read(struct rpc_clnt *clnt,

		      struct nfs_pgio_data *data,

		      const struct rpc_call_ops *call_ops, int flags)

static void nfs_initiate_read(struct nfs_pgio_data *data, struct rpc_message *msg,

			      struct rpc_task_setup *task_setup_data, int how)

{

	struct inode *inode = data->header->inode;

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

	struct rpc_task *task;

	struct rpc_message msg = {

		.rpc_argp = &data->args,

		.rpc_resp = &data->res,

		.rpc_cred = data->header->cred,

	};

	struct rpc_task_setup task_setup_data = {

		.task = &data->task,

		.rpc_client = clnt,

		.rpc_message = &msg,

		.callback_ops = call_ops,

		.callback_data = data,

		.workqueue = nfsiod_workqueue,

		.flags = RPC_TASK_ASYNC | swap_flags | flags,

	};



	/* Set up the initial task struct. */

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



	dprintk("NFS: %5u initiated read call (req %s/%llu, %u bytes @ "

			"offset %llu)\n",

			data->task.tk_pid,

			inode->i_sb->s_id,

			(unsigned long long)NFS_FILEID(inode),

			data->args.count,

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



	task = rpc_run_task(&task_setup_data);

	if (IS_ERR(task))

		return PTR_ERR(task);

	rpc_put_task(task);

	return 0;

	task_setup_data->flags |= swap_flags;

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

}

EXPORT_SYMBOL_GPL(nfs_initiate_read);



static int nfs_do_read(struct nfs_pgio_data *data,

		const struct rpc_call_ops *call_ops)

{

	struct inode *inode = data->header->inode;



	return nfs_initiate_read(NFS_CLIENT(inode), data, call_ops, 0);

	return nfs_initiate_pgio(NFS_CLIENT(inode), data, call_ops, 0, 0);

}



static int
@@ -491,4 +460,5 @@ static const struct nfs_rw_ops nfs_rw_read_ops = { 
	.rw_free_header		= nfs_readhdr_free,

	.rw_done		= nfs_readpage_done,

	.rw_result		= nfs_readpage_result,

	.rw_initiate		= nfs_initiate_read,

};

fs/nfs/write.c

+7 −48
Original line number Diff line number Diff line
@@ -932,60 +932,18 @@ static int flush_task_priority(int how) 
	return RPC_PRIORITY_NORMAL;

}



int nfs_initiate_write(struct rpc_clnt *clnt,

		       struct nfs_pgio_data *data,

		       const struct rpc_call_ops *call_ops,

		       int how, int flags)

static void nfs_initiate_write(struct nfs_pgio_data *data, struct rpc_message *msg,

			       struct rpc_task_setup *task_setup_data, int how)

{

	struct inode *inode = data->header->inode;

	int priority = flush_task_priority(how);

	struct rpc_task *task;

	struct rpc_message msg = {

		.rpc_argp = &data->args,

		.rpc_resp = &data->res,

		.rpc_cred = data->header->cred,

	};

	struct rpc_task_setup task_setup_data = {

		.rpc_client = clnt,

		.task = &data->task,

		.rpc_message = &msg,

		.callback_ops = call_ops,

		.callback_data = data,

		.workqueue = nfsiod_workqueue,

		.flags = RPC_TASK_ASYNC | flags,

		.priority = priority,

	};

	int ret = 0;



	/* Set up the initial task struct.  */

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



	dprintk("NFS: %5u initiated write call "

		"(req %s/%llu, %u bytes @ offset %llu)\n",

		data->task.tk_pid,

		inode->i_sb->s_id,

		(unsigned long long)NFS_FILEID(inode),

		data->args.count,

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

	task_setup_data->priority = priority;

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



	nfs4_state_protect_write(NFS_SERVER(inode)->nfs_client,

				 &task_setup_data.rpc_client, &msg, data);



	task = rpc_run_task(&task_setup_data);

	if (IS_ERR(task)) {

		ret = PTR_ERR(task);

		goto out;

	}

	if (how & FLUSH_SYNC) {

		ret = rpc_wait_for_completion_task(task);

		if (ret == 0)

			ret = task->tk_status;

	}

	rpc_put_task(task);

out:

	return ret;

				 &task_setup_data->rpc_client, msg, data);

}

EXPORT_SYMBOL_GPL(nfs_initiate_write);



static int nfs_do_write(struct nfs_pgio_data *data,

		const struct rpc_call_ops *call_ops,
@@ -993,7 +951,7 @@ static int nfs_do_write(struct nfs_pgio_data *data, 
{

	struct inode *inode = data->header->inode;



	return nfs_initiate_write(NFS_CLIENT(inode), data, call_ops, how, 0);

	return nfs_initiate_pgio(NFS_CLIENT(inode), data, call_ops, how, 0);

}



static int nfs_do_multiple_writes(struct list_head *head,
@@ -1743,4 +1701,5 @@ static const struct nfs_rw_ops nfs_rw_write_ops = { 
	.rw_release		= nfs_writeback_release_common,

	.rw_done		= nfs_writeback_done,

	.rw_result		= nfs_writeback_result,

	.rw_initiate		= nfs_initiate_write,

};