1 files changed, 2 insertions, 11 deletions

diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c
index c99b46354859..ef42bb2b12b6 100644
--- a/block/ll_rw_blk.c
+++ b/block/ll_rw_blk.c
@@ -527,8 +527,6 @@ int blk_do_ordered(request_queue_t *q, struct request **rqp)
 static int flush_dry_bio_endio(struct bio *bio, unsigned int bytes, int error)
 {
         request_queue_t *q = bio->bi_private;
-        struct bio_vec *bvec;
-        int i;
 
         /*
          * This is dry run, restore bio_sector and size.  We'll finish
@@ -540,13 +538,6 @@ static int flush_dry_bio_endio(struct bio *bio, unsigned int bytes, int error)
         if (bio->bi_size)
                 return 1;
 
-        /* Rewind bvec's */
-        bio->bi_idx = 0;
-        bio_for_each_segment(bvec, bio, i) {
-                bvec->bv_len += bvec->bv_offset;
-                bvec->bv_offset = 0;
-        }
-
         /* Reset bio */
         set_bit(BIO_UPTODATE, &bio->bi_flags);
         bio->bi_size = q->bi_size;
@@ -1304,9 +1295,9 @@ static int blk_hw_contig_segment(request_queue_t *q, struct bio *bio,
         if (unlikely(!bio_flagged(nxt, BIO_SEG_VALID)))
                 blk_recount_segments(q, nxt);
         if (!BIOVEC_VIRT_MERGEABLE(__BVEC_END(bio), __BVEC_START(nxt)) ||
-            BIOVEC_VIRT_OVERSIZE(bio->bi_hw_front_size + bio->bi_hw_back_size))
+            BIOVEC_VIRT_OVERSIZE(bio->bi_hw_back_size + nxt->bi_hw_front_size))
                 return 0;
-        if (bio->bi_size + nxt->bi_size > q->max_segment_size)
+        if (bio->bi_hw_back_size + nxt->bi_hw_front_size > q->max_segment_size)
                 return 0;
 
         return 1;