diff options
| author |   Jens Axboe <axboe@kernel.dk> | 2021-10-18 20:54:39 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2021-10-19 05:48:15 -0600 |
| commit | e0d78afeb8d190164a823d5ef5821b0b3802af33 (patch) | |
| tree | 0492caa8741e7b6c66b7c6c8038f5d3154bc4027 | |
| parent | nvme: wire up completion batching for the IRQ path (diff) | |
| download | linux-dev-e0d78afeb8d190164a823d5ef5821b0b3802af33.tar.xz linux-dev-e0d78afeb8d190164a823d5ef5821b0b3802af33.zip | |
block: fix too broad elevator check in blk_mq_free_request()
We added RQF_ELV to tell whether there's an IO scheduler attached, and
RQF_ELVPRIV tells us whether there's an IO scheduler with private data
attached. Don't check RQF_ELV in blk_mq_free_request(), what we care
about here is just if we have scheduler private data attached.
This fixes a boot crash
Fixes: 2ff0682da6e0 ("block: store elevator state in request")
Reported-by: Yi Zhang <yi.zhang@redhat.com>
Reported-by: syzbot+eb8104072aeab6cc1195@syzkaller.appspotmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
| -rw-r--r-- | block/blk-mq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c index 9248edd8a7d3..bbc61394eef3 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -580,7 +580,7 @@ void blk_mq_free_request(struct request *rq) struct request_queue *q = rq->q; struct blk_mq_hw_ctx *hctx = rq->mq_hctx; - if (rq->rq_flags & (RQF_ELVPRIV | RQF_ELV)) { + if (rq->rq_flags & RQF_ELVPRIV) { struct elevator_queue *e = q->elevator; if (e->type->ops.finish_request) |