[pnfs] [PATCH 6/6] 2.6-latest pnfs server build without CONFIG_PNFS set

[andros at umich.edu]

From: Andy Adamson <andros at umich.edu>

Signed-off by: Andy Adamson<andros at umich.edu>
---
 fs/nfsd/nfs4filelayoutxdr.c |    2 ++
 fs/nfsd/nfs4pnfsds.c        |    2 ++
 fs/nfsd/nfs4proc.c          |    2 ++
 fs/nfsd/nfs4xdr.c           |   10 +---------
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/fs/nfsd/nfs4filelayoutxdr.c b/fs/nfsd/nfs4filelayoutxdr.c
index 88756ed..9264d9f 100644
--- a/fs/nfsd/nfs4filelayoutxdr.c
+++ b/fs/nfsd/nfs4filelayoutxdr.c
@@ -43,6 +43,7 @@
 #include <linux/nfsd/nfs4layoutxdr.h>
 #include <linux/nfsd/nfsd4_pnfs.h>
 
+#ifdef CONFIG_PNFS
 
 /* File layout export_operations->devaddr_encode()  */
 int
@@ -213,3 +214,4 @@ filelayout_free_layout(void *layout)
 }
 EXPORT_SYMBOL(filelayout_free_layout);
 
+#endif /* CONFIG_PNFS */
diff --git a/fs/nfsd/nfs4pnfsds.c b/fs/nfsd/nfs4pnfsds.c
index fe1a854..170d742 100644
--- a/fs/nfsd/nfs4pnfsds.c
+++ b/fs/nfsd/nfs4pnfsds.c
@@ -44,6 +44,7 @@
 #include <linux/nfsd/pnfsd.h>
 #include <linux/exportfs.h>
 
+#ifdef CONFIG_PNFS
 /*
  *******************
  *   	 PNFS
@@ -321,3 +322,4 @@ nfs4_preprocess_pnfs_ds_stateid(struct svc_fh *cfh, stateid_t *stateid)
 		return nfserr_old_stateid;
 	return 0;
 }
+#endif /* CONFIG_PNFS */
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index 2874ac4..2fd7d62 100644
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -99,11 +99,13 @@ char *nfsd4_op_names[] = {
         OP(EXCHANGE_ID),
         OP(CREATE_SESSION),
         OP(DESTROY_SESSION),
+#ifdef CONFIG_PNFS
         OP(GETDEVICEINFO),
         OP(GETDEVICELIST),
         OP(LAYOUTCOMMIT),
         OP(LAYOUTGET),
         OP(LAYOUTRETURN),
+#endif /* CONFIG_PNFS */
         OP(SEQUENCE),
 };
 #undef OP
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index eabff37..fefa5fd 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -1581,15 +1581,7 @@ nfsd4_decode_compound(struct nfsd4_compoundargs *argp)
 		case OP_LAYOUTRETURN:
 			op->status = nfsd4_decode_layoutreturn(argp, &op->u.pnfs_layoutreturn);
 			break;
-#else
-		case OP_GETDEVICELIST:
-		case OP_GETDEVICEINFO:
-		case OP_LAYOUTGET:
-		case OP_LAYOUTCOMMIT:
-		case OP_LAYOUTRETURN:
-			op->status = nfserr_notsupp;
-			break;
-#endif
+#endif /* CONFIG_PNFS */
                 case OP_EXCHANGE_ID:
                         op->status = nfsd4_decode_exchange_id(argp, &op->u.exchange_id);
                         break;
-- 
1.5.0.2