diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-06-11 13:37:09 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-07-15 18:10:57 -0400 |
commit | a86dc496b764ebb1431677b38eab45310e5a2ad4 (patch) | |
tree | 2ca9fa18c4f58de08acc7c8f9ea251a279eeba9b /fs/lockd/svclock.c | |
parent | c3cc8c019ca09767d7c9b5457d5cf8ac65085f44 (diff) | |
download | linux-3.10-a86dc496b764ebb1431677b38eab45310e5a2ad4.tar.gz linux-3.10-a86dc496b764ebb1431677b38eab45310e5a2ad4.tar.bz2 linux-3.10-a86dc496b764ebb1431677b38eab45310e5a2ad4.zip |
SUNRPC: Remove the BKL from the callback functions
Push it into those callback functions that actually need it.
Note that all the NFS operations use their own locking, so don't need the
BKL. Ditto for the rpcbind client.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/lockd/svclock.c')
-rw-r--r-- | fs/lockd/svclock.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c index 81aca859bfd..56a08ab9a4c 100644 --- a/fs/lockd/svclock.c +++ b/fs/lockd/svclock.c @@ -795,6 +795,7 @@ static void nlmsvc_grant_callback(struct rpc_task *task, void *data) dprintk("lockd: GRANT_MSG RPC callback\n"); + lock_kernel(); /* if the block is not on a list at this point then it has * been invalidated. Don't try to requeue it. * @@ -804,7 +805,7 @@ static void nlmsvc_grant_callback(struct rpc_task *task, void *data) * for nlm_blocked? */ if (list_empty(&block->b_list)) - return; + goto out; /* Technically, we should down the file semaphore here. Since we * move the block towards the head of the queue only, no harm @@ -818,13 +819,17 @@ static void nlmsvc_grant_callback(struct rpc_task *task, void *data) } nlmsvc_insert_block(block, timeout); svc_wake_up(block->b_daemon); +out: + unlock_kernel(); } static void nlmsvc_grant_release(void *data) { struct nlm_rqst *call = data; + lock_kernel(); nlmsvc_release_block(call->a_block); + unlock_kernel(); } static const struct rpc_call_ops nlmsvc_grant_ops = { |