Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0d33ab7 authored by Bart Van Assche's avatar Bart Van Assche Committed by Jens Axboe
Browse files

dm: Use BLK_MQ_S_STOPPED instead of QUEUE_FLAG_STOPPED in blk-mq code 



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. Change blk_queue_stopped() tests into blk_mq_queue_stopped().

Signed-off-by: default avatarBart Van Assche <bart.vanassche@sandisk.com>
Acked-by: default avatarMike Snitzer <snitzer@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 2b053aca

drivers/md/dm-rq.c

+1 −15
Original line number Diff line number Diff line
@@ -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);



	blk_mq_stop_hw_queues(q);

}