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

Commit f6166384 authored by Peng Tao's avatar Peng Tao Committed by Trond Myklebust
Browse files

NFS41: add pg_layout_private to nfs_pageio_descriptor 



To allow layout driver to pass private information around
pg_init/pg_doio.

Signed-off-by: default avatarPeng Tao <tao.peng@emc.com>
Signed-off-by: default avatarBoaz Harrosh <bharrosh@panasas.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 21d1f58a

fs/nfs/pagelist.c

+2 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ void nfs_pgheader_init(struct nfs_pageio_descriptor *desc, 
	hdr->io_start = req_offset(hdr->req);

	hdr->good_bytes = desc->pg_count;

	hdr->dreq = desc->pg_dreq;

	hdr->layout_private = desc->pg_layout_private;

	hdr->release = release;

	hdr->completion_ops = desc->pg_completion_ops;

	if (hdr->completion_ops->init_hdr)
@@ -268,6 +269,7 @@ void nfs_pageio_init(struct nfs_pageio_descriptor *desc, 
	desc->pg_error = 0;

	desc->pg_lseg = NULL;

	desc->pg_dreq = NULL;

	desc->pg_layout_private = NULL;

}

EXPORT_SYMBOL_GPL(nfs_pageio_init);

include/linux/nfs_page.h

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ struct nfs_pageio_descriptor { 
	const struct nfs_pgio_completion_ops *pg_completion_ops;

	struct pnfs_layout_segment *pg_lseg;

	struct nfs_direct_req	*pg_dreq;

	void			*pg_layout_private;

};



#define NFS_WBACK_BUSY(req)	(test_bit(PG_BUSY,&(req)->wb_flags))

include/linux/nfs_xdr.h

+1 −0
Original line number Diff line number Diff line
@@ -1248,6 +1248,7 @@ struct nfs_pgio_header { 
	void (*release) (struct nfs_pgio_header *hdr);

	const struct nfs_pgio_completion_ops *completion_ops;

	struct nfs_direct_req	*dreq;

	void			*layout_private;

	spinlock_t		lock;

	/* fields protected by lock */

	int			pnfs_error;