commit bbd5a1f9fc9fad0f8725812d91c51b052e847de8
author Trond Myklebust <Trond.Myklebust@netapp.com> Wed Oct 18 16:01:05 2006 -0400
committer Trond Myklebust <Trond.Myklebust@netapp.com> Wed Dec 06 10:46:29 2006 -0500
tree 252650d49dd498a67c404b7c4c1abeb2dc341624
parent 3e32a5d99a467b9d4d416323c8c292479b4915e5

SUNRPC: Fix up missing BKL in asynchronous RPC callback functions

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

net/sunrpc/sched.c

diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
index 6b808c0..9c13050 100644
--- a/net/sunrpc/sched.c
+++ b/net/sunrpc/sched.c
@@ -608,6 +608,15 @@
 }
 EXPORT_SYMBOL(rpc_exit_task);
 
+void rpc_release_calldata(const struct rpc_call_ops *ops, void *calldata)
+{
+	if (ops->rpc_release != NULL) {
+		lock_kernel();
+		ops->rpc_release(calldata);
+		unlock_kernel();
+	}
+}
+
 /*
  * This is the RPC `scheduler' (or rather, the finite state machine).
  */
@@ -883,8 +892,7 @@
 	}
 	if (task->tk_flags & RPC_TASK_DYNAMIC)
 		call_rcu_bh(&task->u.tk_rcu, rpc_free_task);
-	if (tk_ops->rpc_release)
-		tk_ops->rpc_release(calldata);
+	rpc_release_calldata(tk_ops, calldata);
 }
 EXPORT_SYMBOL(rpc_put_task);
 
@@ -928,8 +936,7 @@
 	struct rpc_task *task;
 	task = rpc_new_task(clnt, flags, ops, data);
 	if (task == NULL) {
-		if (ops->rpc_release != NULL)
-			ops->rpc_release(data);
+		rpc_release_calldata(ops, data);
 		return ERR_PTR(-ENOMEM);
 	}
 	atomic_inc(&task->tk_count);