block: bio_copy_data_iter
PATCH 1/1 block: bio_copy_data_iter
With the pktcdvdv removal, bio_copy_data_iter is unused now. Fold the logic into bio_copy_data and remove the separate lower level function.
Signed-off-by Christoph Hellwig <[email protected]>
--- block/bio.c | 37 +++++++++++++++---------------------- include/linux/bio.h | 2 -- 2 files changed, 15 insertions(+), 24 deletions(-)
block/bio.c +15 -22
@@ -1401,27 +1401,6 @@ void __bio_advance(struct bio *bio, unsigned bytes) }EXPORT_SYMBOL (__bio_advance); -void bio_copy_data_iter (struct bio *dst,struct bvec_iter *dst_iter, -struct bio *src,struct bvec_iter *src_iter) -{ -while (src_iter->bi_size && dst_iter->bi_size) { -struct bio_vec src_bv =bio_iter_iovec (src, *src_iter); -struct bio_vec dst_bv =bio_iter_iovec (dst, *dst_iter); -unsigned int bytes =min (src_bv.bv_len, dst_bv.bv_len); -void *src_buf =bvec_kmap_local (&src_bv); -void *dst_buf =bvec_kmap_local (&dst_bv); - -memcpy (dst_buf, src_buf, bytes); - -kunmap_local (dst_buf); -kunmap_local (src_buf); - -bio_advance_iter_single (src, src_iter, bytes); -bio_advance_iter_single (dst, dst_iter, bytes); - } -} -EXPORT_SYMBOL (bio_copy_data_iter); -/** * bio_copy_data - copy contents of data buffers from one bio to another * @src: source bio
@@ -1435,7 +1414,21 @@ void bio_copy_data(struct bio *dst, struct bio *src)struct bvec_iter src_iter = src->bi_iter;struct bvec_iter dst_iter = dst->bi_iter; -bio_copy_data_iter (dst, &dst_iter, src, &src_iter); +while (src_iter.bi_size && dst_iter.bi_size) { +struct bio_vec src_bv =bio_iter_iovec (src, src_iter); +struct bio_vec dst_bv =bio_iter_iovec (dst, dst_iter); +unsigned int bytes =min (src_bv.bv_len, dst_bv.bv_len); +void *src_buf =bvec_kmap_local (&src_bv); +void *dst_buf =bvec_kmap_local (&dst_bv); + +memcpy (dst_buf, src_buf, bytes); + +kunmap_local (dst_buf); +kunmap_local (src_buf); + +bio_advance_iter_single (src, &src_iter, bytes); +bio_advance_iter_single (dst, &dst_iter, bytes); + } }EXPORT_SYMBOL (bio_copy_data);
include/linux/bio.h +0 -2
@@ -475,8 +475,6 @@ void __bio_release_pages(struct bio *bio, bool mark_dirty);extern void bio_set_pages_dirty (struct bio *bio);extern void bio_check_pages_dirty (struct bio *bio); -extern void bio_copy_data_iter (struct bio *dst,struct bvec_iter *dst_iter, -struct bio *src,struct bvec_iter *src_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);
Signature · 1 line
2.35.1
Quoted 4 lines · Christoph Hellwig
With the pktcdvdv removal,
bio_copy_data_iteris unused now. Fold the logic intobio_copy_dataand remove the separate lower level function.
Applied, thanks!
[1/1] block: bio_copy_data_iter
commit: db1c7d77976775483a8ef240b4c705f113e13ea1
Best regards,
Signature · 1 line
Jens Axboe