---

yaml --- r: 309832 b: refs/heads/master c: 7d13ec7 h: refs/heads/master v: v3
git-mirror · Jun 1, 2012 · 96dd283 · 96dd283
1 parent c0b3eb3
commit 96dd283
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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;