diff options
| author |   Christoph Hellwig <hch@lst.de> | 2022-05-24 16:39:19 +0200 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2022-05-27 20:35:55 -0600 |
| commit | 403d50341cce6b5481a92eb481e6df60b1f49b55 (patch) | |
| tree | fb17e0c36191fbf240e1ea1d07cd4dde4fa6876f /block/bio.c | |
| parent | blk-iolatency: Fix inflight count imbalances and IO hangs on offline (diff) | |
| download | linux-dev-403d50341cce6b5481a92eb481e6df60b1f49b55.tar.xz linux-dev-403d50341cce6b5481a92eb481e6df60b1f49b55.zip | |
block: take destination bvec offsets into account in bio_copy_data_iter
Appartly bcache can copy into bios that do not just contain fresh
pages but can have offsets into the bio_vecs. Restore support for tht
in bio_copy_data_iter.
Fixes: f8b679a070c5 ("block: rewrite bio_copy_data_iter to use bvec_kmap_local and memcpy_to_bvec")
Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20220524143919.1155501-1-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/bio.c')
| -rw-r--r-- | block/bio.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/block/bio.c b/block/bio.c index a3893d80dccc..8a1b3d650a7f 100644 --- a/block/bio.c +++ b/block/bio.c @@ -1366,10 +1366,12 @@ void bio_copy_data_iter(struct bio *dst, struct bvec_iter *dst_iter, 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; + void *src_buf = bvec_kmap_local(&src_bv); + void *dst_buf = bvec_kmap_local(&dst_bv); - src_buf = bvec_kmap_local(&src_bv); - memcpy_to_bvec(&dst_bv, src_buf); + memcpy(dst_buf, src_buf, bytes); + + kunmap_local(dst_buf); kunmap_local(src_buf); bio_advance_iter_single(src, src_iter, bytes); |