Instead of manipulating both QUEUE_FLAG_STOPPED and BLK_MQ_S_STOPPED
in the dm start and stop queue functions, only manipulate the latter
flag.

Signed-off-by: Bart Van Assche <bart.vanass...@sandisk.com>
Cc: Mike Snitzer <snit...@redhat.com>
---
 drivers/md/dm-rq.c | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/drivers/md/dm-rq.c b/drivers/md/dm-rq.c
index d5cec26..9c34606 100644
--- a/drivers/md/dm-rq.c
+++ b/drivers/md/dm-rq.c
@@ -75,12 +75,6 @@ static void dm_old_start_queue(struct request_queue *q)
 
 static void dm_mq_start_queue(struct request_queue *q)
 {
-       unsigned long flags;
-
-       spin_lock_irqsave(q->queue_lock, flags);
-       queue_flag_clear(QUEUE_FLAG_STOPPED, q);
-       spin_unlock_irqrestore(q->queue_lock, flags);
-
        blk_mq_start_stopped_hw_queues(q, true);
        blk_mq_kick_requeue_list(q);
 }
@@ -105,16 +99,8 @@ static void dm_old_stop_queue(struct request_queue *q)
 
 static void dm_mq_stop_queue(struct request_queue *q)
 {
-       unsigned long flags;
-
-       spin_lock_irqsave(q->queue_lock, flags);
-       if (blk_queue_stopped(q)) {
-               spin_unlock_irqrestore(q->queue_lock, flags);
+       if (blk_mq_queue_stopped(q))
                return;
-       }
-
-       queue_flag_set(QUEUE_FLAG_STOPPED, q);
-       spin_unlock_irqrestore(q->queue_lock, flags);
 
        /* Avoid that requeuing could restart the queue. */
        blk_mq_cancel_requeue_work(q);
@@ -341,7 +327,7 @@ static void __dm_mq_kick_requeue_list(struct request_queue 
*q, unsigned long mse
        unsigned long flags;
 
        spin_lock_irqsave(q->queue_lock, flags);
-       if (!blk_queue_stopped(q))
+       if (!blk_mq_queue_stopped(q))
                blk_mq_delay_kick_requeue_list(q, msecs);
        spin_unlock_irqrestore(q->queue_lock, flags);
 }
-- 
2.10.1

--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to