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

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

SUNRPC: parametrize local rpcbind clients creation with net ns



These client are per network namespace and thus can be created for different
network namespaces.

Signed-off-by: default avatarStanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 977ac315
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -136,8 +136,8 @@ void rpc_shutdown_client(struct rpc_clnt *);
void		rpc_release_client(struct rpc_clnt *);
void		rpc_task_release_client(struct rpc_task *);

int		rpcb_create_local(void);
void		rpcb_put_local(void);
int		rpcb_create_local(struct net *);
void		rpcb_put_local(struct net *);
int		rpcb_register(struct net *, u32, u32, int, unsigned short);
int		rpcb_v4_register(struct net *net, const u32 program,
				 const u32 version,
+3 −4
Original line number Diff line number Diff line
@@ -175,9 +175,9 @@ static int rpcb_get_local(struct net *net)
	return cnt;
}

void rpcb_put_local(void)
void rpcb_put_local(struct net *net)
{
	struct sunrpc_net *sn = net_generic(&init_net, sunrpc_net_id);
	struct sunrpc_net *sn = net_generic(net, sunrpc_net_id);
	struct rpc_clnt *clnt = sn->rpcb_local_clnt;
	struct rpc_clnt *clnt4 = sn->rpcb_local_clnt4;
	int shutdown;
@@ -323,11 +323,10 @@ out:
 * Returns zero on success, otherwise a negative errno value
 * is returned.
 */
int rpcb_create_local(void)
int rpcb_create_local(struct net *net)
{
	static DEFINE_MUTEX(rpcb_create_local_mutex);
	int result = 0;
	struct net *net = &init_net;

	if (rpcb_get_local(net))
		return result;
+2 −2
Original line number Diff line number Diff line
@@ -372,7 +372,7 @@ static int svc_rpcb_setup(struct svc_serv *serv)
{
	int err;

	err = rpcb_create_local();
	err = rpcb_create_local(&init_net);
	if (err)
		return err;

@@ -384,7 +384,7 @@ static int svc_rpcb_setup(struct svc_serv *serv)
void svc_rpcb_cleanup(struct svc_serv *serv)
{
	svc_unregister(serv);
	rpcb_put_local();
	rpcb_put_local(&init_net);
}
EXPORT_SYMBOL_GPL(svc_rpcb_cleanup);