Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Revert "SUNRPC: Ensure gss-proxy connects on setup"

This reverts commit 892de36fd4a98fab3298d417c051d9099af5448d.

The gssproxy server is unresponsive when it calls into the kernel to
start the upcall service, so it will not reply to our RPC ping at all.

Reported-by: "J.Bruce Fields" <bfields@fieldses.org>
Fixes: 892de36fd4a9 ("SUNRPC: Ensure gss-proxy connects on setup")
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>

+1 -5
-1
include/linux/sunrpc/clnt.h
··· 160 160 #define RPC_CLNT_CREATE_NO_RETRANS_TIMEOUT (1UL << 9) 161 161 #define RPC_CLNT_CREATE_SOFTERR (1UL << 10) 162 162 #define RPC_CLNT_CREATE_REUSEPORT (1UL << 11) 163 - #define RPC_CLNT_CREATE_IGNORE_NULL_UNAVAIL (1UL << 12) 164 163 165 164 struct rpc_clnt *rpc_create(struct rpc_create_args *args); 166 165 struct rpc_clnt *rpc_bind_new_program(struct rpc_clnt *,
+1 -1
net/sunrpc/auth_gss/gss_rpc_upcall.c
··· 97 97 * timeout, which would result in reconnections being 98 98 * done without the correct namespace: 99 99 */ 100 - .flags = RPC_CLNT_CREATE_IGNORE_NULL_UNAVAIL | 100 + .flags = RPC_CLNT_CREATE_NOPING | 101 101 RPC_CLNT_CREATE_NO_IDLE_TIMEOUT 102 102 }; 103 103 struct rpc_clnt *clnt;
-3
net/sunrpc/clnt.c
··· 479 479 480 480 if (!(args->flags & RPC_CLNT_CREATE_NOPING)) { 481 481 int err = rpc_ping(clnt); 482 - if ((args->flags & RPC_CLNT_CREATE_IGNORE_NULL_UNAVAIL) && 483 - err == -EOPNOTSUPP) 484 - err = 0; 485 482 if (err != 0) { 486 483 rpc_shutdown_client(clnt); 487 484 return ERR_PTR(err);