block: Kill bio_iovec_idx(), __bio_iovec()

bio_iovec_idx() and __bio_iovec() don't have any valid uses anymore -
previous users have been converted to bio_iovec_iter() or other methods.

__BVEC_END() has to go too - the bvec array can't be used directly for
the last biovec because we might only be using the first portion of it,
we have to iterate over the bvec array with bio_for_each_segment() which
checks against the current value of bi_iter.bi_size.

Signed-off-by: Kent Overstreet <kmo@daterainc.com>
Cc: Jens Axboe <axboe@kernel.dk>

1 files changed, 11 insertions, 2 deletions

diff --git a/block/blk-merge.c b/block/blk-merge.c
index a1ead9049ed6..05c17be0eea4 100644
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -86,6 +86,9 @@ EXPORT_SYMBOL(blk_recount_segments);
 static int blk_phys_contig_segment(struct request_queue *q, struct bio *bio,
                                    struct bio *nxt)
 {
+        struct bio_vec end_bv, nxt_bv;
+        struct bvec_iter iter;
+
         if (!blk_queue_cluster(q))
                 return 0;
 
@@ -96,14 +99,20 @@ static int blk_phys_contig_segment(struct request_queue *q, struct bio *bio,
         if (!bio_has_data(bio))
                 return 1;
 
-        if (!BIOVEC_PHYS_MERGEABLE(__BVEC_END(bio), __BVEC_START(nxt)))
+        bio_for_each_segment(end_bv, bio, iter)
+                if (end_bv.bv_len == iter.bi_size)
+                        break;
+
+        nxt_bv = bio_iovec(nxt);
+
+        if (!BIOVEC_PHYS_MERGEABLE(&end_bv, &nxt_bv))
                 return 0;
 
         /*
          * bio and nxt are contiguous in memory; check if the queue allows
          * these two to be merged into one
          */
-        if (BIO_SEG_BOUNDARY(q, bio, nxt))
+        if (BIOVEC_SEG_BOUNDARY(q, &end_bv, &nxt_bv))
                 return 1;
 
         return 0;