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

Commit fab5fc25 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Trond Myklebust
Browse files

nfs: remove ->read_pageio_init from rpc ops 



The read_pageio_init method is just a very convoluted way to grab the
right nfs_pageio_ops vector.  The vector to chose is not a choice of
protocol version, but just a pNFS vs MDS I/O choice that can simply be
done inside nfs_pageio_init_read based on the presence of a layout
driver, and a new force_mds flag to the special case of falling back
to MDS I/O on a pNFS-capable volume.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Tested-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent a20c93e3

fs/nfs/direct.c

+1 −1
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ static ssize_t nfs_direct_read_schedule_iovec(struct nfs_direct_req *dreq, 
	size_t requested_bytes = 0;

	unsigned long seg;



	NFS_PROTO(dreq->inode)->read_pageio_init(&desc, dreq->inode,

	nfs_pageio_init_read(&desc, dreq->inode, false,

			     &nfs_direct_read_completion_ops);

	get_dreq(dreq);

	desc.pg_dreq = dreq;

fs/nfs/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -398,7 +398,7 @@ struct nfs_pgio_completion_ops; 
extern struct nfs_read_header *nfs_readhdr_alloc(void);

extern void nfs_readhdr_free(struct nfs_pgio_header *hdr);

extern void nfs_pageio_init_read(struct nfs_pageio_descriptor *pgio,

			struct inode *inode,

			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_read_data *data,

fs/nfs/nfs3proc.c

+0 −1
Original line number Diff line number Diff line
@@ -947,7 +947,6 @@ const struct nfs_rpc_ops nfs_v3_clientops = { 
	.pathconf	= nfs3_proc_pathconf,

	.decode_dirent	= nfs3_decode_dirent,

	.read_setup	= nfs3_proc_read_setup,

	.read_pageio_init = nfs_pageio_init_read,

	.read_rpc_prepare = nfs3_proc_read_rpc_prepare,

	.read_done	= nfs3_read_done,

	.write_setup	= nfs3_proc_write_setup,

fs/nfs/nfs4proc.c

+0 −1
Original line number Diff line number Diff line
@@ -8433,7 +8433,6 @@ const struct nfs_rpc_ops nfs_v4_clientops = { 
	.set_capabilities = nfs4_server_capabilities,

	.decode_dirent	= nfs4_decode_dirent,

	.read_setup	= nfs4_proc_read_setup,

	.read_pageio_init = pnfs_pageio_init_read,

	.read_rpc_prepare = nfs4_proc_read_rpc_prepare,

	.read_done	= nfs4_read_done,

	.write_setup	= nfs4_proc_write_setup,

fs/nfs/pnfs.c

+1 −14
Original line number Diff line number Diff line
@@ -1434,19 +1434,6 @@ pnfs_generic_pg_init_write(struct nfs_pageio_descriptor *pgio, 
}

EXPORT_SYMBOL_GPL(pnfs_generic_pg_init_write);



void

pnfs_pageio_init_read(struct nfs_pageio_descriptor *pgio, struct inode *inode,

		      const struct nfs_pgio_completion_ops *compl_ops)

{

	struct nfs_server *server = NFS_SERVER(inode);

	struct pnfs_layoutdriver_type *ld = server->pnfs_curr_ld;



	if (ld == NULL)

		nfs_pageio_init_read(pgio, inode, compl_ops);

	else

		nfs_pageio_init(pgio, inode, ld->pg_read_ops, compl_ops, server->rsize, 0);

}



bool

pnfs_generic_pg_test(struct nfs_pageio_descriptor *pgio, struct nfs_page *prev,

		     struct nfs_page *req)
@@ -1641,7 +1628,7 @@ int pnfs_read_done_resend_to_mds(struct inode *inode, 
	LIST_HEAD(failed);



	/* Resend all requests through the MDS */

	nfs_pageio_init_read(&pgio, inode, compl_ops);

	nfs_pageio_init_read(&pgio, inode, true, compl_ops);

	pgio.pg_dreq = dreq;

	while (!list_empty(head)) {

		struct nfs_page *req = nfs_list_entry(head->next);