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

Commit e73f4cc0 authored by Stanislav Kinsbursky's avatar Stanislav Kinsbursky Committed by Trond Myklebust
Browse files

SUNRPC: split client creation routine into setup and registration 



This helper moves all "registration" code to the new rpc_client_register()
helper.
This helper will be used later in the series to synchronize against PipeFS
MOUNT/UMOUNT events.

Signed-off-by: default avatarStanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent adb6fa7f

net/sunrpc/clnt.c

+39 −25
Original line number Diff line number Diff line
@@ -281,14 +281,47 @@ static void rpc_clnt_set_nodename(struct rpc_clnt *clnt, const char *nodename) 
	memcpy(clnt->cl_nodename, nodename, clnt->cl_nodelen);

}



static int rpc_client_register(const struct rpc_create_args *args,

			       struct rpc_clnt *clnt)

{

	const struct rpc_program *program = args->program;

	struct rpc_auth *auth;

	struct net *net = rpc_net_ns(clnt);

	struct super_block *pipefs_sb;

	int err = 0;



	pipefs_sb = rpc_get_sb_net(net);

	if (pipefs_sb) {

		err = rpc_setup_pipedir(clnt, program->pipe_dir_name, pipefs_sb);

		if (err)

			goto out;

	}



	auth = rpcauth_create(args->authflavor, clnt);

	if (IS_ERR(auth)) {

		dprintk("RPC:       Couldn't create auth handle (flavor %u)\n",

				args->authflavor);

		err = PTR_ERR(auth);

		goto err_auth;

	}



	rpc_register_client(clnt);

out:

	if (pipefs_sb)

		rpc_put_sb_net(net);

	return err;



err_auth:

	__rpc_clnt_remove_pipedir(clnt);

	goto out;

}



static struct rpc_clnt * rpc_new_client(const struct rpc_create_args *args, struct rpc_xprt *xprt)

{

	const struct rpc_program *program = args->program;

	const struct rpc_version *version;

	struct rpc_clnt		*clnt = NULL;

	struct rpc_auth		*auth;

	int err;

	struct super_block *pipefs_sb;



	/* sanity check the name before trying to print it */

	dprintk("RPC:       creating %s client for %s (xprt %p)\n",
@@ -347,34 +380,15 @@ static struct rpc_clnt * rpc_new_client(const struct rpc_create_args *args, stru 


	atomic_set(&clnt->cl_count, 1);



	pipefs_sb = rpc_get_sb_net(rpc_net_ns(clnt));

	if (pipefs_sb) {

		err = rpc_setup_pipedir(clnt, program->pipe_dir_name, pipefs_sb);

		if (err)

			goto out_no_path;

	}



	auth = rpcauth_create(args->authflavor, clnt);

	if (IS_ERR(auth)) {

		dprintk("RPC:       Couldn't create auth handle (flavor %u)\n",

				args->authflavor);

		err = PTR_ERR(auth);

		goto out_no_auth;

	}



	/* save the nodename */

	rpc_clnt_set_nodename(clnt, utsname()->nodename);

	rpc_register_client(clnt);

	if (pipefs_sb)

		rpc_put_sb_net(rpc_net_ns(clnt));



	err = rpc_client_register(args, clnt);

	if (err)

		goto out_no_path;

	return clnt;



out_no_auth:

	if (pipefs_sb)

		__rpc_clnt_remove_pipedir(clnt);

out_no_path:

	if (pipefs_sb)

		rpc_put_sb_net(rpc_net_ns(clnt));

	kfree(clnt->cl_principal);

out_no_principal:

	rpc_free_iostats(clnt->cl_metrics);