Commit c326f846 authored Jun 11, 2019 by Ming Lei Committed by Jens Axboe Jun 13, 2019

blk-mq: remove WARN_ON(!q->elevator) from blk_mq_sched_free_requests



blk_mq_sched_free_requests() may be called in failure path in which
q->elevator may not be setup yet, so remove WARN_ON(!q->elevator) from
blk_mq_sched_free_requests for avoiding the false positive.

This function is actually safe to call in case of !q->elevator because
hctx->sched_tags is checked.

Cc: Bart Van Assche <bvanassche@acm.org>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Yi Zhang <yi.zhang@redhat.com>
Fixes: c3e22192 ("block: free sched's request pool in blk_cleanup_queue")
Reported-by:  <syzbot+b9d0d56867048c7bcfde@syzkaller.appspotmail.com>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

parent fb5772cb

block/blk-mq-sched.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -555,7 +555,6 @@ void blk_mq_sched_free_requests(struct request_queue *q)
		int i;

		lockdep_assert_held(&q->sysfs_lock);
		WARN_ON(!q->elevator);

		queue_for_each_hw_ctx(q, hctx, i) {
		if (hctx->sched_tags)

Admin message