|
@@ -447,20 +447,21 @@ static int bio_integrity_verify(struct bio *bio)
|
|
|
{
|
|
|
struct blk_integrity *bi = bdev_get_integrity(bio->bi_bdev);
|
|
|
struct blk_integrity_exchg bix;
|
|
|
- struct bio_vec bv;
|
|
|
- struct bvec_iter iter;
|
|
|
+ struct bio_vec *bv;
|
|
|
sector_t sector = bio->bi_integrity->bip_iter.bi_sector;
|
|
|
unsigned int sectors, total, ret;
|
|
|
void *prot_buf = bio->bi_integrity->bip_buf;
|
|
|
+ int i;
|
|
|
|
|
|
ret = total = 0;
|
|
|
bix.disk_name = bio->bi_bdev->bd_disk->disk_name;
|
|
|
bix.sector_size = bi->sector_size;
|
|
|
|
|
|
- bio_for_each_segment(bv, bio, iter) {
|
|
|
- void *kaddr = kmap_atomic(bv.bv_page);
|
|
|
- bix.data_buf = kaddr + bv.bv_offset;
|
|
|
- bix.data_size = bv.bv_len;
|
|
|
+ bio_for_each_segment_all(bv, bio, i) {
|
|
|
+ void *kaddr = kmap_atomic(bv->bv_page);
|
|
|
+
|
|
|
+ bix.data_buf = kaddr + bv->bv_offset;
|
|
|
+ bix.data_size = bv->bv_len;
|
|
|
bix.prot_buf = prot_buf;
|
|
|
bix.sector = sector;
|
|
|
|
|
@@ -471,7 +472,7 @@ static int bio_integrity_verify(struct bio *bio)
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
- sectors = bv.bv_len / bi->sector_size;
|
|
|
+ sectors = bv->bv_len / bi->sector_size;
|
|
|
sector += sectors;
|
|
|
prot_buf += sectors * bi->tuple_size;
|
|
|
total += sectors * bi->tuple_size;
|