[pnfs] [PATCH 1/3] nfs41: Partial fix for NFSv4 compilation when CONFIG_NFS_V4_1 is not defined

Ricardo Labiaga Ricardo.Labiaga at netapp.com
Wed May 14 21:27:02 EDT 2008


Signed-off-by: Ricardo Labiaga <Ricardo.Labiaga at netapp.com>
---
 fs/nfs/callback.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c
index 0901839..481758b 100644
--- a/fs/nfs/callback.c
+++ b/fs/nfs/callback.c
@@ -224,13 +224,15 @@ int nfs_callback_up(int minorversion, void *args)
 	int ret = 0;
 #if defined(CONFIG_NFS_V4_1)
 	struct rpc_xprt *xprt = (struct rpc_xprt *)args;
-#endif
+#endif /* CONFIG_NFS_V4_1 */
 
 	lock_kernel();
 	mutex_lock(&nfs_callback_mutex);
 	if (nfs_callback_info.users++ || nfs_callback_info.pid != 0) {
+#if defined(CONFIG_NFS_V4_1)
 		if (minorversion)
 			xprt->bc_serv = nfs_callback_info.serv;
+#endif /* CONFIG_NFS_V4_1 */
 		goto out;
 	}
 	init_completion(&nfs_callback_info.started);
-- 
1.5.2.2



More information about the pNFS mailing list