block: don't lose track of REQ_INTEGRITY flag
PATCH 1/1 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 <[email protected]>
Cc Keith Busch <[email protected]>
Signed-off-by Ming Lei <[email protected]>
--- block/blk-mq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
block/blk-mq.c +2 -1
@@ -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);
Signature · 1 line
2.9.5
Quoted 3 lines · Ming Lei
We need to pass
bio->bi_opfafter bio intergrity preparing, otherwise the flag ofREQ_INTEGRITYmay not be set on the allocated request, then breaks block integrity.
Thanks, applied.
Signature · 1 line
Jens Axboe