[20/40] SQUASHME pnfs-submit wave3 remove nr_pages from read_pagelist

Commit Message

Andy Adamson Feb. 4, 2011, 9:33 p.m. UTC

None

Patch

diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c
index dce90a0..2b5a38e 100644
--- a/fs/nfs/nfs4filelayout.c
+++ b/fs/nfs/nfs4filelayout.c
@@ -133,7 +133,7 @@  struct rpc_call_ops filelayout_read_call_ops = {
 };
 
 static enum pnfs_try_status
-filelayout_read_pagelist(struct nfs_read_data *data, unsigned nr_pages)
+filelayout_read_pagelist(struct nfs_read_data *data)
 {
 	struct pnfs_layout_segment *lseg = data->pdata.lseg;
 	struct nfs4_pnfs_ds *ds;
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index d06e9ea..4c49109 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -943,8 +943,7 @@  pnfs_try_to_read_data(struct nfs_read_data *rdata,
 	get_lseg(lseg);
 
 	rdata->pdata.lseg = lseg;
-	trypnfs = nfss->pnfs_curr_ld->read_pagelist(rdata,
-		nfs_page_array_len(rdata->args.pgbase, rdata->args.count));
+	trypnfs = nfss->pnfs_curr_ld->read_pagelist(rdata);
 	if (trypnfs == PNFS_NOT_ATTEMPTED) {
 		rdata->pdata.lseg = NULL;
 		put_lseg(lseg);
diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h
index 2e231e3..cbbcdfa 100644
--- a/fs/nfs/pnfs.h
+++ b/fs/nfs/pnfs.h
@@ -84,7 +84,7 @@  struct pnfs_layoutdriver_type {
 	 * MUST be called.
 	 */
 	enum pnfs_try_status
-	(*read_pagelist) (struct nfs_read_data *nfs_data, unsigned nr_pages);
+	(*read_pagelist) (struct nfs_read_data *nfs_data);
 };
 
 struct pnfs_layout_hdr {