From 0398a7a36686ac45b0d6e700ef3ebbb9e0c7e670 Mon Sep 17 00:00:00 2001
From: Elias Oltmanns <eo@nebensachen.de>
Date: Wed, 1 Oct 2008 16:02:33 +0200
Subject: [PATCH] --- yaml --- r: 110554 b: refs/heads/master c:
 336c3d8ce771608815b65bcfa27a17a83b297328 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 29ac496bf090..eaae0fef27cb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c0ddffa84a7d12da9943a94d04dadbfb1883b904
+refs/heads/master: 336c3d8ce771608815b65bcfa27a17a83b297328
diff --git a/trunk/block/blk-core.c b/trunk/block/blk-core.c
index fa212348c4c9..c66333d8e48d 100644
--- a/trunk/block/blk-core.c
+++ b/trunk/block/blk-core.c
@@ -890,9 +890,11 @@ EXPORT_SYMBOL(blk_get_request);
  */
 void blk_start_queueing(struct request_queue *q)
 {
-	if (!blk_queue_plugged(q))
+	if (!blk_queue_plugged(q)) {
+		if (unlikely(blk_queue_stopped(q)))
+			return;
 		q->request_fn(q);
-	else
+	} else
 		__generic_unplug_device(q);
 }
 EXPORT_SYMBOL(blk_start_queueing);