Commit 6f822e1b authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: remove zero_fill_bio_iter 



zero_fill_bio_iter is only used to implement zero_fill_bio, so
remove the indirection.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Link: https://lore.kernel.org/r/20210412134658.2623190-1-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 907d5231

block/bio.c

+3 −3
Original line number Diff line number Diff line
@@ -493,20 +493,20 @@ struct bio *bio_kmalloc(gfp_t gfp_mask, unsigned short nr_iovecs) 
}

EXPORT_SYMBOL(bio_kmalloc);



void zero_fill_bio_iter(struct bio *bio, struct bvec_iter start)

void zero_fill_bio(struct bio *bio)

{

	unsigned long flags;

	struct bio_vec bv;

	struct bvec_iter iter;



	__bio_for_each_segment(bv, bio, iter, start) {

	bio_for_each_segment(bv, bio, iter) {

		char *data = bvec_kmap_irq(&bv, &flags);

		memset(data, 0, bv.bv_len);

		flush_dcache_page(bv.bv_page);

		bvec_kunmap_irq(data, &flags);

	}

}

EXPORT_SYMBOL(zero_fill_bio_iter);

EXPORT_SYMBOL(zero_fill_bio);



/**

 * bio_truncate - truncate the bio to small size of @new_size

include/linux/bio.h

+1 −6
Original line number Diff line number Diff line
@@ -485,14 +485,9 @@ 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_list_copy_data(struct bio *dst, struct bio *src);

extern void bio_free_pages(struct bio *bio);

void zero_fill_bio_iter(struct bio *bio, struct bvec_iter iter);

void bio_truncate(struct bio *bio, unsigned new_size);

void guard_bio_eod(struct bio *bio);



static inline void zero_fill_bio(struct bio *bio)

{

	zero_fill_bio_iter(bio, bio->bi_iter);

}

void zero_fill_bio(struct bio *bio);



extern const char *bio_devname(struct bio *bio, char *buffer);