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

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

NFS: Create a common pgio_rpc_prepare function 



The read and write paths do exactly the same thing for the rpc_prepare
rpc_op.  This patch combines them together into a single function.

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

fs/nfs/internal.h

+2 −0
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 *);

struct nfs_pgio_data *nfs_pgio_data_alloc(struct nfs_pgio_header *, unsigned int);

void nfs_pgio_data_release(struct nfs_pgio_data *);

void nfs_pgio_prepare(struct rpc_task *, void *);

void nfs_pgio_release(void *);



static inline void nfs_iocounter_init(struct nfs_io_counter *c)

{

fs/nfs/nfs3proc.c

+2 −9
Original line number Diff line number Diff line
@@ -812,7 +812,7 @@ static void nfs3_proc_read_setup(struct nfs_pgio_data *data, struct rpc_message 
	msg->rpc_proc = &nfs3_procedures[NFS3PROC_READ];

}



static int nfs3_proc_read_rpc_prepare(struct rpc_task *task, struct nfs_pgio_data *data)

static int nfs3_proc_pgio_rpc_prepare(struct rpc_task *task, struct nfs_pgio_data *data)

{

	rpc_call_start(task);

	return 0;
@@ -834,12 +834,6 @@ static void nfs3_proc_write_setup(struct nfs_pgio_data *data, struct rpc_message 
	msg->rpc_proc = &nfs3_procedures[NFS3PROC_WRITE];

}



static int nfs3_proc_write_rpc_prepare(struct rpc_task *task, struct nfs_pgio_data *data)

{

	rpc_call_start(task);

	return 0;

}



static void nfs3_proc_commit_rpc_prepare(struct rpc_task *task, struct nfs_commit_data *data)

{

	rpc_call_start(task);
@@ -946,11 +940,10 @@ const struct nfs_rpc_ops nfs_v3_clientops = { 
	.fsinfo		= nfs3_proc_fsinfo,

	.pathconf	= nfs3_proc_pathconf,

	.decode_dirent	= nfs3_decode_dirent,

	.pgio_rpc_prepare = nfs3_proc_pgio_rpc_prepare,

	.read_setup	= nfs3_proc_read_setup,

	.read_rpc_prepare = nfs3_proc_read_rpc_prepare,

	.read_done	= nfs3_read_done,

	.write_setup	= nfs3_proc_write_setup,

	.write_rpc_prepare = nfs3_proc_write_rpc_prepare,

	.write_done	= nfs3_write_done,

	.commit_setup	= nfs3_proc_commit_setup,

	.commit_rpc_prepare = nfs3_proc_commit_rpc_prepare,

fs/nfs/nfs4proc.c

+3 −19
Original line number Diff line number Diff line
@@ -4089,7 +4089,7 @@ static void nfs4_proc_read_setup(struct nfs_pgio_data *data, struct rpc_message 
	nfs4_init_sequence(&data->args.seq_args, &data->res.seq_res, 0);

}



static int nfs4_proc_read_rpc_prepare(struct rpc_task *task, struct nfs_pgio_data *data)

static int nfs4_proc_pgio_rpc_prepare(struct rpc_task *task, struct nfs_pgio_data *data)

{

	if (nfs4_setup_sequence(NFS_SERVER(data->header->inode),

			&data->args.seq_args,
@@ -4097,7 +4097,7 @@ static int nfs4_proc_read_rpc_prepare(struct rpc_task *task, struct nfs_pgio_dat 
			task))

		return 0;

	if (nfs4_set_rw_stateid(&data->args.stateid, data->args.context,

				data->args.lock_context, FMODE_READ) == -EIO)

				data->args.lock_context, data->header->rw_ops->rw_mode) == -EIO)

		return -EIO;

	if (unlikely(test_bit(NFS_CONTEXT_BAD, &data->args.context->flags)))

		return -EIO;
@@ -4177,21 +4177,6 @@ static void nfs4_proc_write_setup(struct nfs_pgio_data *data, struct rpc_message 
	nfs4_init_sequence(&data->args.seq_args, &data->res.seq_res, 1);

}



static int nfs4_proc_write_rpc_prepare(struct rpc_task *task, struct nfs_pgio_data *data)

{

	if (nfs4_setup_sequence(NFS_SERVER(data->header->inode),

			&data->args.seq_args,

			&data->res.seq_res,

			task))

		return 0;

	if (nfs4_set_rw_stateid(&data->args.stateid, data->args.context,

				data->args.lock_context, FMODE_WRITE) == -EIO)

		return -EIO;

	if (unlikely(test_bit(NFS_CONTEXT_BAD, &data->args.context->flags)))

		return -EIO;

	return 0;

}



static void nfs4_proc_commit_rpc_prepare(struct rpc_task *task, struct nfs_commit_data *data)

{

	nfs4_setup_sequence(NFS_SERVER(data->inode),
@@ -8432,11 +8417,10 @@ const struct nfs_rpc_ops nfs_v4_clientops = { 
	.pathconf	= nfs4_proc_pathconf,

	.set_capabilities = nfs4_server_capabilities,

	.decode_dirent	= nfs4_decode_dirent,

	.pgio_rpc_prepare = nfs4_proc_pgio_rpc_prepare,

	.read_setup	= nfs4_proc_read_setup,

	.read_rpc_prepare = nfs4_proc_read_rpc_prepare,

	.read_done	= nfs4_read_done,

	.write_setup	= nfs4_proc_write_setup,

	.write_rpc_prepare = nfs4_proc_write_rpc_prepare,

	.write_done	= nfs4_write_done,

	.commit_setup	= nfs4_proc_commit_setup,

	.commit_rpc_prepare = nfs4_proc_commit_rpc_prepare,

fs/nfs/pagelist.c

+26 −0
Original line number Diff line number Diff line
@@ -386,6 +386,32 @@ void nfs_pgio_data_release(struct nfs_pgio_data *data) 
}

EXPORT_SYMBOL_GPL(nfs_pgio_data_release);



/**

 * nfs_pgio_prepare - Prepare pageio data to go over the wire

 * @task: The current task

 * @calldata: pageio data to prepare

 */

void nfs_pgio_prepare(struct rpc_task *task, void *calldata)

{

	struct nfs_pgio_data *data = calldata;

	int err;

	err = NFS_PROTO(data->header->inode)->pgio_rpc_prepare(task, data);

	if (err)

		rpc_exit(task, err);

}



/**

 * nfs_pgio_release - Release pageio data

 * @calldata: The pageio data to release

 */

void nfs_pgio_release(void *calldata)

{

	struct nfs_pgio_data *data = calldata;

	if (data->header->rw_ops->rw_release)

		data->header->rw_ops->rw_release(data);

	nfs_pgio_data_release(data);

}



/**

 * nfs_pageio_init - initialise a page io descriptor

 * @desc: pointer to descriptor

fs/nfs/proc.c

+2 −9
Original line number Diff line number Diff line
@@ -599,7 +599,7 @@ static void nfs_proc_read_setup(struct nfs_pgio_data *data, struct rpc_message * 
	msg->rpc_proc = &nfs_procedures[NFSPROC_READ];

}



static int nfs_proc_read_rpc_prepare(struct rpc_task *task, struct nfs_pgio_data *data)

static int nfs_proc_pgio_rpc_prepare(struct rpc_task *task, struct nfs_pgio_data *data)

{

	rpc_call_start(task);

	return 0;
@@ -621,12 +621,6 @@ static void nfs_proc_write_setup(struct nfs_pgio_data *data, struct rpc_message 
	msg->rpc_proc = &nfs_procedures[NFSPROC_WRITE];

}



static int nfs_proc_write_rpc_prepare(struct rpc_task *task, struct nfs_pgio_data *data)

{

	rpc_call_start(task);

	return 0;

}



static void nfs_proc_commit_rpc_prepare(struct rpc_task *task, struct nfs_commit_data *data)

{

	BUG();
@@ -734,11 +728,10 @@ const struct nfs_rpc_ops nfs_v2_clientops = { 
	.fsinfo		= nfs_proc_fsinfo,

	.pathconf	= nfs_proc_pathconf,

	.decode_dirent	= nfs2_decode_dirent,

	.pgio_rpc_prepare = nfs_proc_pgio_rpc_prepare,

	.read_setup	= nfs_proc_read_setup,

	.read_rpc_prepare = nfs_proc_read_rpc_prepare,

	.read_done	= nfs_read_done,

	.write_setup	= nfs_proc_write_setup,

	.write_rpc_prepare = nfs_proc_write_rpc_prepare,

	.write_done	= nfs_write_done,

	.commit_setup	= nfs_proc_commit_setup,

	.commit_rpc_prepare = nfs_proc_commit_rpc_prepare,