block: Abstract out bvec iterator

[linux-2.6-block.git] / fs / bio-integrity.c

diff --git a/fs/bio-integrity.c b/fs/bio-integrity.c
index fc60b31453eefbbdcc234c7df78c5504da655980..08e3d1388c65b77e5febf701ee73b7219ef2d5d7 100644 (file)
--- a/fs/bio-integrity.c
+++ b/fs/bio-integrity.c
@@ -215,9 +215,9 @@ unsigned int bio_integrity_tag_size(struct bio *bio)
 {
        struct blk_integrity *bi = bdev_get_integrity(bio->bi_bdev);
 
-       BUG_ON(bio->bi_size == 0);
+       BUG_ON(bio->bi_iter.bi_size == 0);
 
-       return bi->tag_size * (bio->bi_size / bi->sector_size);
+       return bi->tag_size * (bio->bi_iter.bi_size / bi->sector_size);
 }
 EXPORT_SYMBOL(bio_integrity_tag_size);
 
@@ -300,7 +300,7 @@ static void bio_integrity_generate(struct bio *bio)
        struct blk_integrity *bi = bdev_get_integrity(bio->bi_bdev);
        struct blk_integrity_exchg bix;
        struct bio_vec *bv;
-       sector_t sector = bio->bi_sector;
+       sector_t sector = bio->bi_iter.bi_sector;
        unsigned int i, sectors, total;
        void *prot_buf = bio->bi_integrity->bip_buf;
 
@@ -387,7 +387,7 @@ int bio_integrity_prep(struct bio *bio)
        bip->bip_owns_buf = 1;
        bip->bip_buf = buf;
        bip->bip_size = len;
-       bip->bip_sector = bio->bi_sector;
+       bip->bip_sector = bio->bi_iter.bi_sector;
 
        /* Map it */
        offset = offset_in_page(buf);