1 files changed, 9 insertions, 0 deletions

diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index bee415465754..37c5475ba258 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -773,6 +773,7 @@ static void xs_close(struct rpc_xprt *xprt)
         dprintk("RPC:       xs_close xprt %p\n", xprt);
 
         xs_reset_transport(transport);
+        xprt->reestablish_timeout = 0;
 
         smp_mb__before_clear_bit();
         clear_bit(XPRT_CONNECTION_ABORT, &xprt->state);
@@ -1264,6 +1265,12 @@ static void xs_tcp_data_ready(struct sock *sk, int bytes)
         if (xprt->shutdown)
                 goto out;
 
+        /* Any data means we had a useful conversation, so
+         * the we don't need to delay the next reconnect
+         */
+        if (xprt->reestablish_timeout)
+                xprt->reestablish_timeout = 0;
+
         /* We use rd_desc to pass struct xprt to xs_tcp_data_recv */
         rd_desc.arg.data = xprt;
         do {
@@ -2034,6 +2041,8 @@ static void xs_connect(struct rpc_task *task)
                                    &transport->connect_worker,
                                    xprt->reestablish_timeout);
                 xprt->reestablish_timeout <<= 1;
+                if (xprt->reestablish_timeout < XS_TCP_INIT_REEST_TO)
+                        xprt->reestablish_timeout = XS_TCP_INIT_REEST_TO;
                 if (xprt->reestablish_timeout > XS_TCP_MAX_REEST_TO)
                         xprt->reestablish_timeout = XS_TCP_MAX_REEST_TO;
         } else {