SUNRPC: Handle ECONNREFUSED correctly in xprt_transmit()

If we get an ECONNREFUSED error, we currently go to sleep on the
'xprt->sending' wait queue. The problem is that no timeout is set there,
and there is nothing else that will wake the task up later.

We should deal with ECONNREFUSED in call_status, given that is where we
also deal with -EHOSTDOWN, and friends.

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

1 files changed, 16 insertions, 22 deletions

diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
index d1afec640394..d588e755e107 100644
--- a/net/sunrpc/xprt.c
+++ b/net/sunrpc/xprt.c
@@ -901,32 +901,26 @@ void xprt_transmit(struct rpc_task *task)
         req->rq_connect_cookie = xprt->connect_cookie;
         req->rq_xtime = jiffies;
         status = xprt->ops->send_request(task);
-        if (status == 0) {
-                dprintk("RPC: %5u xmit complete\n", task->tk_pid);
-                spin_lock_bh(&xprt->transport_lock);
+        if (status != 0) {
+                task->tk_status = status;
+                return;
+        }
 
-                xprt->ops->set_retrans_timeout(task);
+        dprintk("RPC: %5u xmit complete\n", task->tk_pid);
+        spin_lock_bh(&xprt->transport_lock);
 
-                xprt->stat.sends++;
-                xprt->stat.req_u += xprt->stat.sends - xprt->stat.recvs;
-                xprt->stat.bklog_u += xprt->backlog.qlen;
+        xprt->ops->set_retrans_timeout(task);
 
-                /* Don't race with disconnect */
-                if (!xprt_connected(xprt))
-                        task->tk_status = -ENOTCONN;
-                else if (!req->rq_received)
-                        rpc_sleep_on(&xprt->pending, task, xprt_timer);
-                spin_unlock_bh(&xprt->transport_lock);
-                return;
-        }
+        xprt->stat.sends++;
+        xprt->stat.req_u += xprt->stat.sends - xprt->stat.recvs;
+        xprt->stat.bklog_u += xprt->backlog.qlen;
 
-        /* Note: at this point, task->tk_sleeping has not yet been set,
-         *       hence there is no danger of the waking up task being put on
-         *       schedq, and being picked up by a parallel run of rpciod().
-         */
-        task->tk_status = status;
-        if (status == -ECONNREFUSED)
-                rpc_sleep_on(&xprt->sending, task, NULL);
+        /* Don't race with disconnect */
+        if (!xprt_connected(xprt))
+                task->tk_status = -ENOTCONN;
+        else if (!req->rq_received)
+                rpc_sleep_on(&xprt->pending, task, xprt_timer);
+        spin_unlock_bh(&xprt->transport_lock);
 }
 
 static inline void do_xprt_reserve(struct rpc_task *task)