Merge tag 'for-6.10/block-20240511' of git://git.kernel.dk/linux

[linux-block.git] / block / bio.c

diff --git a/block/bio.c b/block/bio.c
index d24420ed1c4c6f20b80bc043cdf0378afcb43668..53f608028c78f801e9f361f9edd1b7e394318477 100644 (file)
--- a/block/bio.c
+++ b/block/bio.c
@@ -345,18 +345,29 @@ void bio_chain(struct bio *bio, struct bio *parent)
 }
 EXPORT_SYMBOL(bio_chain);
 
-struct bio *blk_next_bio(struct bio *bio, struct block_device *bdev,
-               unsigned int nr_pages, blk_opf_t opf, gfp_t gfp)
+/**
+ * bio_chain_and_submit - submit a bio after chaining it to another one
+ * @prev: bio to chain and submit
+ * @new: bio to chain to
+ *
+ * If @prev is non-NULL, chain it to @new and submit it.
+ *
+ * Return: @new.
+ */
+struct bio *bio_chain_and_submit(struct bio *prev, struct bio *new)
 {
-       struct bio *new = bio_alloc(bdev, nr_pages, opf, gfp);
-
-       if (bio) {
-               bio_chain(bio, new);
-               submit_bio(bio);
+       if (prev) {
+               bio_chain(prev, new);
+               submit_bio(prev);
        }
-
        return new;
 }
+
+struct bio *blk_next_bio(struct bio *bio, struct block_device *bdev,
+               unsigned int nr_pages, blk_opf_t opf, gfp_t gfp)
+{
+       return bio_chain_and_submit(bio, bio_alloc(bdev, nr_pages, opf, gfp));
+}
 EXPORT_SYMBOL_GPL(blk_next_bio);
 
 static void bio_alloc_rescue(struct work_struct *work)
@@ -1384,6 +1395,26 @@ int submit_bio_wait(struct bio *bio)
 }
 EXPORT_SYMBOL(submit_bio_wait);
 
+static void bio_wait_end_io(struct bio *bio)
+{
+       complete(bio->bi_private);
+       bio_put(bio);
+}
+
+/*
+ * bio_await_chain - ends @bio and waits for every chained bio to complete
+ */
+void bio_await_chain(struct bio *bio)
+{
+       DECLARE_COMPLETION_ONSTACK_MAP(done,
+                       bio->bi_bdev->bd_disk->lockdep_map);
+
+       bio->bi_private = &done;
+       bio->bi_end_io = bio_wait_end_io;
+       bio_endio(bio);
+       blk_wait_io(&done);
+}
+
 void __bio_advance(struct bio *bio, unsigned bytes)
 {
        if (bio_integrity(bio))
@@ -1576,6 +1607,8 @@ again:
        if (!bio_integrity_endio(bio))
                return;
 
+       blk_zone_bio_endio(bio);
+
        rq_qos_done_bio(bio);
 
        if (bio->bi_bdev && bio_flagged(bio, BIO_TRACE_COMPLETION)) {
@@ -1596,7 +1629,6 @@ again:
                goto again;
        }
 
-       blk_throtl_bio_endio(bio);
        /* release cgroup info */
        bio_uninit(bio);
        if (bio->bi_end_io)