Commit cd18f240 authored by Trond Myklebust's avatar Trond Myklebust Committed by Anna Schumaker
Browse files

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: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent d2ee4138

net/sunrpc/clnt.c

+5 −0
Original line number Diff line number Diff line
@@ -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,