diff options
| author | Yu Kuai <yukuai3@huawei.com> | 2025-09-10 09:30:51 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2025-09-10 14:23:45 +0300 |
| commit | 9e8a5b37c9ea3ae9db9028ea756ececf221d9a5a (patch) | |
| tree | 583306b50892e323551a1f6b8c53378fd233cd8d | |
| parent | 6fc07785d9b89255bba45fc84475bb32f9737a90 (diff) | |
| download | linux-9e8a5b37c9ea3ae9db9028ea756ececf221d9a5a.tar.xz | |
md/raid5: convert to use bio_submit_split_bioset()
Unify bio split code, prepare to fix ordering of split IO.
Signed-off-by: Yu Kuai <yukuai3@huawei.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
| -rw-r--r-- | drivers/md/raid5.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 96a6d63b3d62..04add718be77 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -5486,7 +5486,6 @@ static int raid5_read_one_chunk(struct mddev *mddev, struct bio *raid_bio) static struct bio *chunk_aligned_read(struct mddev *mddev, struct bio *raid_bio) { - struct bio *split; sector_t sector = raid_bio->bi_iter.bi_sector; unsigned chunk_sects = mddev->chunk_sectors; unsigned sectors = chunk_sects - (sector & (chunk_sects-1)); @@ -5494,11 +5493,10 @@ static struct bio *chunk_aligned_read(struct mddev *mddev, struct bio *raid_bio) if (sectors < bio_sectors(raid_bio)) { struct r5conf *conf = mddev->private; - split = bio_split(raid_bio, sectors, GFP_NOIO, &conf->bio_split); - bio_chain(split, raid_bio); - trace_block_split(split, raid_bio->bi_iter.bi_sector); - submit_bio_noacct(raid_bio); - raid_bio = split; + raid_bio = bio_submit_split_bioset(raid_bio, sectors, + &conf->bio_split); + if (!raid_bio) + return NULL; } if (!raid5_read_one_chunk(mddev, raid_bio)) |