SUNRPC: Don't override connect timeouts in rpc_clnt_add_xprt()

If the caller specifies the connect timeouts in the arguments to
rpc_clnt_add_xprt(), then we shouldn't override them.

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index 06df08b..8d75290 100644 (file)
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -3072,6 +3072,11 @@ int rpc_clnt_add_xprt(struct rpc_clnt *clnt,
        }
        xprt->resvport = resvport;
        xprt->reuseport = reuseport;
+
+       if (xprtargs->connect_timeout)
+               connect_timeout = xprtargs->connect_timeout;
+       if (xprtargs->reconnect_timeout)
+               reconnect_timeout = xprtargs->reconnect_timeout;
        if (xprt->ops->set_connect_timeout != NULL)
                xprt->ops->set_connect_timeout(xprt,
                                connect_timeout,