Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4c24ec8 authored by J. Bruce Fields's avatar J. Bruce Fields Committed by Sasha Levin
Browse files

nfsd4/rpc: move backchannel create logic into rpc code 



[ Upstream commit d50039ea5ee63c589b0434baa5ecf6e5075bb6f9 ]

Also simplify the logic a bit.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
Acked-by: default avatarTrond Myklebust <trondmy@primarydata.com>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent bcb66592

fs/nfsd/nfs4callback.c

+1 −17
Original line number Diff line number Diff line
@@ -630,22 +630,6 @@ static struct rpc_cred *get_backchannel_cred(struct nfs4_client *clp, struct rpc 
	}

}



static struct rpc_clnt *create_backchannel_client(struct rpc_create_args *args)

{

	struct rpc_xprt *xprt;



	if (args->protocol != XPRT_TRANSPORT_BC_TCP)

		return rpc_create(args);



	xprt = args->bc_xprt->xpt_bc_xprt;

	if (xprt) {

		xprt_get(xprt);

		return rpc_create_xprt(args, xprt);

	}



	return rpc_create(args);

}



static int setup_callback_client(struct nfs4_client *clp, struct nfs4_cb_conn *conn, struct nfsd4_session *ses)

{

	int maxtime = max_cb_time(clp->net);
@@ -688,7 +672,7 @@ static int setup_callback_client(struct nfs4_client *clp, struct nfs4_cb_conn *c 
		args.authflavor = ses->se_cb_sec.flavor;

	}

	/* Create RPC client */

	client = create_backchannel_client(&args);

	client = rpc_create(&args);

	if (IS_ERR(client)) {

		dprintk("NFSD: couldn't create callback client: %ld\n",

			PTR_ERR(client));

include/linux/sunrpc/clnt.h

+0 −2
Original line number Diff line number Diff line
@@ -131,8 +131,6 @@ struct rpc_create_args { 
#define RPC_CLNT_CREATE_NO_RETRANS_TIMEOUT	(1UL << 9)



struct rpc_clnt *rpc_create(struct rpc_create_args *args);

struct rpc_clnt *rpc_create_xprt(struct rpc_create_args *args,

					struct rpc_xprt *xprt);

struct rpc_clnt	*rpc_bind_new_program(struct rpc_clnt *,

				const struct rpc_program *, u32);

void rpc_task_reset_client(struct rpc_task *task, struct rpc_clnt *clnt);

net/sunrpc/clnt.c

+10 −2
Original line number Diff line number Diff line
@@ -439,7 +439,7 @@ out_no_rpciod: 
	return ERR_PTR(err);

}



struct rpc_clnt *rpc_create_xprt(struct rpc_create_args *args,

static struct rpc_clnt *rpc_create_xprt(struct rpc_create_args *args,

					struct rpc_xprt *xprt)

{

	struct rpc_clnt *clnt = NULL;
@@ -471,7 +471,6 @@ struct rpc_clnt *rpc_create_xprt(struct rpc_create_args *args, 


	return clnt;

}

EXPORT_SYMBOL_GPL(rpc_create_xprt);



/**

 * rpc_create - create an RPC client and transport with one call
@@ -497,6 +496,15 @@ struct rpc_clnt *rpc_create(struct rpc_create_args *args) 
	};

	char servername[48];



	if (args->bc_xprt) {

		WARN_ON(args->protocol != XPRT_TRANSPORT_BC_TCP);

		xprt = args->bc_xprt->xpt_bc_xprt;

		if (xprt) {

			xprt_get(xprt);

			return rpc_create_xprt(args, xprt);

		}

	}



	if (args->flags & RPC_CLNT_CREATE_INFINITE_SLOTS)

		xprtargs.flags |= XPRT_CREATE_INFINITE_SLOTS;

	if (args->flags & RPC_CLNT_CREATE_NO_IDLE_TIMEOUT)