Commit 3d1b0d35 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

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



This reverts commit 892de36f.

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: default avatar"J.Bruce Fields" <bfields@fieldses.org>
Fixes: 892de36f ("SUNRPC: Ensure gss-proxy connects on setup")
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent 4b97bac0

include/linux/sunrpc/clnt.h

+0 −1
Original line number Diff line number Diff line
@@ -160,7 +160,6 @@ struct rpc_add_xprt_test { 
#define RPC_CLNT_CREATE_NO_RETRANS_TIMEOUT	(1UL << 9)

#define RPC_CLNT_CREATE_SOFTERR		(1UL << 10)

#define RPC_CLNT_CREATE_REUSEPORT	(1UL << 11)

#define RPC_CLNT_CREATE_IGNORE_NULL_UNAVAIL (1UL << 12)



struct rpc_clnt *rpc_create(struct rpc_create_args *args);

struct rpc_clnt	*rpc_bind_new_program(struct rpc_clnt *,

net/sunrpc/auth_gss/gss_rpc_upcall.c

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ 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_NO_IDLE_TIMEOUT

	};

	struct rpc_clnt *clnt;

net/sunrpc/clnt.c

+0 −3
Original line number Diff line number Diff line
@@ -479,9 +479,6 @@ static struct rpc_clnt *rpc_create_xprt(struct rpc_create_args *args, 


	if (!(args->flags & RPC_CLNT_CREATE_NOPING)) {

		int err = rpc_ping(clnt);

		if ((args->flags & RPC_CLNT_CREATE_IGNORE_NULL_UNAVAIL) &&

		    err == -EOPNOTSUPP)

			err = 0;

		if (err != 0) {

			rpc_shutdown_client(clnt);

			return ERR_PTR(err);