From 1f36de9608b47a978613830eb27440c1639503d9 Mon Sep 17 00:00:00 2001 From: "J. Bruce Fields" Date: Thu, 3 Dec 2009 15:58:33 -0500 Subject: [PATCH] --- yaml --- r: 175933 b: refs/heads/master c: d4e935bd67ca05db4119b67801d9ece6ae139f05 h: refs/heads/master i: 175931: b76cb61828a0e8f5f73e68fa9fe0df66154b75f6 v: v3 --- [refs] | 2 +- trunk/fs/nfs/callback.c | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 2676d39f7e97..300b89960485 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 96f287b0cf512ee537826943c15b0b8647472f70 +refs/heads/master: d4e935bd67ca05db4119b67801d9ece6ae139f05 diff --git a/trunk/fs/nfs/callback.c b/trunk/fs/nfs/callback.c index 293fa0528a6e..e66ec5d169f7 100644 --- a/trunk/fs/nfs/callback.c +++ b/trunk/fs/nfs/callback.c @@ -78,11 +78,6 @@ nfs4_callback_svc(void *vrqstp) set_freezable(); - /* - * FIXME: do we really need to run this under the BKL? If so, please - * add a comment about what it's intended to protect. - */ - lock_kernel(); while (!kthread_should_stop()) { /* * Listen for a request on the socket @@ -104,7 +99,6 @@ nfs4_callback_svc(void *vrqstp) preverr = err; svc_process(rqstp); } - unlock_kernel(); return 0; } @@ -160,11 +154,6 @@ nfs41_callback_svc(void *vrqstp) set_freezable(); - /* - * FIXME: do we really need to run this under the BKL? If so, please - * add a comment about what it's intended to protect. - */ - lock_kernel(); while (!kthread_should_stop()) { prepare_to_wait(&serv->sv_cb_waitq, &wq, TASK_INTERRUPTIBLE); spin_lock_bh(&serv->sv_cb_lock); @@ -183,7 +172,6 @@ nfs41_callback_svc(void *vrqstp) } finish_wait(&serv->sv_cb_waitq, &wq); } - unlock_kernel(); return 0; }