diff options
author | Ming Lei <ming.lei@redhat.com> | 2019-01-16 19:08:15 +0800 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2019-01-16 07:28:10 -0700 |
commit | 7809167da5c86fd6bf309b33dee7a797e263342f (patch) | |
tree | 0bd8e12a83eec11bc783779f7f0409fbd0556cb1 /block | |
parent | 04906b2f542c23626b0ef6219b808406f8dddbe9 (diff) | |
download | linux-stable-7809167da5c86fd6bf309b33dee7a797e263342f.tar.gz linux-stable-7809167da5c86fd6bf309b33dee7a797e263342f.tar.bz2 linux-stable-7809167da5c86fd6bf309b33dee7a797e263342f.zip |
block: don't lose track of REQ_INTEGRITY flag
We need to pass bio->bi_opf after bio intergrity preparing, otherwise
the flag of REQ_INTEGRITY may not be set on the allocated request, then
breaks block integrity.
Fixes: f9afca4d367b ("blk-mq: pass in request/bio flags to queue mapping")
Cc: Hannes Reinecke <hare@suse.com>
Cc: Keith Busch <keith.busch@intel.com>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
-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 3ba37b9e15e9..8f5b533764ca 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -1906,7 +1906,7 @@ static blk_qc_t blk_mq_make_request(struct request_queue *q, struct bio *bio) { const int is_sync = op_is_sync(bio->bi_opf); const int is_flush_fua = op_is_flush(bio->bi_opf); - struct blk_mq_alloc_data data = { .flags = 0, .cmd_flags = bio->bi_opf }; + struct blk_mq_alloc_data data = { .flags = 0}; struct request *rq; struct blk_plug *plug; struct request *same_queue_rq = NULL; @@ -1928,6 +1928,7 @@ static blk_qc_t blk_mq_make_request(struct request_queue *q, struct bio *bio) rq_qos_throttle(q, bio); + data.cmd_flags = bio->bi_opf; rq = blk_mq_get_request(q, bio, &data); if (unlikely(!rq)) { rq_qos_cleanup(q, bio); |