bio-integrity: Convert to bvec_iter

The bio integrity is also stored in a bvec array, so if we use the bvec
iter code we just added, the integrity code won't need to implement its
own iteration stuff (bio_integrity_mark_head(), bio_integrity_mark_tail())

Signed-off-by: Kent Overstreet <kmo@daterainc.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: "James E.J. Bottomley" <JBottomley@parallels.com>

1 files changed, 7 insertions, 12 deletions

diff --git a/include/linux/bio.h b/include/linux/bio.h
index 04e592e74c92..930cb73c894b 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -244,16 +244,15 @@ static inline void bio_advance_iter(struct bio *bio, struct bvec_iter *iter,
 struct bio_integrity_payload {
         struct bio              *bip_bio;       /* parent bio */
 
-        sector_t                bip_sector;     /* virtual start sector */
+        struct bvec_iter        bip_iter;
 
+        /* kill - should just use bip_vec */
         void                    *bip_buf;       /* generated integrity data */
-        bio_end_io_t            *bip_end_io;    /* saved I/O completion fn */
 
-        unsigned int            bip_size;
+        bio_end_io_t            *bip_end_io;    /* saved I/O completion fn */
 
         unsigned short          bip_slab;       /* slab the bip came from */
         unsigned short          bip_vcnt;       /* # of integrity bio_vecs */
-        unsigned short          bip_idx;        /* current bip_vec index */
         unsigned                bip_owns_buf:1; /* should free bip_buf */
 
         struct work_struct      bip_work;       /* I/O completion */
@@ -626,16 +625,12 @@ struct biovec_slab {
 
 #if defined(CONFIG_BLK_DEV_INTEGRITY)
 
-#define bip_vec_idx(bip, idx)   (&(bip->bip_vec[(idx)]))
-#define bip_vec(bip)            bip_vec_idx(bip, 0)
 
-#define __bip_for_each_vec(bvl, bip, i, start_idx)                      \
-        for (bvl = bip_vec_idx((bip), (start_idx)), i = (start_idx);    \
-             i < (bip)->bip_vcnt;                                       \
-             bvl++, i++)
 
-#define bip_for_each_vec(bvl, bip, i)                                   \
-        __bip_for_each_vec(bvl, bip, i, (bip)->bip_idx)
+#define bip_vec_idx(bip, idx)   (&(bip->bip_vec[(idx)]))
+
+#define bip_for_each_vec(bvl, bip, iter)                                \
+        for_each_bvec(bvl, (bip)->bip_vec, iter, (bip)->bip_iter)
 
 #define bio_for_each_integrity_vec(_bvl, _bio, _iter)                   \
         for_each_bio(_bio)                                              \