Skip to content

Commit 957a2b3

Browse files
Muchun Songaxboe
authored andcommitted
block: fix missing blkcg_bio_issue_init
The commit 5136168 ("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: 5136168 ("block: remove superfluous calls to blkcg_bio_issue_init") Signed-off-by: Muchun Song <songmuchun@bytedance.com> Link: https://lore.kernel.org/r/20220713140226.68135-1-songmuchun@bytedance.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent c24b06e commit 957a2b3

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

block/blk-merge.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,7 @@ void __blk_queue_split(struct request_queue *q, struct bio **bio,
345345
/* there isn't chance to merge the splitted bio */
346346
split->bi_opf |= REQ_NOMERGE;
347347

348+
blkcg_bio_issue_init(split);
348349
bio_chain(split, *bio);
349350
trace_block_split(split, (*bio)->bi_iter.bi_sector);
350351
submit_bio_noacct(*bio);

0 commit comments

Comments
 (0)