From f824dcbc55af24013fd99613e796be1ce8c06e21 Mon Sep 17 00:00:00 2001
From: "J. Bruce Fields" <bfields@citi.umich.edu>
Date: Wed, 20 Feb 2008 14:02:47 -0500
Subject: [PATCH] --- yaml --- r: 92823 b: refs/heads/master c:
 164f98adbbd50c67177b096a59f55c1a56a45c82 h: refs/heads/master i:   92821:
 23f2fa5d7e0a076b9048b82c2a20d09ec62aa83e   92819:
 4a2c2a1e32ea3dca17c0b08fb240c4356ed7da5f   92815:
 04db4be0e607f3828802503e64220ff44a60de7a v: v3

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

diff --git a/[refs] b/[refs]
index 2b2193e59042..2617c5de1bdb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dd35210e1e2cb46d6dba5c97f1bc3784c4f97998
+refs/heads/master: 164f98adbbd50c67177b096a59f55c1a56a45c82
diff --git a/trunk/fs/lockd/host.c b/trunk/fs/lockd/host.c
index c3f119426d83..960911c4a11c 100644
--- a/trunk/fs/lockd/host.c
+++ b/trunk/fs/lockd/host.c
@@ -529,12 +529,10 @@ nsm_release(struct nsm_handle *nsm)
 {
 	if (!nsm)
 		return;
+	mutex_lock(&nsm_mutex);
 	if (atomic_dec_and_test(&nsm->sm_count)) {
-		mutex_lock(&nsm_mutex);
-		if (atomic_read(&nsm->sm_count) == 0) {
-			list_del(&nsm->sm_link);
-			kfree(nsm);
-		}
-		mutex_unlock(&nsm_mutex);
+		list_del(&nsm->sm_link);
+		kfree(nsm);
 	}
+	mutex_unlock(&nsm_mutex);
 }