[pnfs] [PATCH 01/37] pnfs: fix nfsv4_minorversion_clientops definition for CONFIG_PNFS

[Benny Halevy]

currently, when CONFIG_PNFS is defined, CONFIG_NFS_V4_1 is defined as
well and pnfs_v41_clientops are pointed at in nfsv4_minorversion_clientops
as minorversion 2.

Signed-off-by: Benny Halevy <bhalevy at panasas.com>
---
 fs/nfs/nfs4proc.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index ef958b4..1f76368 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -5425,11 +5425,10 @@ const struct nfs_rpc_ops pnfs_v41_clientops = {
 
 const struct nfs_rpc_ops *nfsv4_minorversion_clientops[] = {
 	&nfs_v40_clientops,
-#if defined(CONFIG_NFS_V4_1)
-	&nfs_v41_clientops,
-#endif
 #if defined(CONFIG_PNFS)
 	&pnfs_v41_clientops,
+#elif defined(CONFIG_NFS_V4_1)
+	&nfs_v41_clientops,
 #endif
 };
 
-- 
1.5.3.3