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

Commit 57208fa7 authored by Bryan Schumaker's avatar Bryan Schumaker Committed by Trond Myklebust
Browse files

NFS: Create an write_pageio_init() function 



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

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

fs/nfs/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ extern struct nfs_write_header *nfs_writehdr_alloc(void); 
extern void nfs_writehdr_free(struct nfs_pgio_header *hdr);

extern int nfs_generic_flush(struct nfs_pageio_descriptor *desc,

			     struct nfs_pgio_header *hdr);

extern void nfs_pageio_init_write_mds(struct nfs_pageio_descriptor *pgio,

extern void nfs_pageio_init_write(struct nfs_pageio_descriptor *pgio,

			struct inode *inode, int ioflags,

			const struct nfs_pgio_completion_ops *compl_ops);

extern void nfs_pageio_reset_write_mds(struct nfs_pageio_descriptor *pgio);

fs/nfs/nfs3proc.c

+1 −0
Original line number Diff line number Diff line
@@ -925,6 +925,7 @@ const struct nfs_rpc_ops nfs_v3_clientops = { 
	.read_rpc_prepare = nfs3_proc_read_rpc_prepare,

	.read_done	= nfs3_read_done,

	.write_setup	= nfs3_proc_write_setup,

	.write_pageio_init = nfs_pageio_init_write,

	.write_rpc_prepare = nfs3_proc_write_rpc_prepare,

	.write_done	= nfs3_write_done,

	.commit_setup	= nfs3_proc_commit_setup,

fs/nfs/nfs4proc.c

+1 −0
Original line number Diff line number Diff line
@@ -6796,6 +6796,7 @@ const struct nfs_rpc_ops nfs_v4_clientops = { 
	.read_rpc_prepare = nfs4_proc_read_rpc_prepare,

	.read_done	= nfs4_read_done,

	.write_setup	= nfs4_proc_write_setup,

	.write_pageio_init = pnfs_pageio_init_write,

	.write_rpc_prepare = nfs4_proc_write_rpc_prepare,

	.write_done	= nfs4_write_done,

	.commit_setup	= nfs4_proc_commit_setup,

fs/nfs/pnfs.c

+5 −6
Original line number Diff line number Diff line
@@ -1222,7 +1222,7 @@ pnfs_pageio_init_read(struct nfs_pageio_descriptor *pgio, struct inode *inode, 
		nfs_pageio_init(pgio, inode, ld->pg_read_ops, compl_ops, server->rsize, 0);

}



bool

void

pnfs_pageio_init_write(struct nfs_pageio_descriptor *pgio, struct inode *inode,

		       int ioflags,

		       const struct nfs_pgio_completion_ops *compl_ops)
@@ -1231,10 +1231,9 @@ pnfs_pageio_init_write(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_write_ops, compl_ops,

			server->wsize, ioflags);

	return true;

		nfs_pageio_init_write(pgio, inode, ioflags, compl_ops);

	else

		nfs_pageio_init(pgio, inode, ld->pg_write_ops, compl_ops, server->wsize, ioflags);

}



bool
@@ -1271,7 +1270,7 @@ int pnfs_write_done_resend_to_mds(struct inode *inode, 
	LIST_HEAD(failed);



	/* Resend all requests through the MDS */

	nfs_pageio_init_write_mds(&pgio, inode, FLUSH_STABLE, compl_ops);

	nfs_pageio_init_write(&pgio, inode, FLUSH_STABLE, 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
@@ -180,7 +180,7 @@ void put_lseg(struct pnfs_layout_segment *lseg); 


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

void pnfs_pageio_init_write(struct nfs_pageio_descriptor *, struct inode *,

			    int, const struct nfs_pgio_completion_ops *);



void set_pnfs_layoutdriver(struct nfs_server *, const struct nfs_fh *, u32);
@@ -444,10 +444,10 @@ static inline void pnfs_pageio_init_read(struct nfs_pageio_descriptor *pgio, str 
	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,

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

					  const struct nfs_pgio_completion_ops *compl_ops)

{

	return false;

	nfs_pageio_init_write(pgio, inode, ioflags, compl_ops);

}



static inline int