From: Andy Adamson <andros@xxxxxxxxxx>
Unused by the file layout. Will restore.
Signed-off-by: Andy Adamson <andros@xxxxxxxxxx>
---
fs/nfs/pnfs.c | 4 ----
include/linux/nfs4_pnfs.h | 10 ----------
2 files changed, 0 insertions(+), 14 deletions(-)
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index 56c3af4..d3df8df 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -1191,10 +1191,6 @@ pnfs_getboundary(struct inode *inode)
if (!policy_ops || !policy_ops->get_stripesize)
goto out;
- /* The default is to not gather across stripes */
- if (pnfs_ld_gather_across_stripes(nfss->pnfs_curr_ld))
- goto out;
-
spin_lock(&inode->i_lock);
if (NFS_I(inode)->layout)
stripe_size = policy_ops->get_stripesize(NFS_I(inode)->layout);
diff --git a/include/linux/nfs4_pnfs.h b/include/linux/nfs4_pnfs.h
index 9eebbdd..eb9dfe4 100644
--- a/include/linux/nfs4_pnfs.h
+++ b/include/linux/nfs4_pnfs.h
@@ -156,9 +156,6 @@ struct layoutdriver_io_operations {
};
enum layoutdriver_policy_flags {
- /* Should the NFS req. gather algorithm cross stripe boundaries? */
- PNFS_GATHER_ACROSS_STRIPES = 1 << 1,
-
/* Should the pNFS client commit and return the layout upon a setattr */
PNFS_LAYOUTRET_ON_SETATTR = 1 << 3,
};
@@ -173,13 +170,6 @@ struct layoutdriver_policy_operations {
int (*pg_test)(struct nfs_pageio_descriptor *, struct nfs_page *, struct nfs_page *);
};
-/* Should the NFS req. gather algorithm cross stripe boundaries? */
-static inline int
-pnfs_ld_gather_across_stripes(struct pnfs_layoutdriver_type *ld)
-{
- return ld->ld_policy_ops->flags & PNFS_GATHER_ACROSS_STRIPES;
-}
-
struct pnfs_device {
struct pnfs_deviceid dev_id;
unsigned int layout_type;
--
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
