UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Trond Myklebust 2023-08-19 17:32:24 -04:00 committed by Anna Schumaker
parent d2ee413884
commit cd18f24085
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/sunrpc/clnt.c
View File

@ -3072,6 +3072,11 @@ int rpc_clnt_add_xprt(struct rpc_clnt *clnt,
} }
xprt->resvport = resvport; xprt->resvport = resvport;
xprt->reuseport = reuseport; 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) if (xprt->ops->set_connect_timeout != NULL)
xprt->ops->set_connect_timeout(xprt, xprt->ops->set_connect_timeout(xprt,
connect_timeout, connect_timeout,