Commit c5996c4e authored by Fred Isaman's avatar Fred Isaman Committed by Trond Myklebust
Browse files

NFS: reverse arg order in nfs_initiate_[read|write] 



Make it consistent with nfs_initiate_commit.

Signed-off-by: default avatarFred Isaman <iisaman@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 31f6852a

fs/nfs/internal.h

+4 −3
Original line number Diff line number Diff line
@@ -296,7 +296,8 @@ extern int nfs4_get_rootfh(struct nfs_server *server, struct nfs_fh *mntfh); 


struct nfs_pageio_descriptor;

/* read.c */

extern int nfs_initiate_read(struct nfs_read_data *data, struct rpc_clnt *clnt,

extern int nfs_initiate_read(struct rpc_clnt *clnt,

			     struct nfs_read_data *data,

			     const struct rpc_call_ops *call_ops);

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

extern int nfs_generic_pagein(struct nfs_pageio_descriptor *desc,
@@ -315,8 +316,8 @@ extern void nfs_pageio_init_write_mds(struct nfs_pageio_descriptor *pgio, 
extern void nfs_pageio_reset_write_mds(struct nfs_pageio_descriptor *pgio);

extern void nfs_writedata_release(struct nfs_write_data *wdata);

extern void nfs_commit_free(struct nfs_commit_data *p);

extern int nfs_initiate_write(struct nfs_write_data *data,

			      struct rpc_clnt *clnt,

extern int nfs_initiate_write(struct rpc_clnt *clnt,

			      struct nfs_write_data *data,

			      const struct rpc_call_ops *call_ops,

			      int how);

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

fs/nfs/nfs4filelayout.c

+2 −2
Original line number Diff line number Diff line
@@ -413,7 +413,7 @@ filelayout_read_pagelist(struct nfs_read_data *data) 
	data->mds_offset = offset;



	/* Perform an asynchronous read to ds */

	status = nfs_initiate_read(data, ds->ds_clp->cl_rpcclient,

	status = nfs_initiate_read(ds->ds_clp->cl_rpcclient, data,

				   &filelayout_read_call_ops);

	BUG_ON(status != 0);

	return PNFS_ATTEMPTED;
@@ -460,7 +460,7 @@ filelayout_write_pagelist(struct nfs_write_data *data, int sync) 
	data->args.offset = filelayout_get_dserver_offset(lseg, offset);



	/* Perform an asynchronous write */

	status = nfs_initiate_write(data, ds->ds_clp->cl_rpcclient,

	status = nfs_initiate_write(ds->ds_clp->cl_rpcclient, data,

				    &filelayout_write_call_ops, sync);

	BUG_ON(status != 0);

	return PNFS_ATTEMPTED;

fs/nfs/read.c

+3 −2
Original line number Diff line number Diff line
@@ -169,7 +169,8 @@ static void nfs_readpage_release(struct nfs_page *req) 
	nfs_release_request(req);

}



int nfs_initiate_read(struct nfs_read_data *data, struct rpc_clnt *clnt,

int nfs_initiate_read(struct rpc_clnt *clnt,

		      struct nfs_read_data *data,

		      const struct rpc_call_ops *call_ops)

{

	struct inode *inode = data->inode;
@@ -240,7 +241,7 @@ static int nfs_do_read(struct nfs_read_data *data, 
{

	struct inode *inode = data->args.context->dentry->d_inode;



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

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

}



static int

fs/nfs/write.c

+3 −3
Original line number Diff line number Diff line
@@ -836,8 +836,8 @@ static int flush_task_priority(int how) 
	return RPC_PRIORITY_NORMAL;

}



int nfs_initiate_write(struct nfs_write_data *data,

		       struct rpc_clnt *clnt,

int nfs_initiate_write(struct rpc_clnt *clnt,

		       struct nfs_write_data *data,

		       const struct rpc_call_ops *call_ops,

		       int how)

{
@@ -937,7 +937,7 @@ static int nfs_do_write(struct nfs_write_data *data, 
{

	struct inode *inode = data->args.context->dentry->d_inode;



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

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

}



static int nfs_do_multiple_writes(struct list_head *head,