xprtrdma: Modernize ops->connect

Adapt and apply changes that were made to the TCP socket connect
code. See the following commits for details on the purpose of
these changes:

Commit 7196dbb02ea0 ("SUNRPC: Allow changing of the TCP timeout parameters on the fly")
Commit 3851f1cdb2b8 ("SUNRPC: Limit the reconnect backoff timer to the max RPC message timeout")
Commit 02910177aede ("SUNRPC: Fix reconnection timeouts")

Some common transport code is moved to xprt.c to satisfy the code
duplication police.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

1 files changed, 2 insertions, 21 deletions

diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index c69951ed2ebc..b154600085d6 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -2402,25 +2402,6 @@ out:
         xprt_wake_pending_tasks(xprt, status);
 }
 
-static unsigned long xs_reconnect_delay(const struct rpc_xprt *xprt)
-{
-        unsigned long start, now = jiffies;
-
-        start = xprt->stat.connect_start + xprt->reestablish_timeout;
-        if (time_after(start, now))
-                return start - now;
-        return 0;
-}
-
-static void xs_reconnect_backoff(struct rpc_xprt *xprt)
-{
-        xprt->reestablish_timeout <<= 1;
-        if (xprt->reestablish_timeout > xprt->max_reconnect_timeout)
-                xprt->reestablish_timeout = xprt->max_reconnect_timeout;
-        if (xprt->reestablish_timeout < XS_TCP_INIT_REEST_TO)
-                xprt->reestablish_timeout = XS_TCP_INIT_REEST_TO;
-}
-
 /**
  * xs_connect - connect a socket to a remote endpoint
  * @xprt: pointer to transport structure
@@ -2450,8 +2431,8 @@ static void xs_connect(struct rpc_xprt *xprt, struct rpc_task *task)
                 /* Start by resetting any existing state */
                 xs_reset_transport(transport);
 
-                delay = xs_reconnect_delay(xprt);
-                xs_reconnect_backoff(xprt);
+                delay = xprt_reconnect_delay(xprt);
+                xprt_reconnect_backoff(xprt, XS_TCP_INIT_REEST_TO);
 
         } else
                 dprintk("RPC:       xs_connect scheduled xprt %p\n", xprt);