diff options
| author | Ming Lei | 2016-11-11 13:05:33 +0100 |
|---|---|---|
| committer | Jens Axboe | 2016-11-22 16:57:55 +0100 |
| commit | 4113b88a658772e09b3fe475a5a4b7c9a9cdc04b (patch) | |
| tree | 22acc500d1bce0e7b9e8afa3c6f34cee7de010dd /drivers/md/bcache/debug.c | |
| parent | target: avoid accessing .bi_vcnt directly (diff) | |
| download | kernel-qcow2-linux-4113b88a658772e09b3fe475a5a4b7c9a9cdc04b.tar.gz kernel-qcow2-linux-4113b88a658772e09b3fe475a5a4b7c9a9cdc04b.tar.xz kernel-qcow2-linux-4113b88a658772e09b3fe475a5a4b7c9a9cdc04b.zip | |
bcache: debug: avoid accessing .bi_io_vec directly
Instead we use standard iterator way to do that.
Signed-off-by: Ming Lei <tom.leiming@gmail.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/md/bcache/debug.c')
| -rw-r--r-- | drivers/md/bcache/debug.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/md/bcache/debug.c b/drivers/md/bcache/debug.c index 1c9130ae0073..06f55056aaae 100644 --- a/drivers/md/bcache/debug.c +++ b/drivers/md/bcache/debug.c @@ -107,8 +107,8 @@ void bch_data_verify(struct cached_dev *dc, struct bio *bio) { char name[BDEVNAME_SIZE]; struct bio *check; - struct bio_vec bv; - struct bvec_iter iter; + struct bio_vec bv, cbv; + struct bvec_iter iter, citer = { 0 }; check = bio_clone(bio, GFP_NOIO); if (!check) @@ -120,9 +120,13 @@ void bch_data_verify(struct cached_dev *dc, struct bio *bio) submit_bio_wait(check); + citer.bi_size = UINT_MAX; bio_for_each_segment(bv, bio, iter) { 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, p2 + bv.bv_offset, @@ -133,6 +137,7 @@ void bch_data_verify(struct cached_dev *dc, struct bio *bio) (uint64_t) bio->bi_iter.bi_sector); kunmap_atomic(p1); + bio_advance_iter(check, &citer, bv.bv_len); } bio_free_pages(check); |