summaryrefslogtreecommitdiffstats
path: root/fs/nfs/callback.h
diff options
context:
space:
mode:
authorAndy Adamson <andros@netapp.com>2009-04-01 09:23:14 -0400
committerBenny Halevy <bhalevy@panasas.com>2009-06-17 14:11:32 -0700
commite82dc22dac6525a2f365a1d53c0483252d4aa38e (patch)
tree1a347b34c955db77017a5df533fc1798f164e768 /fs/nfs/callback.h
parent8f975242352e92898dc641ebff0d24808f39848a (diff)
downloadlinux-e82dc22dac6525a2f365a1d53c0483252d4aa38e.tar.bz2
nfs41: Allow NFSv4 and NFSv4.1 callback services to coexist
Tracks the nfs_callback_info for both versions, enabling the callback service for v4 and v4.1 to run concurrently and be stopped independently of each other. Signed-off-by: Ricardo Labiaga <ricardo.labiaga@netapp.com> Signed-off-by: Benny Halevy <bhalevy@panasas.com>
Diffstat (limited to 'fs/nfs/callback.h')
-rw-r--r--fs/nfs/callback.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/nfs/callback.h b/fs/nfs/callback.h
index 29123b5604f2..88d2e1135b5a 100644
--- 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,