| Message ID | 20220713140226.68135-1-songmuchun@bytedance.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | block: fix missing blkcg_bio_issue_init | expand |
On Wed, 13 Jul 2022 22:02:26 +0800, Muchun Song wrote: > The commit 513616843d73 ("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. > > [...] Applied, thanks! [1/1] block: fix missing blkcg_bio_issue_init commit: 957a2b345cbcf41b4b25d471229f0e35262f066c Best regards,
diff --git a/block/blk-merge.c b/block/blk-merge.c index 5abf5aa5a5f0..a5bfe7f18f42 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -355,6 +355,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);
The commit 513616843d73 ("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: 513616843d73 ("block: remove superfluous calls to blkcg_bio_issue_init") Signed-off-by: Muchun Song <songmuchun@bytedance.com> --- block/blk-merge.c | 1 + 1 file changed, 1 insertion(+)