diff options
| author | Linus Torvalds <[email protected]> | 2022-05-13 11:04:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2022-05-13 11:04:37 -0700 |
| commit | 6dd5884d1d6f6a0613f6906b14fc1f3feaf8adb9 (patch) | |
| tree | d01c378b6cc0bbac1bcc238b315550a428fa673a /net/sunrpc/auth_gss/gss_rpc_upcall.c | |
| parent | 364a453ab9123f493edfa246798ce9eeda452bdb (diff) | |
| parent | 085d16d5f949b64713d5e960d6c9bbf51bc1d511 (diff) | |
Merge tag 'nfs-for-5.18-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
Pull NFS client bugfixes from Trond Myklebust:
"One more pull request. There was a bug in the fix to ensure that gss-
proxy continues to work correctly after we fixed the AF_LOCAL socket
leak in the RPC code. This therefore reverts that broken patch, and
replaces it with one that works correctly.
Stable fixes:
- SUNRPC: Ensure that the gssproxy client can start in a connected
state
Bugfixes:
- Revert "SUNRPC: Ensure gss-proxy connects on setup"
- nfs: fix broken handling of the softreval mount option"
* tag 'nfs-for-5.18-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
nfs: fix broken handling of the softreval mount option
SUNRPC: Ensure that the gssproxy client can start in a connected state
Revert "SUNRPC: Ensure gss-proxy connects on setup"
Diffstat (limited to 'net/sunrpc/auth_gss/gss_rpc_upcall.c')
| -rw-r--r-- | net/sunrpc/auth_gss/gss_rpc_upcall.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/sunrpc/auth_gss/gss_rpc_upcall.c b/net/sunrpc/auth_gss/gss_rpc_upcall.c index 8ca1d809b78d..f549e4c05def 100644 --- a/net/sunrpc/auth_gss/gss_rpc_upcall.c +++ b/net/sunrpc/auth_gss/gss_rpc_upcall.c @@ -97,7 +97,8 @@ static int gssp_rpc_create(struct net *net, struct rpc_clnt **_clnt) * timeout, which would result in reconnections being * done without the correct namespace: */ - .flags = RPC_CLNT_CREATE_IGNORE_NULL_UNAVAIL | + .flags = RPC_CLNT_CREATE_NOPING | + RPC_CLNT_CREATE_CONNECTED | RPC_CLNT_CREATE_NO_IDLE_TIMEOUT }; struct rpc_clnt *clnt; |