---

yaml --- r: 110554 b: refs/heads/master c: 336c3d8 h: refs/heads/master v: v3
git-mirror · Oct 9, 2008 · 0398a7a · 0398a7a
1 parent 9c857d7
commit 0398a7a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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);