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

Commit 1abb5088 authored by Bryan Schumaker's avatar Bryan Schumaker Committed by Trond Myklebust
Browse files

NFS: Create an read_pageio_init() function 



pNFS needs to select a read function based on the layout driver
currently in use, so I let each NFS version decide how to best handle
initializing reads.

Signed-off-by: default avatarBryan Schumaker <bjschuma@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 6663ee7f

fs/nfs/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ extern int nfs_initiate_read(struct rpc_clnt *clnt, 
extern void nfs_read_prepare(struct rpc_task *task, void *calldata);

extern int nfs_generic_pagein(struct nfs_pageio_descriptor *desc,

			      struct nfs_pgio_header *hdr);

extern void nfs_pageio_init_read_mds(struct nfs_pageio_descriptor *pgio,

extern void nfs_pageio_init_read(struct nfs_pageio_descriptor *pgio,

			struct inode *inode,

			const struct nfs_pgio_completion_ops *compl_ops);

extern void nfs_pageio_reset_read_mds(struct nfs_pageio_descriptor *pgio);

fs/nfs/nfs3proc.c

+1 −0
Original line number Diff line number Diff line
@@ -921,6 +921,7 @@ 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

+1 −0
Original line number Diff line number Diff line
@@ -6792,6 +6792,7 @@ 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

+5 −6
Original line number Diff line number Diff line
@@ -1209,7 +1209,7 @@ pnfs_generic_pg_init_write(struct nfs_pageio_descriptor *pgio, struct nfs_page * 
}

EXPORT_SYMBOL_GPL(pnfs_generic_pg_init_write);



bool

void

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

		      const struct nfs_pgio_completion_ops *compl_ops)

{
@@ -1217,10 +1217,9 @@ pnfs_pageio_init_read(struct nfs_pageio_descriptor *pgio, struct inode *inode, 
	struct pnfs_layoutdriver_type *ld = server->pnfs_curr_ld;



	if (ld == NULL)

		return false;

	nfs_pageio_init(pgio, inode, ld->pg_read_ops, compl_ops,

			server->rsize, 0);

	return true;

		nfs_pageio_init_read(pgio, inode, compl_ops);

	else

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

}



bool
@@ -1427,7 +1426,7 @@ int pnfs_read_done_resend_to_mds(struct inode *inode, 
	LIST_HEAD(failed);



	/* Resend all requests through the MDS */

	nfs_pageio_init_read_mds(&pgio, inode, compl_ops);

	nfs_pageio_init_read(&pgio, inode, compl_ops);

	while (!list_empty(head)) {

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

fs/nfs/pnfs.h

+3 −3
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ extern int nfs4_proc_layoutreturn(struct nfs4_layoutreturn *lrp); 
void get_layout_hdr(struct pnfs_layout_hdr *lo);

void put_lseg(struct pnfs_layout_segment *lseg);



bool pnfs_pageio_init_read(struct nfs_pageio_descriptor *, struct inode *,

void pnfs_pageio_init_read(struct nfs_pageio_descriptor *, struct inode *,

			   const struct nfs_pgio_completion_ops *);

bool pnfs_pageio_init_write(struct nfs_pageio_descriptor *, struct inode *,

			    int, const struct nfs_pgio_completion_ops *);
@@ -438,10 +438,10 @@ static inline void unset_pnfs_layoutdriver(struct nfs_server *s) 
{

}



static inline bool pnfs_pageio_init_read(struct nfs_pageio_descriptor *pgio, struct inode *inode,

static inline void pnfs_pageio_init_read(struct nfs_pageio_descriptor *pgio, struct inode *inode,

					 const struct nfs_pgio_completion_ops *compl_ops)

{

	return false;

	nfs_pageio_init_read(pgio, inode, compl_ops);

}



static inline bool pnfs_pageio_init_write(struct nfs_pageio_descriptor *pgio, struct inode *inode, int ioflags,