From: Andy Adamson <andros@xxxxxxxxxx>
Prepare to remove unused threshold calculations
Squash into: "pnfs:initialize pnfs_pageio for write"
Signed-off-by: Andy Adamson <andros@xxxxxxxxxx>
---
fs/nfs/pnfs.c | 3 ---
include/linux/nfs_page.h | 1 -
2 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index c48bcd7..226ab4f 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -1402,7 +1402,6 @@ pnfs_pageio_init_read(struct nfs_pageio_descriptor *pgio,
loff_t loff;
int status = 0;
- pgio->pg_threshold = 0;
pgio->pg_iswrite = 0;
pgio->pg_boundary = 0;
pgio->pg_test = NULL;
@@ -1433,12 +1432,10 @@ pnfs_pageio_init_write(struct nfs_pageio_descriptor *pgio, struct inode *inode)
pgio->pg_iswrite = 1;
if (!pnfs_enabled_sb(server)) {
- pgio->pg_threshold = 0;
pgio->pg_boundary = 0;
pgio->pg_test = NULL;
return;
}
- pgio->pg_threshold = pnfs_getthreshold(inode, 1);
pgio->pg_boundary = pnfs_getboundary(inode);
pnfs_set_pg_test(inode, pgio);
}
diff --git a/include/linux/nfs_page.h b/include/linux/nfs_page.h
index df93480..d04ebb2 100644
--- a/include/linux/nfs_page.h
+++ b/include/linux/nfs_page.h
@@ -62,7 +62,6 @@ struct nfs_pageio_descriptor {
int pg_ioflags;
int pg_error;
#ifdef CONFIG_NFS_V4_1
- size_t pg_threshold;
int pg_iswrite;
int pg_boundary;
int (*pg_test)(struct nfs_pageio_descriptor *, struct nfs_page *, struct nfs_page *);
--
1.6.6
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
