SUNRPC: use rpcbind reference counting helpers

All is simple: we just increase users counter if rpcbind clients has been
created already. Otherwise we create them and set users counter to 1.

Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

diff --git a/net/sunrpc/rpcb_clnt.c b/net/sunrpc/rpcb_clnt.c
index 78af565..f5309ab 100644 (file)
--- a/net/sunrpc/rpcb_clnt.c
+++ b/net/sunrpc/rpcb_clnt.c
@@ -258,9 +258,7 @@ static int rpcb_create_local_unix(void)
                clnt4 = NULL;
        }
 
                clnt4 = NULL;
        }
 

-       /* Protected by rpcb_create_local_mutex */
-       rpcb_local_clnt = clnt;
-       rpcb_local_clnt4 = clnt4;
+       rpcb_set_local(clnt, clnt4);

 
 out:
        return result;
 
 out:
        return result;


@@ -312,9 +310,7 @@ static int rpcb_create_local_net(void)
                clnt4 = NULL;
        }
 
                clnt4 = NULL;
        }
 

-       /* Protected by rpcb_create_local_mutex */
-       rpcb_local_clnt = clnt;
-       rpcb_local_clnt4 = clnt4;
+       rpcb_set_local(clnt, clnt4);

 
 out:
        return result;
 
 out:
        return result;


@@ -329,11 +325,11 @@ static int rpcb_create_local(void)
        static DEFINE_MUTEX(rpcb_create_local_mutex);
        int result = 0;
 
        static DEFINE_MUTEX(rpcb_create_local_mutex);
        int result = 0;
 

-       if (rpcb_local_clnt)
+       if (rpcb_get_local())

                return result;
 
        mutex_lock(&rpcb_create_local_mutex);
                return result;
 
        mutex_lock(&rpcb_create_local_mutex);

-       if (rpcb_local_clnt)
+       if (rpcb_get_local())

                goto out;
 
        if (rpcb_create_local_unix() != 0)
                goto out;
 
        if (rpcb_create_local_unix() != 0)