From b5908293028896088806b8cbeeba23c4969d9ece Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Wed, 4 Oct 2006 02:16:15 -0700
Subject: [PATCH] --- yaml --- r: 38399 b: refs/heads/master c:
 6b54dae2b0defb30babb0fe87b13463b9f4b2907 h: refs/heads/master i:   38397:
 de6fa3cadc7694e20d28d4217bc8e8487aab2953   38395:
 3cbc8bd7dc1311f89dadb50728128ed89e6417c3   38391:
 45ae195bab47a25b02c7d8a23e81767b46cc73ce   38383:
 58a1178495c0780d6b25e75f2e37827a99d1715e   38367:
 413ceadd50d61d293ae56e09ce52a421e14e1026   38335:
 0a931bbf2dadc7aa4fb9b20e19030ac320cdf789   38271:
 5d9bfea1220e7f6b13fb6959b93dc3c2d6d47186   38143:
 9a2a82de4f893ca8fa1cdb7a738c1917c9cdc9c2   37887:
 5cb91664a665da84e37cab5a5f398716d8c901a9 v: v3

---
 [refs]                | 2 +-
 trunk/fs/lockd/host.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c731d80f1b4d..8484a4a357ed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b66285cee3f9abad26cca6c9b848e1ad6b792d94
+refs/heads/master: 6b54dae2b0defb30babb0fe87b13463b9f4b2907
diff --git a/trunk/fs/lockd/host.c b/trunk/fs/lockd/host.c
index 0257a5594524..fb24a9730345 100644
--- a/trunk/fs/lockd/host.c
+++ b/trunk/fs/lockd/host.c
@@ -103,8 +103,8 @@ nlm_lookup_host(int server, const struct sockaddr_in *sin,
 			continue;
 
 		/* See if we have an NSM handle for this client */
-		if (!nsm && (nsm = host->h_nsmhandle) != 0)
-			atomic_inc(&nsm->sm_count);
+		if (!nsm)
+			nsm = host->h_nsmhandle;
 
 		if (host->h_proto != proto)
 			continue;
@@ -120,6 +120,8 @@ nlm_lookup_host(int server, const struct sockaddr_in *sin,
 		nlm_get_host(host);
 		goto out;
 	}
+	if (nsm)
+		atomic_inc(&nsm->sm_count);
 
 	host = NULL;