Merge branch 'work.mount' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[uclinux-h8/linux.git] / block / blk-merge.c

diff --git a/block/blk-merge.c b/block/blk-merge.c
index bed0659..22467f4 100644 (file)
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -277,6 +277,9 @@ static struct bio *blk_bio_segment_split(struct request_queue *q,
                        bvprvp = &bvprv;
                        sectors += bv.bv_len >> 9;
 
+                       if (nsegs == 1 && seg_size > front_seg_size)
+                               front_seg_size = seg_size;
+
                        continue;
                }
 new_segment:
@@ -286,10 +289,16 @@ new_segment:
                bvprv = bv;
                bvprvp = &bvprv;
 
-               if (bvec_split_segs(q, &bv, &nsegs, &seg_size,
-                                   &front_seg_size, &sectors))
+               if (bv.bv_offset + bv.bv_len <= PAGE_SIZE) {
+                       nsegs++;
+                       seg_size = bv.bv_len;
+                       sectors += bv.bv_len >> 9;
+                       if (nsegs == 1 && seg_size > front_seg_size)
+                               front_seg_size = seg_size;
+               } else if (bvec_split_segs(q, &bv, &nsegs, &seg_size,
+                                   &front_seg_size, &sectors)) {
                        goto split;
-
+               }
        }
 
        do_split = false;
@@ -363,13 +372,15 @@ static unsigned int __blk_recalc_rq_segments(struct request_queue *q,
        struct bio_vec bv, bvprv = { NULL };
        int prev = 0;
        unsigned int seg_size, nr_phys_segs;
-       unsigned front_seg_size = bio->bi_seg_front_size;
+       unsigned front_seg_size;
        struct bio *fbio, *bbio;
        struct bvec_iter iter;
 
        if (!bio)
                return 0;
 
+       front_seg_size = bio->bi_seg_front_size;
+
        switch (bio_op(bio)) {
        case REQ_OP_DISCARD:
        case REQ_OP_SECURE_ERASE:
@@ -393,6 +404,11 @@ static unsigned int __blk_recalc_rq_segments(struct request_queue *q,
 
                                seg_size += bv.bv_len;
                                bvprv = bv;
+
+                               if (nr_phys_segs == 1 && seg_size >
+                                               front_seg_size)
+                                       front_seg_size = seg_size;
+
                                continue;
                        }
 new_segment:
@@ -445,7 +461,7 @@ static int blk_phys_contig_segment(struct request_queue *q, struct bio *bio,
        return biovec_phys_mergeable(q, &end_bv, &nxt_bv);
 }
 
-static struct scatterlist *blk_next_sg(struct scatterlist **sg,
+static inline struct scatterlist *blk_next_sg(struct scatterlist **sg,
                struct scatterlist *sglist)
 {
        if (!*sg)
@@ -481,7 +497,7 @@ static unsigned blk_bvec_map_sg(struct request_queue *q,
 
                offset = (total + bvec->bv_offset) % PAGE_SIZE;
                idx = (total + bvec->bv_offset) / PAGE_SIZE;
-               pg = nth_page(bvec->bv_page, idx);
+               pg = bvec_nth_page(bvec->bv_page, idx);
 
                sg_set_page(*sg, pg, seg_size, offset);
 
@@ -510,7 +526,12 @@ __blk_segment_map_sg(struct request_queue *q, struct bio_vec *bvec,
                (*sg)->length += nbytes;
        } else {
 new_segment:
-               (*nsegs) += blk_bvec_map_sg(q, bvec, sglist, sg);
+               if (bvec->bv_offset + bvec->bv_len <= PAGE_SIZE) {
+                       *sg = blk_next_sg(sg, sglist);
+                       sg_set_page(*sg, bvec->bv_page, nbytes, bvec->bv_offset);
+                       (*nsegs) += 1;
+               } else
+                       (*nsegs) += blk_bvec_map_sg(q, bvec, sglist, sg);
        }
        *bvprv = *bvec;
 }