summaryrefslogtreecommitdiffstats
path: root/fs/nfs/callback.h
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2006-08-22 20:06:08 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2006-09-22 23:24:31 -0400
commit5ae1fbce142b67bf59e15fb1af96e88a96abde7b (patch)
tree88e09770f11535b688f9539b5999f836c8b322ab /fs/nfs/callback.h
parent0a8ea4372b2868842986118ca90912f3382e6c5a (diff)
downloadop-kernel-dev-5ae1fbce142b67bf59e15fb1af96e88a96abde7b.zip
op-kernel-dev-5ae1fbce142b67bf59e15fb1af96e88a96abde7b.tar.gz
NFS: Fix NFS4 callback up/down prototypes
Make the nfs_callback_up()/down() prototypes just do nothing if NFS4 is not enabled. Also make the down function void type since we can't really do anything if it fails. Signed-Off-By: David Howells <dhowells@redhat.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/callback.h')
-rw-r--r--fs/nfs/callback.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/fs/nfs/callback.h b/fs/nfs/callback.h
index b252e7f..5676163d 100644
--- a/fs/nfs/callback.h
+++ b/fs/nfs/callback.h
@@ -62,8 +62,13 @@ struct cb_recallargs {
extern unsigned nfs4_callback_getattr(struct cb_getattrargs *args, struct cb_getattrres *res);
extern unsigned nfs4_callback_recall(struct cb_recallargs *args, void *dummy);
+#ifdef CONFIG_NFS_V4
extern int nfs_callback_up(void);
-extern int nfs_callback_down(void);
+extern void nfs_callback_down(void);
+#else
+#define nfs_callback_up() (0)
+#define nfs_callback_down() do {} while(0)
+#endif
extern unsigned int nfs_callback_set_tcpport;
extern unsigned short nfs_callback_tcpport;
OpenPOWER on IntegriCloud