nfs: remove BKL from callback server
Subsystems (2)
PATCH 1/1 nfs: remove BKL from callback server
From: J. Bruce Fields <[email protected]>
The rpc server does not require that service threads take the BKL.
--- fs/nfs/callback.c | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-)
Just noticed this while looking for something else.
If these BKL's were cut-and-pasted from lockd or older nfsd code under the assumption that the generic rpc server code needed them: that assumption was incorrect, and we should apply this patch.
(If there was some nfs-client-specific issue here, then ignore this patch.)
fs/nfs/callback.c +0 -12
@@ -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 ; }
Signature · 1 line
1.6.0.4
By the way, did this get applied?
And is there someplace I should be looking for your pending patches other than
git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git
? Currently they don't seem to have anything not upstream. (But I may have overlooked something.)
--b.
Quoted 69 lines · J. Bruce Fields
From: J. Bruce Fields <[email protected]>
The rpc server does not require that service threads take the BKL.
Signed-off-by J. Bruce Fields <[email protected]>--- fs/nfs/callback.c | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-)Just noticed this while looking for something else.
If these BKL's were cut-and-pasted from lockd or older nfsd code under the assumption that the generic rpc server code needed them: that assumption was incorrect, and we should apply this patch.
(If there was some nfs-client-specific issue here, then ignore this patch.)
fs/nfs/callback.c +0
-12@@ -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 ; }Signature · 6 lines
1.6.0.4 -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 1 line · J. Bruce Fields
By the way, did this get applied?
I found a 100% identical patch that I wrote immediately after I got back from the kernel summit. However, since it looks as if your patch predates mine, I'll replace it...
Quoted 7 lines
And is there someplace I should be looking for your pending patches other than
git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git? Currently they don't seem to have anything not upstream. (But I may have overlooked something.)
I'm still running my own tests, so nothing has been published yet...
Cheers
Trond