1 files changed, 28 insertions, 20 deletions

diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index 836f15c0c4a3..5abab094441f 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -1032,27 +1032,20 @@ call_connect_status(struct rpc_task *task)
         dprint_status(task);
 
         task->tk_status = 0;
-        if (status >= 0) {
+        if (status >= 0 || status == -EAGAIN) {
                 clnt->cl_stats->netreconn++;
                 task->tk_action = call_transmit;
                 return;
         }
 
-        /* Something failed: remote service port may have changed */
-        rpc_force_rebind(clnt);
-
         switch (status) {
-        case -ENOTCONN:
-        case -EAGAIN:
-                task->tk_action = call_bind;
-                if (!RPC_IS_SOFT(task))
-                        return;
                 /* if soft mounted, test if we've timed out */
         case -ETIMEDOUT:
                 task->tk_action = call_timeout;
-                return;
+                break;
+        default:
+                rpc_exit(task, -EIO);
         }
-        rpc_exit(task, -EIO);
 }
 
 /*
@@ -1105,14 +1098,26 @@ static void
 call_transmit_status(struct rpc_task *task)
 {
         task->tk_action = call_status;
-        /*
-         * Special case: if we've been waiting on the socket's write_space()
-         * callback, then don't call xprt_end_transmit().
-         */
-        if (task->tk_status == -EAGAIN)
-                return;
-        xprt_end_transmit(task);
-        rpc_task_force_reencode(task);
+        switch (task->tk_status) {
+        case -EAGAIN:
+                break;
+        default:
+                xprt_end_transmit(task);
+                /*
+                 * Special cases: if we've been waiting on the
+                 * socket's write_space() callback, or if the
+                 * socket just returned a connection error,
+                 * then hold onto the transport lock.
+                 */
+        case -ECONNREFUSED:
+        case -ECONNRESET:
+        case -ENOTCONN:
+        case -EHOSTDOWN:
+        case -EHOSTUNREACH:
+        case -ENETUNREACH:
+        case -EPIPE:
+                rpc_task_force_reencode(task);
+        }
 }
 
 /*
@@ -1152,9 +1157,12 @@ call_status(struct rpc_task *task)
                         xprt_conditional_disconnect(task->tk_xprt,
                                         req->rq_connect_cookie);
                 break;
+        case -ECONNRESET:
         case -ECONNREFUSED:
-        case -ENOTCONN:
                 rpc_force_rebind(clnt);
+                rpc_delay(task, 3*HZ);
+        case -EPIPE:
+        case -ENOTCONN:
                 task->tk_action = call_bind;
                 break;
         case -EAGAIN: