Block core regression fix for 3.18
Hi Linus,
Single fix for a regression introduced in this development cycle, where dm on top of dif/dix is broken. From Darrick Wong.
Please pull!
git://git.kernel.dk/linux-block.git for-linus
----------------------------------------------------------------
Darrick J. Wong (1):
block: fix regression where bio_integrity_process uses wrong bio_vec iterator
block/bio-integrity.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
block/bio-integrity.c +7 -6
@@ -216,9 +216,10 @@ static int bio_integrity_process(struct bio *bio, {struct blk_integrity *bi =bdev_get_integrity (bio->bi_bdev);struct blk_integrity_iter iter; -struct bio_vec *bv; +struct bvec_iter bviter; +struct bio_vec bv;struct bio_integrity_payload *bip =bio_integrity (bio); -unsigned int i, ret =0 ; +unsigned int ret =0 ;void *prot_buf =page_address (bip->bip_vec->bv_page) + bip->bip_vec->bv_offset;
@@ -227,11 +228,11 @@ static int bio_integrity_process(struct bio *bio, iter.seed =bip_get_seed (bip); iter.prot_buf = prot_buf; -bio_for_each_segment_all (bv, bio, i) { -void *kaddr =kmap_atomic (bv->bv_page); +bio_for_each_segment (bv, bio, bviter) { +void *kaddr =kmap_atomic (bv.bv_page); - iter.data_buf = kaddr + bv->bv_offset; - iter.data_size = bv->bv_len; + iter.data_buf = kaddr + bv.bv_offset; + iter.data_size = bv.bv_len; ret =proc_fn (&iter);if (ret) {
Signature · 1 line
Jens Axboe