Merge tag 'nfs-for-5.1-5' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

Pull NFS client bugfix from Trond Myklebust:
 "Fix a regression in which an RPC call can be tagged with an error
  despite the transmission being successful"

* tag 'nfs-for-5.1-5' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  SUNRPC: Ignore queue transmission errors on successful transmission

1 files changed, 5 insertions, 2 deletions

diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index 1d0395ef62c9..8ff11dc98d7f 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -2081,8 +2081,8 @@ call_transmit_status(struct rpc_task *task)
          * test first.
          */
         if (rpc_task_transmitted(task)) {
-                if (task->tk_status == 0)
-                        xprt_request_wait_receive(task);
+                task->tk_status = 0;
+                xprt_request_wait_receive(task);
                 return;
         }
 
@@ -2167,6 +2167,9 @@ call_bc_transmit_status(struct rpc_task *task)
 {
         struct rpc_rqst *req = task->tk_rqstp;
 
+        if (rpc_task_transmitted(task))
+                task->tk_status = 0;
+
         dprint_status(task);
 
         switch (task->tk_status) {