nfs41: Allow NFSv4 and NFSv4.1 callback services to coexist

[safe/jmp/linux-2.6] / fs / nfs / callback.h

diff --git a/fs/nfs/callback.h b/fs/nfs/callback.h
index 29123b5..88d2e11 100644 (file)
--- a/fs/nfs/callback.h
+++ b/fs/nfs/callback.h
@@ -64,11 +64,8 @@ extern __be32 nfs4_callback_recall(struct cb_recallargs *args, void *dummy);
 
 #ifdef CONFIG_NFS_V4
 extern int nfs_callback_up(u32 minorversion, struct rpc_xprt *xprt);
-extern void nfs_callback_down(void);
-#else
-#define nfs_callback_up()      (0)
-#define nfs_callback_down()    do {} while(0)
-#endif
+extern void nfs_callback_down(int minorversion);
+#endif /* CONFIG_NFS_V4 */
 
 /*
  * nfs41: Callbacks are expected to not cause substantial latency,