From 90565f5fdbdd339c81d00c933c29f50f0d96bbb2 Mon Sep 17 00:00:00 2001 From: Jeff Layton Date: Wed, 11 Jun 2008 10:03:10 -0400 Subject: [PATCH] --- yaml --- r: 101938 b: refs/heads/master c: ee84dfc45467fd8e5ce04fa2813d98e0aebe465c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/nfs/callback.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index e0253024491a..f0aecb172521 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 77e03677ac76d413fbb6d6caaffa1d64877a0c2a +refs/heads/master: ee84dfc45467fd8e5ce04fa2813d98e0aebe465c diff --git a/trunk/fs/nfs/callback.c b/trunk/fs/nfs/callback.c index c1e7c8300629..9e713d2d5d74 100644 --- a/trunk/fs/nfs/callback.c +++ b/trunk/fs/nfs/callback.c @@ -105,7 +105,6 @@ int nfs_callback_up(void) struct svc_rqst *rqstp; int ret = 0; - lock_kernel(); mutex_lock(&nfs_callback_mutex); if (nfs_callback_info.users++ || nfs_callback_info.task != NULL) goto out; @@ -149,7 +148,6 @@ int nfs_callback_up(void) if (serv) svc_destroy(serv); mutex_unlock(&nfs_callback_mutex); - unlock_kernel(); return ret; out_err: dprintk("Couldn't create callback socket or server thread; err = %d\n", @@ -163,13 +161,11 @@ int nfs_callback_up(void) */ void nfs_callback_down(void) { - lock_kernel(); mutex_lock(&nfs_callback_mutex); nfs_callback_info.users--; if (nfs_callback_info.users == 0 && nfs_callback_info.task != NULL) kthread_stop(nfs_callback_info.task); mutex_unlock(&nfs_callback_mutex); - unlock_kernel(); } static int nfs_callback_authenticate(struct svc_rqst *rqstp)