From: Trond Myklebust Date: Sat, 19 Aug 2023 21:32:24 +0000 (-0400) Subject: SUNRPC: Don't override connect timeouts in rpc_clnt_add_xprt() X-Git-Tag: v6.6.17~4043^2~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cd18f24085f012b46b8271640b3c60fb27c0b05f;p=platform%2Fkernel%2Flinux-rpi.git 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 Signed-off-by: Anna Schumaker --- diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index 06df08b0..8d75290 100644 --- 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,