diff options
| author | Ming Lei | 2021-11-27 00:19:43 +0800 |
|---|---|---|
| committer | Jens Axboe | 2021-11-29 06:41:23 -0700 |
| commit | 5f480b1a6325748f26999e2151c9912e00cc4087 (patch) | |
| tree | 4ea5aa185f7981509c0ab0e7c97d12504c2e77ac /block/blk-mq.c | |
| parent | c65e6fd460b4df796ecd6ea22e132076ed1f2820 (diff) | |
blk-mq: use bio->bi_opf after bio is checked
bio->bi_opf isn't finalized before checking the bio, so use it after
submit_bio_checks() returns.
Fixes: 5b13bc8a3fd5 ("blk-mq: cleanup request allocation")
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-mq.c')
| -rw-r--r-- | block/blk-mq.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c index a89a624dd1df..143a8edf6300 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -2713,7 +2713,6 @@ static struct request *blk_mq_get_new_requests(struct request_queue *q, struct blk_mq_alloc_data data = { .q = q, .nr_tags = 1, - .cmd_flags = bio->bi_opf, }; struct request *rq; @@ -2726,6 +2725,8 @@ static struct request *blk_mq_get_new_requests(struct request_queue *q, rq_qos_throttle(q, bio); + /* ->bi_opf is finalized after submit_bio_checks() returns */ + data.cmd_flags = bio->bi_opf; if (plug) { data.nr_tags = plug->nr_ios; plug->nr_ios = 1; |