---

yaml --- r: 232691 b: refs/heads/master c: 80c30e8 h: refs/heads/master i: 232689: 3c344e0 232687: 6fb5aed v: v3
git-mirror · Jan 25, 2011 · d9d53c7 · d9d53c7
1 parent 1a33790
commit d9d53c7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f61f6da0d53842e849bab7f69e1431bd3de1136d
+refs/heads/master: 80c30e8de4f81851b1f712bcc596e11d53bc76f1
diff --git a/trunk/fs/lockd/host.c b/trunk/fs/lockd/host.c
@@ -520,7 +520,7 @@ static struct nlm_host *next_host_state(struct hlist_head *cache,
 					struct nsm_handle *nsm,
 					const struct nlm_reboot *info)
 {
-	struct nlm_host *host = NULL;
+	struct nlm_host *host;
 	struct hlist_head *chain;
 	struct hlist_node *pos;
 
@@ -532,12 +532,13 @@ static struct nlm_host *next_host_state(struct hlist_head *cache,
 			host->h_state++;
 
 			nlm_get_host(host);
-			goto out;
+			mutex_unlock(&nlm_host_mutex);
+			return host;
 		}
 	}
-out:
+
 	mutex_unlock(&nlm_host_mutex);
-	return host;
+	return NULL;
 }
 
 /**