[13/19] block: move blk_next_bio to bio.c

Commit Message

Christoph Hellwig Jan. 18, 2022, 7:19 a.m. UTC

Keep blk_next_bio next to the core bio infrastructure.

Signed-off-by: Christoph Hellwig <[e-mail]>
---
 block/bio.c     | 13 +++++++++++++
 block/blk-lib.c | 13 -------------
 2 files changed, 13 insertions(+), 13 deletions(-)

Comments

Chaitanya Kulkarni Jan. 18, 2022, 10:10 p.m. UTC | #1

On 1/17/22 11:19 PM, Christoph Hellwig wrote:
> Keep blk_next_bio next to the core bio infrastructure.
> 
> Signed-off-by: Christoph Hellwig <[e-mail]>


Looks good.

Reviewed-by: Chaitanya Kulkarni <[e-mail]>

Patch

diff --git a/block/bio.c b/block/bio.c
index 0d400ba2dbd18..43fb28ac6b44e 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -344,6 +344,19 @@  void bio_chain(struct bio *bio, struct bio *parent)
 }
 EXPORT_SYMBOL(bio_chain);
 
+struct bio *blk_next_bio(struct bio *bio, unsigned int nr_pages, gfp_t gfp)
+{
+	struct bio *new = bio_alloc(gfp, nr_pages);
+
+	if (bio) {
+		bio_chain(bio, new);
+		submit_bio(bio);
+	}
+
+	return new;
+}
+EXPORT_SYMBOL_GPL(blk_next_bio);
+
 static void bio_alloc_rescue(struct work_struct *work)
 {
 	struct bio_set *bs = container_of(work, struct bio_set, rescue_work);
diff --git a/block/blk-lib.c b/block/blk-lib.c
index 9f09beadcbe30..9245b300ef73e 100644
--- a/block/blk-lib.c
+++ b/block/blk-lib.c
@@ -10,19 +10,6 @@ 
 
 #include "blk.h"
 
-struct bio *blk_next_bio(struct bio *bio, unsigned int nr_pages, gfp_t gfp)
-{
-	struct bio *new = bio_alloc(gfp, nr_pages);
-
-	if (bio) {
-		bio_chain(bio, new);
-		submit_bio(bio);
-	}
-
-	return new;
-}
-EXPORT_SYMBOL_GPL(blk_next_bio);
-
 int __blkdev_issue_discard(struct block_device *bdev, sector_t sector,
 		sector_t nr_sects, gfp_t gfp_mask, int flags,
 		struct bio **biop)