2 files changed, 12 insertions, 6 deletions

diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index 8b78177e7575..37d345c04aa5 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -541,8 +541,7 @@ rpc_call_async(struct rpc_clnt *clnt, struct rpc_message *msg, int flags,
         rpc_restore_sigmask(&oldset);           
         return status;
 out_release:
-        if (tk_ops->rpc_release != NULL)
-                tk_ops->rpc_release(data);
+        rpc_release_calldata(tk_ops, data);
         return status;
 }
 
diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
index 6b808c03fb72..9c13050d23eb 100644
--- a/net/sunrpc/sched.c
+++ b/net/sunrpc/sched.c
@@ -608,6 +608,15 @@ void rpc_exit_task(struct rpc_task *task)
 }
 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 @@ void rpc_put_task(struct rpc_task *task)
         }
         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 *rpc_run_task(struct rpc_clnt *clnt, int flags,
         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);