Merge tag 'drm-next-2021-02-19' of git://anongit.freedesktop.org/drm/drm

[linux-2.6-microblaze.git] / block / bounce.c

diff --git a/block/bounce.c b/block/bounce.c
index d3f51ac..fc55314 100644 (file)
--- a/block/bounce.c
+++ b/block/bounce.c
@@ -246,7 +246,9 @@ static struct bio *bounce_clone_bio(struct bio *bio_src, gfp_t gfp_mask,
        bio = bio_alloc_bioset(gfp_mask, bio_segments(bio_src), bs);
        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;