From 2953317d7333a279db1fe38d29d8ca64f3ad4acc Mon Sep 17 00:00:00 2001
From: Jens Axboe <jens.axboe@oracle.com>
Date: Wed, 7 May 2008 09:48:17 +0200
Subject: [PATCH] --- yaml --- r: 96161 b: refs/heads/master c:
 dbaf2c003e151ad9231778819b0977f95e20e06f h: refs/heads/master i:   96159:
 16f6fd8991d15f8d5f702350f41f5fa2d6d5046c v: v3

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

diff --git a/[refs] b/[refs]
index ad19d2d11da4..ff476edc9dc9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2cdf79cafbd11580f5b63cd4993b45c1c4952415
+refs/heads/master: dbaf2c003e151ad9231778819b0977f95e20e06f
diff --git a/trunk/block/blk-core.c b/trunk/block/blk-core.c
index b754a4a2f9bd..1b7dddf94f4f 100644
--- a/trunk/block/blk-core.c
+++ b/trunk/block/blk-core.c
@@ -253,9 +253,11 @@ EXPORT_SYMBOL(__generic_unplug_device);
  **/
 void generic_unplug_device(struct request_queue *q)
 {
-	spin_lock_irq(q->queue_lock);
-	__generic_unplug_device(q);
-	spin_unlock_irq(q->queue_lock);
+	if (blk_queue_plugged(q)) {
+		spin_lock_irq(q->queue_lock);
+		__generic_unplug_device(q);
+		spin_unlock_irq(q->queue_lock);
+	}
 }
 EXPORT_SYMBOL(generic_unplug_device);