2 files changed, 4 insertions, 10 deletions

diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index 6d7221fe990a..396cdbe249d1 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -1046,6 +1046,8 @@ call_status(struct rpc_task *task)
                 rpc_delay(task, 3*HZ);
         case -ETIMEDOUT:
                 task->tk_action = call_timeout;
+                if (task->tk_client->cl_discrtry)
+                        xprt_disconnect(task->tk_xprt);
                 break;
         case -ECONNREFUSED:
         case -ENOTCONN:
@@ -1169,6 +1171,8 @@ call_decode(struct rpc_task *task)
 out_retry:
         req->rq_received = req->rq_private_buf.len = 0;
         task->tk_status = 0;
+        if (task->tk_client->cl_discrtry)
+                xprt_disconnect(task->tk_xprt);
 }
 
 /*
diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
index ee6ffa01dfb1..456a14510308 100644
--- a/net/sunrpc/xprt.c
+++ b/net/sunrpc/xprt.c
@@ -735,16 +735,6 @@ void xprt_transmit(struct rpc_task *task)
                         xprt_reset_majortimeo(req);
                         /* Turn off autodisconnect */
                         del_singleshot_timer_sync(&xprt->timer);
-                } else {
-                        /* If all request bytes have been sent,
-                         * then we must be retransmitting this one */
-                        if (!req->rq_bytes_sent) {
-                                if (task->tk_client->cl_discrtry) {
-                                        xprt_disconnect(xprt);
-                                        task->tk_status = -ENOTCONN;
-                                        return;
-                                }
-                        }
                 }
         } else if (!req->rq_bytes_sent)
                 return;