Commit 2569063c authored by Ming Lei's avatar Ming Lei Committed by Jens Axboe
Browse files

blk-mq: test QUEUE_FLAG_HCTX_ACTIVE for sbitmap_shared in hctx_may_queue 



In case of blk_mq_is_sbitmap_shared(), we should test QUEUE_FLAG_HCTX_ACTIVE against
q->queue_flags instead of BLK_MQ_S_TAG_ACTIVE.

So fix it.

Cc: John Garry <john.garry@huawei.com>
Cc: Kashyap Desai <kashyap.desai@broadcom.com>
Fixes: f1b49fdc ("blk-mq: Record active_queues_shared_sbitmap per tag_set for when using shared sbitmap")
Signed-off-by: default avatarMing Lei <ming.lei@redhat.com>
Reviewed-by: default avatarJohn Garry <john.garry@huawei.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 97784481

block/blk-mq.h

+1 −1
Original line number Diff line number Diff line
@@ -304,7 +304,7 @@ static inline bool hctx_may_queue(struct blk_mq_hw_ctx *hctx, 
		struct request_queue *q = hctx->queue;

		struct blk_mq_tag_set *set = q->tag_set;



		if (!test_bit(BLK_MQ_S_TAG_ACTIVE, &q->queue_flags))

		if (!test_bit(QUEUE_FLAG_HCTX_ACTIVE, &q->queue_flags))

			return true;

		users = atomic_read(&set->active_queues_shared_sbitmap);

	} else {