summaryrefslogtreecommitdiffstats
path: root/fs/nfs/callback.c
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2006-08-23 02:06:08 +0200
committerTrond Myklebust <Trond.Myklebust@netapp.com>2006-09-23 05:24:31 +0200
commit5ae1fbce142b67bf59e15fb1af96e88a96abde7b (patch)
tree88e09770f11535b688f9539b5999f836c8b322ab /fs/nfs/callback.c
parentNFS: Disambiguate nfs_stat_to_errno() (diff)
downloadlinux-5ae1fbce142b67bf59e15fb1af96e88a96abde7b.tar.xz
linux-5ae1fbce142b67bf59e15fb1af96e88a96abde7b.zip
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.c')
-rw-r--r--fs/nfs/callback.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c
index d6c4bae14bb9..b1f7dc415392 100644
--- a/fs/nfs/callback.c
+++ b/fs/nfs/callback.c
@@ -149,10 +149,8 @@ out_err:
/*
* Kill the server process if it is not already up.
*/
-int nfs_callback_down(void)
+void nfs_callback_down(void)
{
- int ret = 0;
-
lock_kernel();
mutex_lock(&nfs_callback_mutex);
nfs_callback_info.users--;
@@ -164,7 +162,6 @@ int nfs_callback_down(void)
} while (wait_for_completion_timeout(&nfs_callback_info.stopped, 5*HZ) == 0);
mutex_unlock(&nfs_callback_mutex);
unlock_kernel();
- return ret;
}
static int nfs_callback_authenticate(struct svc_rqst *rqstp)