From 96dd283827118ca704bdb4373d5fbeef0fe031b2 Mon Sep 17 00:00:00 2001 From: Stanislav Kinsbursky Date: Wed, 25 Apr 2012 18:23:02 +0400 Subject: [PATCH] --- yaml --- r: 309832 b: refs/heads/master c: 7d13ec761ae45d5e401965c73d855840ff8cdd23 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/lockd/svc.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index dc9c936114a0..ce7506ab6526 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 24452239094a8b52f54fd4403f6e177837cecf67 +refs/heads/master: 7d13ec761ae45d5e401965c73d855840ff8cdd23 diff --git a/trunk/fs/lockd/svc.c b/trunk/fs/lockd/svc.c index ad11ea777581..53cd69ef2add 100644 --- a/trunk/fs/lockd/svc.c +++ b/trunk/fs/lockd/svc.c @@ -329,7 +329,7 @@ static struct svc_serv *lockd_create_svc(void) int lockd_up(struct net *net) { struct svc_serv *serv; - int error = 0; + int error; mutex_lock(&nlmsvc_mutex); @@ -370,14 +370,13 @@ int lockd_up(struct net *net) goto err_start; } + nlmsvc_users++; /* * Note: svc_serv structures have an initial use count of 1, * so we exit through here on both success and failure. */ err_net: svc_destroy(serv); - if (!error) - nlmsvc_users++; err_create: mutex_unlock(&nlmsvc_mutex); return error;