提交 0bc69973 编写于 作者: M Martin K. Petersen 提交者: Jens Axboe

block: Fix integrity verification

Commit bf36f9cf caused a regression by effectively reverting Nic's
fix from 5837c80e that ensures we traverse the full bio_vec list
upon completion.
Signed-off-by: NMartin K. Petersen <martin.petersen@oracle.com>
Cc: Nicholas Bellinger <nab@linux-iscsi.org>
Cc: Gu Zheng <guz.fnst@cn.fujitsu.com>
Signed-off-by: NJens Axboe <axboe@fb.com>
上级 b7aa84d9
...@@ -309,10 +309,9 @@ static int bio_integrity_generate_verify(struct bio *bio, int operate) ...@@ -309,10 +309,9 @@ static int bio_integrity_generate_verify(struct bio *bio, int operate)
{ {
struct blk_integrity *bi = bdev_get_integrity(bio->bi_bdev); struct blk_integrity *bi = bdev_get_integrity(bio->bi_bdev);
struct blk_integrity_exchg bix; struct blk_integrity_exchg bix;
struct bio_vec bv; struct bio_vec *bv;
struct bvec_iter iter;
sector_t sector; sector_t sector;
unsigned int sectors, ret = 0; unsigned int sectors, ret = 0, i;
void *prot_buf = bio->bi_integrity->bip_buf; void *prot_buf = bio->bi_integrity->bip_buf;
if (operate) if (operate)
...@@ -323,16 +322,16 @@ static int bio_integrity_generate_verify(struct bio *bio, int operate) ...@@ -323,16 +322,16 @@ static int bio_integrity_generate_verify(struct bio *bio, int operate)
bix.disk_name = bio->bi_bdev->bd_disk->disk_name; bix.disk_name = bio->bi_bdev->bd_disk->disk_name;
bix.sector_size = bi->sector_size; bix.sector_size = bi->sector_size;
bio_for_each_segment(bv, bio, iter) { bio_for_each_segment_all(bv, bio, i) {
void *kaddr = kmap_atomic(bv.bv_page); void *kaddr = kmap_atomic(bv->bv_page);
bix.data_buf = kaddr + bv.bv_offset; bix.data_buf = kaddr + bv->bv_offset;
bix.data_size = bv.bv_len; bix.data_size = bv->bv_len;
bix.prot_buf = prot_buf; bix.prot_buf = prot_buf;
bix.sector = sector; bix.sector = sector;
if (operate) { if (operate)
bi->generate_fn(&bix); bi->generate_fn(&bix);
} else { else {
ret = bi->verify_fn(&bix); ret = bi->verify_fn(&bix);
if (ret) { if (ret) {
kunmap_atomic(kaddr); kunmap_atomic(kaddr);
...@@ -340,7 +339,7 @@ static int bio_integrity_generate_verify(struct bio *bio, int operate) ...@@ -340,7 +339,7 @@ static int bio_integrity_generate_verify(struct bio *bio, int operate)
} }
} }
sectors = bv.bv_len / bi->sector_size; sectors = bv->bv_len / bi->sector_size;
sector += sectors; sector += sectors;
prot_buf += sectors * bi->tuple_size; prot_buf += sectors * bi->tuple_size;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册