Commit 46bbf653 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: inherit BIO_REMAPPED when cloning bios 



Cloned bios are can be used to on the same device, in which case we need
to inherit the BIO_REMAPPED flag to avoid a double partition remap.  When
the cloned bios are used on another device, bio_set_dev will clear the flag.

Fixes: 309dca30 ("block: store a block_device pointer in struct bio")
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent f65b95fe

block/bio.c

+2 −0
Original line number Diff line number Diff line
@@ -666,6 +666,8 @@ void __bio_clone_fast(struct bio *bio, struct bio *bio_src) 
	bio_set_flag(bio, BIO_CLONED);

	if (bio_flagged(bio_src, BIO_THROTTLED))

		bio_set_flag(bio, BIO_THROTTLED);

	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;

block/blk-crypto-fallback.c

+2 −0
Original line number Diff line number Diff line
@@ -168,6 +168,8 @@ static struct bio *blk_crypto_clone_bio(struct bio *bio_src) 
	if (!bio)

		return NULL;

	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;

block/bounce.c

+2 −0
Original line number Diff line number Diff line
@@ -247,6 +247,8 @@ static struct bio *bounce_clone_bio(struct bio *bio_src, gfp_t gfp_mask, 
	if (!bio)

		return NULL;

	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;