[PATCH 08/24] pnfs: remove PNFS_LAYOUTGET_ON_OPEN

Fred Isaman
2010-06-08T04:19:46Z

It is not used anywhere.

Signed-off-by: Fred Isaman <iisaman@netapp.com>
---
fs/nfs/nfs4filelayout.c | 3 +--
include/linux/nfs4_pnfs.h | 14 --------------
2 files changed, 1 insertions(+), 16 deletions(-)

diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c
index c15b90a..7fc93e6 100644
--- a/fs/nfs/nfs4filelayout.c
+++ b/fs/nfs/nfs4filelayout.c
@@ -710,8 +710,7 @@ struct layoutdriver_io_operations filelayout_io_operations = {
};

struct layoutdriver_policy_operations filelayout_policy_operations = {
- .flags = PNFS_USE_RPC_CODE |
- PNFS_LAYOUTGET_ON_OPEN,
+ .flags = PNFS_USE_RPC_CODE,
.get_stripesize = filelayout_get_stripesize,
.pg_test = filelayout_pg_test,
};
diff --git a/include/linux/nfs4_pnfs.h b/include/linux/nfs4_pnfs.h
index 53626d4..80acd7a 100644
--- a/include/linux/nfs4_pnfs.h
+++ b/include/linux/nfs4_pnfs.h
@@ -171,11 +171,6 @@ enum layoutdriver_policy_flags {
/* Should the NFS req. gather algorithm cross stripe boundaries? */
PNFS_GATHER_ACROSS_STRIPES = 1 << 1,

- /* Should the pNFS client issue a layoutget call in the
- * same compound as the OPEN operation?
- */
- PNFS_LAYOUTGET_ON_OPEN = 1 << 2,
-
/* Should the pNFS client commit and return the layout upon a setattr */
PNFS_LAYOUTRET_ON_SETATTR = 1 << 3,
};
@@ -204,15 +199,6 @@ pnfs_ld_gather_across_stripes(struct pnfs_layoutdriver_type *ld)
return ld->ld_policy_ops->flags & PNFS_GATHER_ACROSS_STRIPES;
}

-/* Should the pNFS client issue a layoutget call in the
- * same compound as the OPEN operation?
- */
-static inline int
-pnfs_ld_layoutget_on_open(struct pnfs_layoutdriver_type *ld)
-{
- return ld->ld_policy_ops->flags & PNFS_LAYOUTGET_ON_OPEN;
-}
-
/* Should the pNFS client commit and return the layout upon a setattr
*/
static inline int
--
1.6.6.1