diff options
| author | Yu Kuai <yukuai3@huawei.com> | 2025-09-10 14:30:53 +0800 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2025-09-10 05:23:46 -0600 |
| commit | e3290419d9be6cbd7a42c0691504dd66825cabf5 (patch) | |
| tree | 1c382125cc491a08a80fe042d1f345559639d40d /block | |
| parent | 6529d41d87827f9a27f6c0c6d34c2b77b250b6c6 (diff) | |
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>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-crypto-fallback.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/block/blk-crypto-fallback.c b/block/blk-crypto-fallback.c index 27fa1ec4b264..86b27f96051a 100644 --- 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; |