SUNRPC: rpc_execute should not return task->tk_status;

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

1 files changed, 6 insertions, 5 deletions

diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index 8b2f75bc006d..f025b7e72353 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -446,14 +446,15 @@ int rpc_call_sync(struct rpc_clnt *clnt, struct rpc_message *msg, int flags)
         rpc_call_setup(task, msg, 0);
 
         /* Set up the call info struct and execute the task */
-        if (task->tk_status == 0) {
+        status = task->tk_status;
+        if (status == 0) {
+                atomic_inc(&task->tk_count);
                 status = rpc_execute(task);
-        } else {
-                status = task->tk_status;
-                rpc_release_task(task);
+                if (status == 0)
+                        status = task->tk_status;
         }
-
         rpc_restore_sigmask(&oldset);
+        rpc_release_task(task);
 out:
         return status;
 }