Commit df24c483 authored by Mike Snitzer's avatar Mike Snitzer Committed by Anna Schumaker
Browse files

nfs: pass struct nfsd_file to nfs_init_pgio and nfs_init_commit 



The nfsd_file will be passed, in future commits, by callers
that enable LOCALIO support (for both regular NFS and pNFS IO).

[Derived from patch authored by Weston Andros Adamson, but switched
 from passing struct file to struct nfsd_file]

Signed-off-by: default avatarMike Snitzer <snitzer@kernel.org>
Reviewed-by: default avatarNeilBrown <neilb@suse.de>
Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarAnna Schumaker <anna.schumaker@oracle.com>
parent 946af9b3

fs/nfs/filelayout/filelayout.c

+3 −3
Original line number Diff line number Diff line
@@ -488,7 +488,7 @@ filelayout_read_pagelist(struct nfs_pgio_header *hdr) 
	/* Perform an asynchronous read to ds */

	nfs_initiate_pgio(ds_clnt, hdr, hdr->cred,

			  NFS_PROTO(hdr->inode), &filelayout_read_call_ops,

			  0, RPC_TASK_SOFTCONN);

			  0, RPC_TASK_SOFTCONN, NULL);

	return PNFS_ATTEMPTED;

}
@@ -530,7 +530,7 @@ filelayout_write_pagelist(struct nfs_pgio_header *hdr, int sync) 
	/* Perform an asynchronous write */

	nfs_initiate_pgio(ds_clnt, hdr, hdr->cred,

			  NFS_PROTO(hdr->inode), &filelayout_write_call_ops,

			  sync, RPC_TASK_SOFTCONN);

			  sync, RPC_TASK_SOFTCONN, NULL);

	return PNFS_ATTEMPTED;

}
@@ -1011,7 +1011,7 @@ static int filelayout_initiate_commit(struct nfs_commit_data *data, int how) 
		data->args.fh = fh;

	return nfs_initiate_commit(ds_clnt, data, NFS_PROTO(data->inode),

				   &filelayout_commit_call_ops, how,

				   RPC_TASK_SOFTCONN);

				   RPC_TASK_SOFTCONN, NULL);

out_err:

	pnfs_generic_prepare_to_resend_writes(data);

	pnfs_generic_commit_release(data);

fs/nfs/flexfilelayout/flexfilelayout.c

+3 −3
Original line number Diff line number Diff line
@@ -1806,7 +1806,7 @@ ff_layout_read_pagelist(struct nfs_pgio_header *hdr) 
	nfs_initiate_pgio(ds_clnt, hdr, ds_cred, ds->ds_clp->rpc_ops,

			  vers == 3 ? &ff_layout_read_call_ops_v3 :

				      &ff_layout_read_call_ops_v4,

			  0, RPC_TASK_SOFTCONN);

			  0, RPC_TASK_SOFTCONN, NULL);

	put_cred(ds_cred);

	return PNFS_ATTEMPTED;
@@ -1874,7 +1874,7 @@ ff_layout_write_pagelist(struct nfs_pgio_header *hdr, int sync) 
	nfs_initiate_pgio(ds_clnt, hdr, ds_cred, ds->ds_clp->rpc_ops,

			  vers == 3 ? &ff_layout_write_call_ops_v3 :

				      &ff_layout_write_call_ops_v4,

			  sync, RPC_TASK_SOFTCONN);

			  sync, RPC_TASK_SOFTCONN, NULL);

	put_cred(ds_cred);

	return PNFS_ATTEMPTED;
@@ -1949,7 +1949,7 @@ static int ff_layout_initiate_commit(struct nfs_commit_data *data, int how) 
	ret = nfs_initiate_commit(ds_clnt, data, ds->ds_clp->rpc_ops,

				   vers == 3 ? &ff_layout_commit_call_ops_v3 :

					       &ff_layout_commit_call_ops_v4,

				   how, RPC_TASK_SOFTCONN);

				   how, RPC_TASK_SOFTCONN, NULL);

	put_cred(ds_cred);

	return ret;

out_err:

fs/nfs/internal.h

+5 −2
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <linux/crc32.h>

#include <linux/sunrpc/addr.h>

#include <linux/nfs_page.h>

#include <linux/nfslocalio.h>

#include <linux/wait_bit.h>



#define NFS_SB_MASK (SB_RDONLY|SB_NOSUID|SB_NODEV|SB_NOEXEC|SB_SYNCHRONOUS)
@@ -308,7 +309,8 @@ void nfs_pgio_header_free(struct nfs_pgio_header *); 
int nfs_generic_pgio(struct nfs_pageio_descriptor *, struct nfs_pgio_header *);

int nfs_initiate_pgio(struct rpc_clnt *clnt, struct nfs_pgio_header *hdr,

		      const struct cred *cred, const struct nfs_rpc_ops *rpc_ops,

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

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

		      struct nfsd_file *localio);

void nfs_free_request(struct nfs_page *req);

struct nfs_pgio_mirror *

nfs_pgio_current_mirror(struct nfs_pageio_descriptor *desc);
@@ -527,7 +529,8 @@ extern int nfs_initiate_commit(struct rpc_clnt *clnt, 
			       struct nfs_commit_data *data,

			       const struct nfs_rpc_ops *nfs_ops,

			       const struct rpc_call_ops *call_ops,

			       int how, int flags);

			       int how, int flags,

			       struct nfsd_file *localio);

extern void nfs_init_commit(struct nfs_commit_data *data,

			    struct list_head *head,

			    struct pnfs_layout_segment *lseg,

fs/nfs/pagelist.c

+4 −2
Original line number Diff line number Diff line
@@ -731,7 +731,8 @@ static void nfs_pgio_prepare(struct rpc_task *task, void *calldata) 


int nfs_initiate_pgio(struct rpc_clnt *clnt, struct nfs_pgio_header *hdr,

		      const struct cred *cred, const struct nfs_rpc_ops *rpc_ops,

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

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

		      struct nfsd_file *localio)

{

	struct rpc_task *task;

	struct rpc_message msg = {
@@ -961,7 +962,8 @@ static int nfs_generic_pg_pgios(struct nfs_pageio_descriptor *desc) 
					NFS_PROTO(hdr->inode),

					desc->pg_rpc_callops,

					desc->pg_ioflags,

					RPC_TASK_CRED_NOREF | task_flags);

					RPC_TASK_CRED_NOREF | task_flags,

					NULL);

	}

	return ret;

}

fs/nfs/pnfs_nfs.c

+1 −1
Original line number Diff line number Diff line
@@ -490,7 +490,7 @@ pnfs_generic_commit_pagelist(struct inode *inode, struct list_head *mds_pages, 
			nfs_initiate_commit(NFS_CLIENT(inode), data,

					    NFS_PROTO(data->inode),

					    data->mds_ops, how,

					    RPC_TASK_CRED_NOREF);

					    RPC_TASK_CRED_NOREF, NULL);

		} else {

			nfs_init_commit(data, NULL, data->lseg, cinfo);

			initiate_commit(data, how);