[PATCH 0/2] get rid of threshold policy ops

[PATCH 0/2] get rid of threshold policy ops

[Benny Halevy]

Following Andy's "pnfs_submit:: Remove threshold calculations" patchset:
http://marc.info/?l=linux-nfs&m=127367698029679&w=2

I obliterated the threshold methods from the objects and blocks layout
drivers as follows:

[PATCH 1/1] SQUASHME: pnfs-obj: get rid of threshold policy ops
[PATCH 2/2] SQUASHME: pnfsblock: get rid of threshold policy ops

[PATCH 1/1] SQUASHME: pnfs-obj: get rid of threshold policy ops

[Benny Halevy]

Signed-off-by: Benny Halevy <bhalevy@panasas.com>
---
 fs/nfs/objlayout/objio_osd.c  |   13 -------------
 fs/nfs/objlayout/panfs_shim.c |   14 --------------
 2 files changed, 0 insertions(+), 27 deletions(-)

diff --git a/fs/nfs/objlayout/objio_osd.c b/fs/nfs/objlayout/objio_osd.c
index 642d6fa..315f8c6 100644
--- a/fs/nfs/objlayout/objio_osd.c
+++ b/fs/nfs/objlayout/objio_osd.c
@@ -1022,17 +1022,6 @@ objlayout_get_blocksize(void)
 	return sz;
 }
 
-/*
- * Get the I/O threshold
- */
-static ssize_t
-objlayout_get_io_threshold(struct pnfs_layout_type *layoutid,
-			   struct inode *inode)
-{
-	ssize_t sz = -1;
-	return sz;
-}
-
 static struct layoutdriver_policy_operations objlayout_policy_operations = {
 /*
  * Don't gather across stripes, but rather gather (coalesce) up to
@@ -1044,8 +1033,6 @@ static struct layoutdriver_policy_operations objlayout_policy_operations = {
 				 PNFS_LAYOUTRET_ON_SETATTR,
 	.get_stripesize        = objlayout_get_stripesize,
 	.get_blocksize         = objlayout_get_blocksize,
-	.get_read_threshold    = objlayout_get_io_threshold,
-	.get_write_threshold   = objlayout_get_io_threshold,
 };
 
 static struct pnfs_layoutdriver_type objlayout_type = {
diff --git a/fs/nfs/objlayout/panfs_shim.c b/fs/nfs/objlayout/panfs_shim.c
index 6033d2b..4468703 100644
--- a/fs/nfs/objlayout/panfs_shim.c
+++ b/fs/nfs/objlayout/panfs_shim.c
@@ -663,18 +663,6 @@ panlayout_get_blocksize(void)
 	return sz;
 }
 
-/*
- * Get the I/O threshold
- */
-static ssize_t
-panlayout_get_io_threshold(struct pnfs_layout_type *layoutid,
-			   struct inode *inode)
-{
-	ssize_t sz = -1;
-	dprintk("%s: Return %Zd\n", __func__, sz);
-	return sz;
-}
-
 static struct layoutdriver_policy_operations panlayout_policy_operations = {
 /*
  * Don't gather across stripes, but rather gather (coalesce) up to
@@ -686,8 +674,6 @@ static struct layoutdriver_policy_operations panlayout_policy_operations = {
 				 PNFS_LAYOUTRET_ON_SETATTR,
 	.get_stripesize        = panlayout_get_stripesize,
 	.get_blocksize         = panlayout_get_blocksize,
-	.get_read_threshold    = panlayout_get_io_threshold,
-	.get_write_threshold   = panlayout_get_io_threshold,
 };
 
 #define PNFS_LAYOUT_PANOSD (NFS4_PNFS_PRIVATE_LAYOUT | LAYOUT_OSD2_OBJECTS)
-- 
1.6.6.1

[PATCH 2/2] SQUASHME: pnfsblock: get rid of threshold policy ops

[Benny Halevy]

Signed-off-by: Benny Halevy <bhalevy@panasas.com>
---
 fs/nfs/blocklayout/blocklayout.c |    9 ---------
 1 files changed, 0 insertions(+), 9 deletions(-)

diff --git a/fs/nfs/blocklayout/blocklayout.c b/fs/nfs/blocklayout/blocklayout.c
index 688984f..66044d4 100644
--- a/fs/nfs/blocklayout/blocklayout.c
+++ b/fs/nfs/blocklayout/blocklayout.c
@@ -1105,13 +1105,6 @@ bl_get_stripesize(struct pnfs_layout_type *lo)
 	return 0;
 }
 
-static ssize_t
-bl_get_io_threshold(struct pnfs_layout_type *lo, struct inode *inode)
-{
-	dprintk("%s enter\n", __func__);
-	return 0;
-}
-
 /* This is called by nfs_can_coalesce_requests via nfs_pageio_do_add_request.
  * Should return False if there is a reason requests can not be coalesced,
  * otherwise, should default to returning True.
@@ -1162,8 +1155,6 @@ static struct layoutdriver_io_operations blocklayout_io_operations = {
 
 static struct layoutdriver_policy_operations blocklayout_policy_operations = {
 	.get_stripesize			= bl_get_stripesize,
-	.get_read_threshold		= bl_get_io_threshold,
-	.get_write_threshold		= bl_get_io_threshold,
 	.pg_test			= bl_pg_test,
 	.do_flush			= bl_do_flush,
 };
-- 
1.6.6.1