bio-modify-__bio_add_page-to-accept-pages-that-dont-start-a-new-segment-v3

[karo-tx-linux.git] / block / bio.c

diff --git a/block/bio.c b/block/bio.c
index 88c551acae1664b3f1571c2b656110740c2bd24e..ba479c7e5c2150e490751ae3dd5a03eae6dec682 100644 (file)
--- a/block/bio.c
+++ b/block/bio.c
@@ -702,7 +702,6 @@ static int __bio_add_page(struct request_queue *q, struct bio *bio, struct page
                          unsigned int max_sectors)
 {
        int retried_segments = 0;
-       unsigned int bi_phys_segments_orig;
        struct bio_vec *bvec;
 
        /*
@@ -762,7 +761,6 @@ static int __bio_add_page(struct request_queue *q, struct bio *bio, struct page
        bvec->bv_len = len;
        bvec->bv_offset = offset;
        bio->bi_vcnt++;
-       bi_phys_segments_orig = bio->bi_phys_segments;
        bio->bi_phys_segments++;
 
        /*
@@ -813,8 +811,7 @@ static int __bio_add_page(struct request_queue *q, struct bio *bio, struct page
        bvec->bv_len = 0;
        bvec->bv_offset = 0;
        bio->bi_vcnt--;
-       bio->bi_phys_segments = bi_phys_segments_orig;
-
+       blk_recount_segments(q, bio);
        return 0;
 }