[PATCH] RPC: Report connection errors properly when mounting with "soft"

 Fix up xprt_connect_status: the soft timeout logic was clobbering tk_status,
 so TCP connect errors were not properly reported on soft mounts.

 Test-plan:
 Destructive testing (unplugging the network temporarily).  Connectathon
 with UDP and TCP.

 Version: Thu, 11 Aug 2005 16:01:28 -0400

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

1 files changed, 18 insertions, 9 deletions

diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
index 3c654e06b084..b28ea0cc0cb7 100644
--- a/net/sunrpc/xprt.c
+++ b/net/sunrpc/xprt.c
@@ -592,24 +592,33 @@ xprt_connect_status(struct rpc_task *task)
                 return;
         }
 
-        /* if soft mounted, just cause this RPC to fail */
-        if (RPC_IS_SOFT(task))
-                task->tk_status = -EIO;
-
         switch (task->tk_status) {
         case -ECONNREFUSED:
         case -ECONNRESET:
+                dprintk("RPC: %4d xprt_connect_status: server %s refused connection\n",
+                                task->tk_pid, task->tk_client->cl_server);
+                break;
         case -ENOTCONN:
-                return;
+                dprintk("RPC: %4d xprt_connect_status: connection broken\n",
+                                task->tk_pid);
+                break;
         case -ETIMEDOUT:
-                dprintk("RPC: %4d xprt_connect_status: timed out\n",
+                dprintk("RPC: %4d xprt_connect_status: connect attempt timed out\n",
                                 task->tk_pid);
                 break;
         default:
-                printk(KERN_ERR "RPC: error %d connecting to server %s\n",
-                                -task->tk_status, task->tk_client->cl_server);
+                dprintk("RPC: %4d xprt_connect_status: error %d connecting to server %s\n",
+                                task->tk_pid, -task->tk_status, task->tk_client->cl_server);
+                xprt_release_write(xprt, task);
+                task->tk_status = -EIO;
+                return;
+        }
+
+        /* if soft mounted, just cause this RPC to fail */
+        if (RPC_IS_SOFT(task)) {
+                xprt_release_write(xprt, task);
+                task->tk_status = -EIO;
         }
-        xprt_release_write(xprt, task);
 }
 
 /*