md/md-linear: convert to use bio_submit_split_bioset()

Unify bio split code, prepare to fix reordered 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>

diff --git a/drivers/md/md-linear.c b/drivers/md/md-linear.c
index 59d7963c7843b244651338533cf5148e898c0758..76f85cc3294207e8c146f57f88a8c7952d371299 100644 (file)
--- a/drivers/md/md-linear.c
+++ b/drivers/md/md-linear.c
@@ -256,19 +256,10 @@ static bool linear_make_request(struct mddev *mddev, struct bio *bio)
 
        if (unlikely(bio_end_sector(bio) > end_sector)) {
                /* This bio crosses a device boundary, so we have to split it */
-               struct bio *split = bio_split(bio, end_sector - bio_sector,
-                                             GFP_NOIO, &mddev->bio_set);
-
-               if (IS_ERR(split)) {
-                       bio->bi_status = errno_to_blk_status(PTR_ERR(split));
-                       bio_endio(bio);
+               bio = bio_submit_split_bioset(bio, end_sector - bio_sector,
+                                             &mddev->bio_set);
+               if (!bio)
                        return true;
-               }
-
-               bio_chain(split, bio);
-               trace_block_split(split, bio->bi_iter.bi_sector);
-               submit_bio_noacct(bio);
-               bio = split;
        }
 
        md_account_bio(mddev, &bio);