From d9d53c7c76e7b3497a664b5214853cc34631a93a Mon Sep 17 00:00:00 2001 From: Chuck Lever Date: Mon, 24 Jan 2011 20:50:26 +0000 Subject: [PATCH] --- yaml --- r: 232691 b: refs/heads/master c: 80c30e8de4f81851b1f712bcc596e11d53bc76f1 h: refs/heads/master i: 232689: 3c344e015a37fe1fec298a26772e997b17a65dbf 232687: 6fb5aed996457d22ec1871aa2a51a814566eb415 v: v3 --- [refs] | 2 +- trunk/fs/lockd/host.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 42cec28c262f..5c101229812d 100644 --- 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 index 5f1bcb2f06f3..b7c99bfb3da6 100644 --- 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; } /**