---

yaml --- r: 22000 b: refs/heads/master c: 8b5536b h: refs/heads/master v: v3
git-mirror · Mar 20, 2006 · bf6f45b · bf6f45b
1 parent 0e4be43
commit bf6f45b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 489447380a2921ec0e9154f773c44ab3167ede4b
+refs/heads/master: 8b5536bbee53620f8d5f367987e5727ba36d886d
diff --git a/trunk/lib/kref.c b/trunk/lib/kref.c
@@ -52,7 +52,12 @@ int kref_put(struct kref *kref, void (*release)(struct kref *kref))
 	WARN_ON(release == NULL);
 	WARN_ON(release == (void (*)(struct kref *))kfree);
 
-	if (atomic_dec_and_test(&kref->refcount)) {
+	/*
+	 * if current count is one, we are the last user and can release object
+	 * right now, avoiding an atomic operation on 'refcount'
+	 */
+	if ((atomic_read(&kref->refcount) == 1) ||
+	    (atomic_dec_and_test(&kref->refcount))) {
 		release(kref);
 		return 1;
 	}