From 86b2744d8a33f1f676642cc177ade8ccc2151f75 Mon Sep 17 00:00:00 2001
From: Shaohua Li <shaohua.li@intel.com>
Date: Mon, 6 Feb 2012 08:57:29 +0100
Subject: [PATCH] --- yaml --- r: 287551 b: refs/heads/master c:
 9fa73472ddbcd3da87d35a7f4566eaaf345f798e h: refs/heads/master i:   287549:
 3820d958d0fe1410a1cf396a2d2bcc0a9cc23b5b   287547:
 dc554d1476de48fd1b68fc0dc153de75dfba48d6   287543:
 9cf1a512a3f79fa666275b43e735ff35e03355a3   287535:
 9971ac3f0a6b0684220c5de00a3d694446bae1bc   287519:
 b6cc97e6693dd7e9b5d2227de3e9a723f6909c01   287487:
 e97d6bf2a0fc08ba383e831dd3a0759f42bab126 v: v3

---
 [refs]                | 2 +-
 trunk/block/blk-ioc.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index eb1888023700..1d2d72862acc 100644
--- 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
index 27a06e00eaec..7490b6da2453 100644
--- 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;