block: don't lose track of REQ_INTEGRITY flag (7809167d) · Commits · 戴 / test

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: ("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>

block/blk-mq.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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);

Admin message