diff mbox series

[2/2] block: allow passing a NULL bdev to bio_alloc_clone/bio_init_clone

Message ID 20220504142950.567582-3-hch@lst.de (mailing list archive)
State New, archived
Headers show
Series [1/2] block: remove superfluous calls to blkcg_bio_issue_init | expand

Commit Message

Christoph Hellwig May 4, 2022, 2:29 p.m. UTC 
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>
---
 block/bio.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

Comments

Mike Snitzer May 4, 2022, 4:20 p.m. UTC | #1 
On Wed, May 04 2022 at 10:29P -0400,
Christoph Hellwig <hch@lst.de> wrote:

> 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>

Thanks
diff mbox series

Patch

diff --git a/block/bio.c b/block/bio.c
index 3cffc01e6377f..23a6838cb97e0 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -732,13 +732,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;