block: Bring back zero_fill_bio_iter

koverstreet · axboe · commit 649f070e6973 · 2023-08-14T15:40:42.000-06:00
This reverts 6f822e1 - this helper is used by bcachefs. Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev> Cc: Jens Axboe <axboe@kernel.dk> Cc: linux-block@vger.kernel.org Link: https://lore.kernel.org/r/20230813182636.2966159-4-kent.overstreet@linux.dev Signed-off-by: Jens Axboe <axboe@kernel.dk>
diff --git a/block/bio.c b/block/bio.c
@@ -606,15 +606,15 @@ struct bio *bio_kmalloc(unsigned short nr_vecs, gfp_t gfp_mask)
 }
 EXPORT_SYMBOL(bio_kmalloc);
 
-void zero_fill_bio(struct bio *bio)
+void zero_fill_bio_iter(struct bio *bio, struct bvec_iter start)
 {
 	struct bio_vec bv;
 	struct bvec_iter iter;
 
-	bio_for_each_segment(bv, bio, iter)
+	__bio_for_each_segment(bv, bio, iter, start)
 		memzero_bvec(&bv);
 }
-EXPORT_SYMBOL(zero_fill_bio);
+EXPORT_SYMBOL(zero_fill_bio_iter);
 
 /**
  * bio_truncate - truncate the bio to small size of @new_size
diff --git a/include/linux/bio.h b/include/linux/bio.h
@@ -488,7 +488,12 @@ extern void bio_copy_data_iter(struct bio *dst, struct bvec_iter *dst_iter,
 extern void bio_copy_data(struct bio *dst, struct bio *src);
 extern void bio_free_pages(struct bio *bio);
 void guard_bio_eod(struct bio *bio);
-void zero_fill_bio(struct bio *bio);
+void zero_fill_bio_iter(struct bio *bio, struct bvec_iter iter);
+
+static inline void zero_fill_bio(struct bio *bio)
+{
+	zero_fill_bio_iter(bio, bio->bi_iter);
+}
 
 static inline void bio_release_pages(struct bio *bio, bool mark_dirty)
 {

Original file line number	Diff line number	Diff line change
`@@ -606,15 +606,15 @@ struct bio *bio_kmalloc(unsigned short nr_vecs, gfp_t gfp_mask)`
`606`	`606`	`}`
`607`	`607`	`EXPORT_SYMBOL(bio_kmalloc);`
`608`	`608`
`609`		`-void zero_fill_bio(struct bio *bio)`
	`609`	`+void zero_fill_bio_iter(struct bio *bio, struct bvec_iter start)`
`610`	`610`	`{`
`611`	`611`	`struct bio_vec bv;`
`612`	`612`	`struct bvec_iter iter;`
`613`	`613`
`614`		`- bio_for_each_segment(bv, bio, iter)`
	`614`	`+ __bio_for_each_segment(bv, bio, iter, start)`
`615`	`615`	`memzero_bvec(&bv);`
`616`	`616`	`}`
`617`		`-EXPORT_SYMBOL(zero_fill_bio);`
	`617`	`+EXPORT_SYMBOL(zero_fill_bio_iter);`
`618`	`618`
`619`	`619`	`/**`
`620`	`620`	`* bio_truncate - truncate the bio to small size of @new_size`