diff options
| author | Martin K. Petersen | 2014-04-09 04:43:44 +0200 |
|---|---|---|
| committer | Jens Axboe | 2014-04-09 16:00:04 +0200 |
| commit | 0bc69973066d62f70ce60bd6762b5cb75a699159 (patch) | |
| tree | 7ad054c0b719fe45e3243383422b8666d79700b0 /fs/bio-integrity.c | |
| parent | block: Fix for_each_bvec() (diff) | |
| download | kernel-qcow2-linux-0bc69973066d62f70ce60bd6762b5cb75a699159.tar.gz kernel-qcow2-linux-0bc69973066d62f70ce60bd6762b5cb75a699159.tar.xz kernel-qcow2-linux-0bc69973066d62f70ce60bd6762b5cb75a699159.zip | |
block: Fix integrity verification
Commit bf36f9cfa6d3d caused a regression by effectively reverting Nic's
fix from 5837c80e870b that ensures we traverse the full bio_vec list
upon completion.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Cc: Nicholas Bellinger <nab@linux-iscsi.org>
Cc: Gu Zheng <guz.fnst@cn.fujitsu.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'fs/bio-integrity.c')
| -rw-r--r-- | fs/bio-integrity.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/fs/bio-integrity.c b/fs/bio-integrity.c index 29696b78d1f4..b355b98dbf1b 100644 --- a/fs/bio-integrity.c +++ b/fs/bio-integrity.c @@ -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_exchg bix; - struct bio_vec bv; - struct bvec_iter iter; + struct bio_vec *bv; sector_t sector; - unsigned int sectors, ret = 0; + unsigned int sectors, ret = 0, i; void *prot_buf = bio->bi_integrity->bip_buf; if (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.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; - if (operate) { + if (operate) bi->generate_fn(&bix); - } else { + else { ret = bi->verify_fn(&bix); if (ret) { kunmap_atomic(kaddr); @@ -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; prot_buf += sectors * bi->tuple_size; |