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: Stanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
index b0b3e572a61978d871d43a61b1519ea6258267b4..e891a8a18cb304a1d1f30e275ec588cbbe2be6b1 100644 (file)
--- a/include/linux/sunrpc/clnt.h
+++ b/include/linux/sunrpc/clnt.h
@@ -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,

diff --git a/net/sunrpc/rpcb_clnt.c b/net/sunrpc/rpcb_clnt.c
index a5aa50d0aae4838c979e096a952ffbc18d1f3c26..6d6a84f67449b3f99a3cf496932d19858e68b31a 100644 (file)
--- a/net/sunrpc/rpcb_clnt.c
+++ b/net/sunrpc/rpcb_clnt.c
@@ -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;

diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index 889d7b11b9ac0d818ec15e4212642a1fd3883ba0..0aee925fbd73db4fe3ccd956043108b20d124510 100644 (file)
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -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);