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

Commit b5973a8c authored by Trond Myklebust's avatar Trond Myklebust Committed by Anna Schumaker
Browse files

NFS: Remove unused fields in the page I/O structures 



Remove the 'layout_private' fields that were only used by the pNFS OSD
layout driver.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 92ea011f

fs/nfs/pagelist.c

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

	hdr->good_bytes = mirror->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)
@@ -711,7 +710,6 @@ 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;

	desc->pg_bsize = bsize;



	desc->pg_mirror_count = 1;

include/linux/nfs_page.h

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

	unsigned int		pg_bsize;	/* default bsize for mirrors */



	u32			pg_mirror_count;

include/linux/nfs_xdr.h

+0 −1
Original line number Diff line number Diff line
@@ -1436,7 +1436,6 @@ struct nfs_pgio_header { 
	const struct nfs_pgio_completion_ops *completion_ops;

	const struct nfs_rw_ops	*rw_ops;

	struct nfs_direct_req	*dreq;

	void			*layout_private;

	spinlock_t		lock;

	/* fields protected by lock */

	int			pnfs_error;