SUNRPC: Remove BKL around the RPC socket operations etc.

All internal RPC client operations should no longer depend on the BKL,
however lockd and NFS callbacks may still require it.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

2 files changed, 11 insertions, 5 deletions

diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index 37d345c04aa5..7d65e19550cc 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -27,6 +27,7 @@
 #include <linux/types.h>
 #include <linux/mm.h>
 #include <linux/slab.h>
+#include <linux/smp_lock.h>
 #include <linux/utsname.h>
 #include <linux/workqueue.h>
 
@@ -823,8 +824,10 @@ call_encode(struct rpc_task *task)
         if (encode == NULL)
                 return;
 
+        lock_kernel();
         task->tk_status = rpcauth_wrap_req(task, encode, req, p,
                         task->tk_msg.rpc_argp);
+        unlock_kernel();
         if (task->tk_status == -ENOMEM) {
                 /* XXX: Is this sane? */
                 rpc_delay(task, 3*HZ);
@@ -1155,9 +1158,12 @@ call_decode(struct rpc_task *task)
 
         task->tk_action = rpc_exit_task;
 
-        if (decode)
+        if (decode) {
+                lock_kernel();
                 task->tk_status = rpcauth_unwrap_resp(task, decode, req, p,
                                                       task->tk_msg.rpc_resp);
+                unlock_kernel();
+        }
         dprintk("RPC: %4d call_decode result %d\n", task->tk_pid,
                                         task->tk_status);
         return;
diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
index 9c13050d23eb..f9fd66b1d48b 100644
--- a/net/sunrpc/sched.c
+++ b/net/sunrpc/sched.c
@@ -588,7 +588,9 @@ void rpc_delay(struct rpc_task *task, unsigned long delay)
  */
 static void rpc_prepare_task(struct rpc_task *task)
 {
+        lock_kernel();
         task->tk_ops->rpc_call_prepare(task, task->tk_calldata);
+        unlock_kernel();
 }
 
 /*
@@ -598,7 +600,9 @@ 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 */
@@ -651,9 +655,7 @@ static int __rpc_execute(struct rpc_task *task)
                          */
                         save_callback=task->tk_callback;
                         task->tk_callback=NULL;
-                        lock_kernel();
                         save_callback(task);
-                        unlock_kernel();
                 }
 
                 /*
@@ -664,9 +666,7 @@ static int __rpc_execute(struct rpc_task *task)
                 if (!RPC_IS_QUEUED(task)) {
                         if (task->tk_action == NULL)
                                 break;
-                        lock_kernel();
                         task->tk_action(task);
-                        unlock_kernel();
                 }
 
                 /*