diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-07-15 18:34:58 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-07-15 18:34:58 -0400 |
| commit | cadc723cc19ce6b881d973d3c04e25ebb83058e6 (patch) | |
| tree | 9256b4bc0685bca22469eab87cd3ec3c2deba60d /net | |
| parent | e89e896d31b11a51a54ddcd3f72a76bd286dd86c (diff) | |
| parent | f839c4c1991cc9b580ae38f98f54554938a7f49c (diff) | |
| download | blackbird-op-linux-cadc723cc19ce6b881d973d3c04e25ebb83058e6.tar.gz blackbird-op-linux-cadc723cc19ce6b881d973d3c04e25ebb83058e6.zip | |
Merge branch 'bkl-removal' into next
Diffstat (limited to 'net')
| -rw-r--r-- | net/sunrpc/sched.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c index 6288af05c20f..385f427bedad 100644 --- a/net/sunrpc/sched.c +++ b/net/sunrpc/sched.c @@ -576,9 +576,7 @@ EXPORT_SYMBOL_GPL(rpc_delay); */ static void rpc_prepare_task(struct rpc_task *task) { - lock_kernel(); task->tk_ops->rpc_call_prepare(task, task->tk_calldata); - unlock_kernel(); } /* @@ -588,9 +586,7 @@ void rpc_exit_task(struct rpc_task *task) { task->tk_action = NULL; if (task->tk_ops->rpc_call_done != NULL) { - lock_kernel(); task->tk_ops->rpc_call_done(task, task->tk_calldata); - unlock_kernel(); if (task->tk_action != NULL) { WARN_ON(RPC_ASSASSINATED(task)); /* Always release the RPC slot and buffer memory */ @@ -602,11 +598,8 @@ EXPORT_SYMBOL_GPL(rpc_exit_task); void rpc_release_calldata(const struct rpc_call_ops *ops, void *calldata) { - if (ops->rpc_release != NULL) { - lock_kernel(); + if (ops->rpc_release != NULL) ops->rpc_release(calldata); - unlock_kernel(); - } } /* |
