diff options
author | Christoph Hellwig <hch@lst.de> | 2022-05-04 16:29:50 +0200 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2022-05-05 02:29:52 +0200 |
commit | 7ecc56c62b27d93838ee67fc2c7a1c3c480aea04 (patch) | |
tree | afab60eadb98d3a8a76c957ab39f47d5da3d99cc /block | |
parent | block: remove superfluous calls to blkcg_bio_issue_init (diff) | |
download | linux-7ecc56c62b27d93838ee67fc2c7a1c3c480aea04.tar.xz linux-7ecc56c62b27d93838ee67fc2c7a1c3c480aea04.zip |
block: allow passing a NULL bdev to bio_alloc_clone/bio_init_clone
Device mapper wants to allocate a bio before knowing the device it
gets send to, so add explicit support for that.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Mike Snitzer <snitzer@kernel.org>
Link: https://lore.kernel.org/r/20220504142950.567582-3-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
-rw-r--r-- | block/bio.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/block/bio.c b/block/bio.c index aa94195ffd02..a3893d80dccc 100644 --- a/block/bio.c +++ b/block/bio.c @@ -761,13 +761,15 @@ static int __bio_clone(struct bio *bio, struct bio *bio_src, gfp_t gfp) bio_set_flag(bio, BIO_CLONED); if (bio_flagged(bio_src, BIO_THROTTLED)) bio_set_flag(bio, BIO_THROTTLED); - if (bio->bi_bdev == bio_src->bi_bdev && - bio_flagged(bio_src, BIO_REMAPPED)) - bio_set_flag(bio, BIO_REMAPPED); bio->bi_ioprio = bio_src->bi_ioprio; bio->bi_iter = bio_src->bi_iter; - bio_clone_blkg_association(bio, bio_src); + if (bio->bi_bdev) { + if (bio->bi_bdev == bio_src->bi_bdev && + bio_flagged(bio_src, BIO_REMAPPED)) + bio_set_flag(bio, BIO_REMAPPED); + bio_clone_blkg_association(bio, bio_src); + } if (bio_crypt_clone(bio, bio_src, gfp) < 0) return -ENOMEM; |