Skip to content

Commit ecd3ad6

Browse files
neilbrownchucklever
authored andcommitted
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>
1 parent 865b674 commit ecd3ad6

1 file changed

Lines changed: 4 additions & 6 deletions

File tree

fs/lockd/svc.c

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -396,16 +396,14 @@ static const struct svc_serv_ops lockd_sv_ops = {
396396
.svo_enqueue_xprt = svc_xprt_do_enqueue,
397397
};
398398

399-
static int lockd_create_svc(void)
399+
static int lockd_get(void)
400400
{
401401
struct svc_serv *serv;
402402
int error;
403403

404-
/*
405-
* Check whether we're already up and running.
406-
*/
407404
if (nlmsvc_serv) {
408405
svc_get(nlmsvc_serv);
406+
nlmsvc_users++;
409407
return 0;
410408
}
411409

@@ -439,6 +437,7 @@ static int lockd_create_svc(void)
439437
register_inet6addr_notifier(&lockd_inet6addr_notifier);
440438
#endif
441439
dprintk("lockd_up: service created\n");
440+
nlmsvc_users++;
442441
return 0;
443442
}
444443

@@ -472,10 +471,9 @@ int lockd_up(struct net *net, const struct cred *cred)
472471

473472
mutex_lock(&nlmsvc_mutex);
474473

475-
error = lockd_create_svc();
474+
error = lockd_get();
476475
if (error)
477476
goto err;
478-
nlmsvc_users++;
479477

480478
error = lockd_up_net(nlmsvc_serv, net, cred);
481479
if (error < 0) {

0 commit comments

Comments
 (0)