SUNRPC: Remove xprt_connect_status()

Over the years, xprt_connect_status() has been superseded by
call_connect_status(), which now handles all the errors that
xprt_connect_status() does and more. Since the latter converts
all errors that it doesn't recognise to EIO, then it is time
for it to be retired.

Reported-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Tested-by: Chuck Lever <chuck.lever@oracle.com>

diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
index 3fb001d..73547d1 100644 (file)
--- a/net/sunrpc/xprt.c
+++ b/net/sunrpc/xprt.c
@@ -67,7 +67,6 @@
  */
 static void     xprt_init(struct rpc_xprt *xprt, struct net *net);
 static __be32  xprt_alloc_xid(struct rpc_xprt *xprt);
-static void    xprt_connect_status(struct rpc_task *task);
 static void     xprt_destroy(struct rpc_xprt *xprt);
 
 static DEFINE_SPINLOCK(xprt_list_lock);
@@ -822,7 +821,7 @@ void xprt_connect(struct rpc_task *task)
        if (!xprt_connected(xprt)) {
                task->tk_timeout = task->tk_rqstp->rq_timeout;
                task->tk_rqstp->rq_connect_cookie = xprt->connect_cookie;
-               rpc_sleep_on(&xprt->pending, task, xprt_connect_status);
+               rpc_sleep_on(&xprt->pending, task, NULL);
 
                if (test_bit(XPRT_CLOSING, &xprt->state))
                        return;
@@ -841,35 +840,6 @@ void xprt_connect(struct rpc_task *task)
        xprt_release_write(xprt, task);
 }
 
-static void xprt_connect_status(struct rpc_task *task)
-{
-       switch (task->tk_status) {
-       case 0:
-               dprintk("RPC: %5u xprt_connect_status: connection established\n",
-                               task->tk_pid);
-               break;
-       case -ECONNREFUSED:
-       case -ECONNRESET:
-       case -ECONNABORTED:
-       case -ENETUNREACH:
-       case -EHOSTUNREACH:
-       case -EPIPE:
-       case -ENOTCONN:
-       case -EAGAIN:
-               dprintk("RPC: %5u xprt_connect_status: retrying\n", task->tk_pid);
-               break;
-       case -ETIMEDOUT:
-               dprintk("RPC: %5u xprt_connect_status: connect attempt timed "
-                               "out\n", task->tk_pid);
-               break;
-       default:
-               dprintk("RPC: %5u xprt_connect_status: error %d connecting to "
-                               "server %s\n", task->tk_pid, -task->tk_status,
-                               task->tk_rqstp->rq_xprt->servername);
-               task->tk_status = -EIO;
-       }
-}
-
 enum xprt_xid_rb_cmp {
        XID_RB_EQUAL,
        XID_RB_LEFT,