---

yaml --- r: 92823 b: refs/heads/master c: 164f98a h: refs/heads/master i: 92821: 23f2fa5 92819: 4a2c2a1 92815: 04db4be v: v3
git-mirror · Apr 23, 2008 · f824dcb · f824dcb
1 parent 05acc40
commit f824dcb
Show file tree

Hide file tree

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