[pnfs] [PATCH] Compile NFS without CONFIG_NFS_V4_1

[Marc Eshel]

From: Marc Eshel <eshel at almaden.ibm.com>
Signed-off-by: Marc Eshel <eshel at almaden.ibm.com>


---

 fs/nfs/client.c     |    4 ++++
 fs/nfs/read.c       |    3 ++-
 fs/nfs/write.c      |    5 ++++-
 fs/nfsd/nfs4state.c |    7 ++++++-
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index a123f95..b31e770 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -1188,7 +1188,11 @@ struct nfs_server *nfs4_create_server(const struct nfs_parsed_mount_data *data,
 {
 	struct nfs_fattr fattr;
 	struct nfs_server *server;
+#ifdef CONFIG_NFS_V4_1
 	int minorvers = data->minorvers;
+#else
+	int minorvers = 0;
+#endif /* CONFIG_NFS_V4_1 */
 	int error;
 
 	dprintk("--> nfs4_create_server()\n");
diff --git a/fs/nfs/read.c b/fs/nfs/read.c
index d78c0f9..e380193 100644
--- a/fs/nfs/read.c
+++ b/fs/nfs/read.c
@@ -223,9 +223,10 @@ static int nfs_read_rpcsetup(struct nfs_page *req, struct nfs_read_data *data,
 	nfs_fattr_init(&data->fattr);
 
 	ret = pnfs_try_to_read_data(data, call_ops);
+#if defined(CONFIG_PNFS)
 	if (ret == 0)
 		return data->pdata.pnfs_error;
-
+#endif
 	return nfs_initiate_read(data, NFS_CLIENT(inode), call_ops);
 }
 
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 632f476..aa15815 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -867,9 +867,10 @@ static int nfs_write_rpcsetup(struct nfs_page *req,
 	nfs_fattr_init(&data->fattr);
 
 	ret = pnfs_try_to_write_data(data, call_ops, how);
+#if defined(CONFIG_PNFS)
 	if (ret == 0)
 		return data->pdata.pnfs_error;
-
+#endif
 	return nfs_initiate_write(data, NFS_CLIENT(inode), call_ops, how);
 }
 
@@ -1310,8 +1311,10 @@ static int nfs_commit_rpcsetup(struct list_head *head,
 	nfs_fattr_init(&data->fattr);
 
 	data->args.context = first->wb_context;  /* used by commit done */
+#if defined(CONFIG_PNFS)
 	data->pdata.call_ops = &nfs_commit_ops;
 	data->pdata.how = how;
+#endif
 	ret = pnfs_try_to_commit(data);
 	if (ret <= 0)
 		return ret;
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 1756d53..e57abf3 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -575,8 +575,10 @@ free_client(struct nfs4_client *clp)
 	BUG_ON(!list_empty(&clp->cl_delegations));
 	BUG_ON(!list_empty(&clp->cl_openowners));
 	shutdown_callback_client(clp);
+#if defined(CONFIG_NFSD_V4_1)
 	if (clp->cl_cb_xprt)
 		svc_xprt_put(clp->cl_cb_xprt);
+#endif
 	if (clp->cl_cred.cr_group_info)
 		put_group_info(clp->cl_cred.cr_group_info);
 	kfree(clp->cl_name.data);
@@ -2522,9 +2524,12 @@ nfs4_laundromat(void)
 #if defined(CONFIG_PNFSD)
 		if (clp->cl_exchange_flags & EXCHGID4_FLAG_USE_PNFS_DS)
 			break;
-#endif /* CONFIG_PNFSD */
 		dprintk("NFSD: purging unused client(clientid %08x flags %x)\n",
 			clp->cl_clientid.cl_id, clp->cl_exchange_flags);
+#else
+		dprintk("NFSD: purging unused client(clientid %08x)\n",
+			clp->cl_clientid.cl_id);
+#endif /* CONFIG_PNFSD */
 		nfsd4_remove_clid_dir(clp);
 		expire_client(clp);
 	}