Merge tag 'media/v5.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[linux-2.6-microblaze.git] / block / blk-crypto-fallback.c

diff --git a/block/blk-crypto-fallback.c b/block/blk-crypto-fallback.c
index c162b75..e8327c5 100644 (file)
--- a/block/blk-crypto-fallback.c
+++ b/block/blk-crypto-fallback.c
@@ -164,10 +164,12 @@ static struct bio *blk_crypto_clone_bio(struct bio *bio_src)
        struct bio_vec bv;
        struct bio *bio;
 
-       bio = bio_alloc_bioset(GFP_NOIO, bio_segments(bio_src), NULL);
+       bio = bio_kmalloc(GFP_NOIO, bio_segments(bio_src));
        if (!bio)
                return NULL;
-       bio->bi_disk            = bio_src->bi_disk;
+       bio->bi_bdev            = bio_src->bi_bdev;
+       if (bio_flagged(bio_src, BIO_REMAPPED))
+               bio_set_flag(bio, BIO_REMAPPED);
        bio->bi_opf             = bio_src->bi_opf;
        bio->bi_ioprio          = bio_src->bi_ioprio;
        bio->bi_write_hint      = bio_src->bi_write_hint;