From: Ming Lei ming.lei@redhat.com
commit c326f846ebc2a30eca386b85dffba96e23803d81 upstream.
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: c3e2219216c9 ("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 (cherry picked from commit c326f846ebc2a30eca386b85dffba96e23803d81) Signed-off-by: Martyn Welch martyn.welch@collabora.com --- block/blk-mq-sched.c | 1 - 1 file changed, 1 deletion(-)
diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c index 105f8c124604..156e6444dc8f 100644 --- a/block/blk-mq-sched.c +++ b/block/blk-mq-sched.c @@ -533,7 +533,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)