SUNRPC: Ensure rpc_call_async() always calls tk_ops->rpc_release()

Currently this will not happen if we exit before rpc_new_task() was called.
Also fix up rpc_run_task() to do the same (for consistency).

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

2 files changed, 11 insertions, 4 deletions

diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index 6e71d6ace5a3..aa8965e9d307 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -495,15 +495,16 @@ rpc_call_async(struct rpc_clnt *clnt, struct rpc_message *msg, int flags,
         int             status;
 
         /* If this client is slain all further I/O fails */
+        status = -EIO;
         if (clnt->cl_dead) 
-                return -EIO;
+                goto out_release;
 
         flags |= RPC_TASK_ASYNC;
 
         /* Create/initialize a new RPC task */
         status = -ENOMEM;
         if (!(task = rpc_new_task(clnt, flags, tk_ops, data)))
-                goto out;
+                goto out_release;
 
         /* Mask signals on GSS_AUTH upcalls */
         rpc_task_sigmask(task, &oldset);                
@@ -518,7 +519,10 @@ rpc_call_async(struct rpc_clnt *clnt, struct rpc_message *msg, int flags,
                 rpc_release_task(task);
 
         rpc_restore_sigmask(&oldset);           
-out:
+        return status;
+out_release:
+        if (tk_ops->rpc_release != NULL)
+                tk_ops->rpc_release(data);
         return status;
 }
 
diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
index cd51b5468332..3fc13bea302d 100644
--- a/net/sunrpc/sched.c
+++ b/net/sunrpc/sched.c
@@ -921,8 +921,11 @@ 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 (task == NULL) {
+                if (ops->rpc_release != NULL)
+                        ops->rpc_release(data);
                 return ERR_PTR(-ENOMEM);
+        }
         atomic_inc(&task->tk_count);
         rpc_execute(task);
         return task;