Commit 4113b88a authored by Ming Lei's avatar Ming Lei Committed by Jens Axboe

bcache: debug: avoid accessing .bi_io_vec directly

Instead we use standard iterator way to do that.
Signed-off-by: default avatarMing Lei <tom.leiming@gmail.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 84c85906
...@@ -107,8 +107,8 @@ void bch_data_verify(struct cached_dev *dc, struct bio *bio) ...@@ -107,8 +107,8 @@ void bch_data_verify(struct cached_dev *dc, struct bio *bio)
{ {
char name[BDEVNAME_SIZE]; char name[BDEVNAME_SIZE];
struct bio *check; struct bio *check;
struct bio_vec bv; struct bio_vec bv, cbv;
struct bvec_iter iter; struct bvec_iter iter, citer = { 0 };
check = bio_clone(bio, GFP_NOIO); check = bio_clone(bio, GFP_NOIO);
if (!check) if (!check)
...@@ -120,9 +120,13 @@ void bch_data_verify(struct cached_dev *dc, struct bio *bio) ...@@ -120,9 +120,13 @@ void bch_data_verify(struct cached_dev *dc, struct bio *bio)
submit_bio_wait(check); submit_bio_wait(check);
citer.bi_size = UINT_MAX;
bio_for_each_segment(bv, bio, iter) { bio_for_each_segment(bv, bio, iter) {
void *p1 = kmap_atomic(bv.bv_page); void *p1 = kmap_atomic(bv.bv_page);
void *p2 = page_address(check->bi_io_vec[iter.bi_idx].bv_page); void *p2;
cbv = bio_iter_iovec(check, citer);
p2 = page_address(cbv.bv_page);
cache_set_err_on(memcmp(p1 + bv.bv_offset, cache_set_err_on(memcmp(p1 + bv.bv_offset,
p2 + bv.bv_offset, p2 + bv.bv_offset,
...@@ -133,6 +137,7 @@ void bch_data_verify(struct cached_dev *dc, struct bio *bio) ...@@ -133,6 +137,7 @@ void bch_data_verify(struct cached_dev *dc, struct bio *bio)
(uint64_t) bio->bi_iter.bi_sector); (uint64_t) bio->bi_iter.bi_sector);
kunmap_atomic(p1); kunmap_atomic(p1);
bio_advance_iter(check, &citer, bv.bv_len);
} }
bio_free_pages(check); bio_free_pages(check);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment