[pnfs] [PATCH] Remove the flag EXCHGID4_FLAG_USE_NON_PNFS.

[Marc Eshel]

From: Marc Eshel <eshel at almaden.ibm.com>


---

 fs/nfsd/nfs4state.c     |    3 ---
 include/linux/nfs4.h    |    1 -
 include/linux/nfs_xdr.h |    1 -
 3 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index b879b2f..b73c928 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -1125,9 +1125,6 @@ nfsd4_set_ex_flags(struct nfs4_client *n
 	/* Referrals are supported, Migration is not. */
 	new->cl_exchange_flags |= EXCHGID4_FLAG_SUPP_MOVED_REFER;
 
-	/* Non pNFS v4.1 is supported */
-//???	new->cl_exchange_flags |=  EXCHGID4_FLAG_USE_NON_PNFS;
-
 	/* Save the client's MDS or DS flags, or set them both.
 	 * XXX We currently do not have a method of determining
 	 * what a server supports prior to receiving a filehandle
diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h
index 2ccc429..4912cea 100644
--- a/include/linux/nfs4.h
+++ b/include/linux/nfs4.h
@@ -109,7 +109,6 @@ #define NFS4_ACE_MASK_ALL               
 
 #define EXCHGID4_FLAG_SUPP_MOVED_REFER  0x00000001
 #define EXCHGID4_FLAG_SUPP_MOVED_MIGR   0x00000002
-#define EXCHGID4_FLAG_USE_NON_PNFS      0x00010000
 #define EXCHGID4_FLAG_USE_PNFS_MDS      0x00020000
 #define EXCHGID4_FLAG_USE_PNFS_DS       0x00040000
 #define EXCHGID4_MFS_DS_FLAG_MASK	0x00060000
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 0b369f8..2229fc5 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -767,7 +767,6 @@ struct nfs_impl_id4 {
 
 #define EXCHGID4_FLAG_SUPP_MOVED_REFER	0x00000001
 #define EXCHGID4_FLAG_SUPP_MOVED_MIGR	0x00000002
-#define EXCHGID4_FLAG_USE_NON_PNFS	0x00010000
 #define EXCHGID4_FLAG_USE_PNFS_MDS	0x00020000
 #define EXCHGID4_FLAG_USE_PNFS_DS	0x00040000