blk-crypto: 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: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/blk-crypto-fallback.c b/block/blk-crypto-fallback.c
index 27fa1ec4b26491f3cde96f0938a2f3e961b9827d..86b27f96051ae8c514cf224fbd077d45ab9e1f4d 100644 (file)
--- a/block/blk-crypto-fallback.c
+++ b/block/blk-crypto-fallback.c
@@ -18,7 +18,6 @@
 #include <linux/module.h>
 #include <linux/random.h>
 #include <linux/scatterlist.h>
-#include <trace/events/block.h>
 
 #include "blk-cgroup.h"
 #include "blk-crypto-internal.h"
@@ -222,20 +221,14 @@ static bool blk_crypto_fallback_split_bio_if_needed(struct bio **bio_ptr)
                if (++i == BIO_MAX_VECS)
                        break;
        }
-       if (num_sectors < bio_sectors(bio)) {
-               struct bio *split_bio;
 
-               split_bio = bio_split(bio, num_sectors, GFP_NOIO,
-                                     &crypto_bio_split);
-               if (IS_ERR(split_bio)) {
-                       bio->bi_status = BLK_STS_RESOURCE;
+       if (num_sectors < bio_sectors(bio)) {
+               bio = bio_submit_split_bioset(bio, num_sectors,
+                                             &crypto_bio_split);
+               if (!bio)
                        return false;
-               }
 
-               bio_chain(split_bio, bio);
-               trace_block_split(split_bio, bio->bi_iter.bi_sector);
-               submit_bio_noacct(bio);
-               *bio_ptr = split_bio;
+               *bio_ptr = bio;
        }
 
        return true;