lockd: rename lockd_create_svc() to lockd_get()

lockd_create_svc() already does an svc_get() if the service already
exists, so it is more like a "get" than a "create".

So:
 - Move the increment of nlmsvc_users into the function as well
 - rename to lockd_get().

It is now the inverse of lockd_put().

Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
index 7f12c280fd30da9d0d4a922965894f83ca880600..1a7c11118b320f9dcfd8157e26d6395763d5f3ce 100644 (file)
--- a/fs/lockd/svc.c
+++ b/fs/lockd/svc.c
@@ -396,16 +396,14 @@ static const struct svc_serv_ops lockd_sv_ops = {
        .svo_enqueue_xprt       = svc_xprt_do_enqueue,
 };
 
-static int lockd_create_svc(void)
+static int lockd_get(void)
 {
        struct svc_serv *serv;
        int error;
 
-       /*
-        * Check whether we're already up and running.
-        */
        if (nlmsvc_serv) {
                svc_get(nlmsvc_serv);
+               nlmsvc_users++;
                return 0;
        }
 
@@ -439,6 +437,7 @@ static int lockd_create_svc(void)
        register_inet6addr_notifier(&lockd_inet6addr_notifier);
 #endif
        dprintk("lockd_up: service created\n");
+       nlmsvc_users++;
        return 0;
 }
 
@@ -472,10 +471,9 @@ int lockd_up(struct net *net, const struct cred *cred)
 
        mutex_lock(&nlmsvc_mutex);
 
-       error = lockd_create_svc();
+       error = lockd_get();
        if (error)
                goto err;
-       nlmsvc_users++;
 
        error = lockd_up_net(nlmsvc_serv, net, cred);
        if (error < 0) {