Commit 957a2b34 authored by Muchun Song's avatar Muchun Song Committed by Jens Axboe
Browse files

block: fix missing blkcg_bio_issue_init 



The commit 51361684 ("block: remove superfluous calls to
blkcg_bio_issue_init") has removed blkcg_bio_issue_init from
__bio_clone since submit_bio will override ->bi_issue.
However, __blk_queue_split is called after blkcg_bio_issue_init
(see blk_mq_submit_bio) in submit_bio. In this case, the
->bi_issue is 0. Fix it.

Fixes: 51361684 ("block: remove superfluous calls to blkcg_bio_issue_init")
Signed-off-by: default avatarMuchun Song <songmuchun@bytedance.com>
Link: https://lore.kernel.org/r/20220713140226.68135-1-songmuchun@bytedance.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent c24b06e1

block/blk-merge.c

+1 −0
Original line number Diff line number Diff line
@@ -345,6 +345,7 @@ void __blk_queue_split(struct request_queue *q, struct bio **bio, 
		/* there isn't chance to merge the splitted bio */

		split->bi_opf |= REQ_NOMERGE;



		blkcg_bio_issue_init(split);

		bio_chain(split, *bio);

		trace_block_split(split, (*bio)->bi_iter.bi_sector);

		submit_bio_noacct(*bio);