aboutsummaryrefslogtreecommitdiffstats
path: root/fs/lockd
diff options
context:
space:
mode:
authorStanislav Kinsbursky <skinsbursky@parallels.com>2012-04-25 10:23:02 -0400
committerJ. Bruce Fields <bfields@redhat.com>2012-05-31 20:29:43 -0400
commit7d13ec761ae45d5e401965c73d855840ff8cdd23 (patch)
tree687f136f3ebec65f3700aab47f6c82bf48797c9e /fs/lockd
parent24452239094a8b52f54fd4403f6e177837cecf67 (diff)
LockD: move global usage counter manipulation from error path
Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/lockd')
-rw-r--r--fs/lockd/svc.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
index ad11ea777581..53cd69ef2add 100644
--- a/fs/lockd/svc.c
+++ b/fs/lockd/svc.c
@@ -329,7 +329,7 @@ static struct svc_serv *lockd_create_svc(void)
329int lockd_up(struct net *net) 329int lockd_up(struct net *net)
330{ 330{
331 struct svc_serv *serv; 331 struct svc_serv *serv;
332 int error = 0; 332 int error;
333 333
334 mutex_lock(&nlmsvc_mutex); 334 mutex_lock(&nlmsvc_mutex);
335 335
@@ -370,14 +370,13 @@ int lockd_up(struct net *net)
370 goto err_start; 370 goto err_start;
371 } 371 }
372 372
373 nlmsvc_users++;
373 /* 374 /*
374 * Note: svc_serv structures have an initial use count of 1, 375 * Note: svc_serv structures have an initial use count of 1,
375 * so we exit through here on both success and failure. 376 * so we exit through here on both success and failure.
376 */ 377 */
377err_net: 378err_net:
378 svc_destroy(serv); 379 svc_destroy(serv);
379 if (!error)
380 nlmsvc_users++;
381err_create: 380err_create:
382 mutex_unlock(&nlmsvc_mutex); 381 mutex_unlock(&nlmsvc_mutex);
383 return error; 382 return error;