---

yaml --- r: 287551 b: refs/heads/master c: 9fa7347 h: refs/heads/master i: 287549: 3820d95 287547: dc554d1 287543: 9cf1a51 287535: 9971ac3 287519: b6cc97e 287487: e97d6bf v: v3
git-mirror · Feb 6, 2012 · 86b2744 · 86b2744
1 parent 95c9e91
commit 86b2744
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 05c30b9551f1904d9950ad0d28e65fc4ff3c8a8e
+refs/heads/master: 9fa73472ddbcd3da87d35a7f4566eaaf345f798e
diff --git a/trunk/block/blk-ioc.c b/trunk/block/blk-ioc.c
@@ -204,7 +204,9 @@ void put_io_context(struct io_context *ioc, struct request_queue *locked_q)
 				spin_unlock(last_q->queue_lock);
 			last_q = NULL;
 
-			if (!spin_trylock(this_q->queue_lock))
+			/* spin_trylock() always successes in UP case */
+			if (this_q != locked_q &&
+			    !spin_trylock(this_q->queue_lock))
 				break;
 			last_q = this_q;
 			continue;