diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2009-12-03 15:58:33 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-12-03 15:58:33 -0500 |
| commit | d4e935bd67ca05db4119b67801d9ece6ae139f05 (patch) | |
| tree | 56d6c6e3e6cf9ecd0538cacb5cafb4477d015b4b /fs/nfs | |
| parent | 96f287b0cf512ee537826943c15b0b8647472f70 (diff) | |
The rpc server does not require that service threads take the BKL.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs')
| -rw-r--r-- | fs/nfs/callback.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c index 293fa0528a6e..e66ec5d169f7 100644 --- a/fs/nfs/callback.c +++ b/fs/nfs/callback.c | |||
| @@ -78,11 +78,6 @@ nfs4_callback_svc(void *vrqstp) | |||
| 78 | 78 | ||
| 79 | set_freezable(); | 79 | set_freezable(); |
| 80 | 80 | ||
| 81 | /* | ||
| 82 | * FIXME: do we really need to run this under the BKL? If so, please | ||
| 83 | * add a comment about what it's intended to protect. | ||
| 84 | */ | ||
| 85 | lock_kernel(); | ||
| 86 | while (!kthread_should_stop()) { | 81 | while (!kthread_should_stop()) { |
| 87 | /* | 82 | /* |
| 88 | * Listen for a request on the socket | 83 | * Listen for a request on the socket |
| @@ -104,7 +99,6 @@ nfs4_callback_svc(void *vrqstp) | |||
| 104 | preverr = err; | 99 | preverr = err; |
| 105 | svc_process(rqstp); | 100 | svc_process(rqstp); |
| 106 | } | 101 | } |
| 107 | unlock_kernel(); | ||
| 108 | return 0; | 102 | return 0; |
| 109 | } | 103 | } |
| 110 | 104 | ||
| @@ -160,11 +154,6 @@ nfs41_callback_svc(void *vrqstp) | |||
| 160 | 154 | ||
| 161 | set_freezable(); | 155 | set_freezable(); |
| 162 | 156 | ||
| 163 | /* | ||
| 164 | * FIXME: do we really need to run this under the BKL? If so, please | ||
| 165 | * add a comment about what it's intended to protect. | ||
| 166 | */ | ||
| 167 | lock_kernel(); | ||
| 168 | while (!kthread_should_stop()) { | 157 | while (!kthread_should_stop()) { |
| 169 | prepare_to_wait(&serv->sv_cb_waitq, &wq, TASK_INTERRUPTIBLE); | 158 | prepare_to_wait(&serv->sv_cb_waitq, &wq, TASK_INTERRUPTIBLE); |
| 170 | spin_lock_bh(&serv->sv_cb_lock); | 159 | spin_lock_bh(&serv->sv_cb_lock); |
| @@ -183,7 +172,6 @@ nfs41_callback_svc(void *vrqstp) | |||
| 183 | } | 172 | } |
| 184 | finish_wait(&serv->sv_cb_waitq, &wq); | 173 | finish_wait(&serv->sv_cb_waitq, &wq); |
| 185 | } | 174 | } |
| 186 | unlock_kernel(); | ||
| 187 | return 0; | 175 | return 0; |
| 188 | } | 176 | } |
| 189 | 177 | ||
