From c85608c1ea0d2abf941e2269606c2b6a47788e4f Mon Sep 17 00:00:00 2001
From: Coywolf Qi Hunt <qiyong@freeforge.net>
Date: Wed, 19 Apr 2006 10:14:49 +0200
Subject: [PATCH] --- yaml --- r: 26058 b: refs/heads/master c:
 7daac4902053045450fa29db42aba19a4581f850 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 5d6d24c4813a..cf78e503cdc6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 73af994c7d58dd513922dc9d5cd76b124ec02b1b
+refs/heads/master: 7daac4902053045450fa29db42aba19a4581f850
diff --git a/trunk/block/ll_rw_blk.c b/trunk/block/ll_rw_blk.c
index e112d1a5dab6..1755c053fd68 100644
--- a/trunk/block/ll_rw_blk.c
+++ b/trunk/block/ll_rw_blk.c
@@ -1554,7 +1554,7 @@ void blk_plug_device(request_queue_t *q)
 	 * don't plug a stopped queue, it must be paired with blk_start_queue()
 	 * which will restart the queueing
 	 */
-	if (test_bit(QUEUE_FLAG_STOPPED, &q->queue_flags))
+	if (blk_queue_stopped(q))
 		return;
 
 	if (!test_and_set_bit(QUEUE_FLAG_PLUGGED, &q->queue_flags)) {
@@ -1587,7 +1587,7 @@ EXPORT_SYMBOL(blk_remove_plug);
  */
 void __generic_unplug_device(request_queue_t *q)
 {
-	if (unlikely(test_bit(QUEUE_FLAG_STOPPED, &q->queue_flags)))
+	if (unlikely(blk_queue_stopped(q)))
 		return;
 
 	if (!blk_remove_plug(q))