block: don't pass a bio to bio_try_merge_hw_seg

[linux-2.6-microblaze.git] / block / bio.c

diff --git a/block/bio.c b/block/bio.c
index 23b7a00..c92dda9 100644 (file)
--- a/block/bio.c
+++ b/block/bio.c
@@ -934,11 +934,10 @@ static bool bvec_try_merge_page(struct bio_vec *bv, struct page *page,
  * size limit.  This is not for normal read/write bios, but for passthrough
  * or Zone Append operations that we can't split.
  */
-static bool bio_try_merge_hw_seg(struct request_queue *q, struct bio *bio,
-                                struct page *page, unsigned len,
-                                unsigned offset, bool *same_page)
+static bool bvec_try_merge_hw_page(struct request_queue *q, struct bio_vec *bv,
+               struct page *page, unsigned len, unsigned offset,
+               bool *same_page)
 {
-       struct bio_vec *bv = &bio->bi_io_vec[bio->bi_vcnt - 1];
        unsigned long mask = queue_segment_boundary(q);
        phys_addr_t addr1 = page_to_phys(bv->bv_page) + bv->bv_offset;
        phys_addr_t addr2 = page_to_phys(page) + offset + len - 1;
@@ -967,8 +966,6 @@ int bio_add_hw_page(struct request_queue *q, struct bio *bio,
                struct page *page, unsigned int len, unsigned int offset,
                unsigned int max_sectors, bool *same_page)
 {
-       struct bio_vec *bvec;
-
        if (WARN_ON_ONCE(bio_flagged(bio, BIO_CLONED)))
                return 0;
 
@@ -976,7 +973,9 @@ int bio_add_hw_page(struct request_queue *q, struct bio *bio,
                return 0;
 
        if (bio->bi_vcnt > 0) {
-               if (bio_try_merge_hw_seg(q, bio, page, len, offset,
+               struct bio_vec *bv = &bio->bi_io_vec[bio->bi_vcnt - 1];
+
+               if (bvec_try_merge_hw_page(q, bv, page, len, offset,
                                same_page)) {
                        bio->bi_iter.bi_size += len;
                        return len;
@@ -990,8 +989,7 @@ int bio_add_hw_page(struct request_queue *q, struct bio *bio,
                 * If the queue doesn't support SG gaps and adding this segment
                 * would create a gap, disallow it.
                 */
-               bvec = &bio->bi_io_vec[bio->bi_vcnt - 1];
-               if (bvec_gap_to_prev(&q->limits, bvec, offset))
+               if (bvec_gap_to_prev(&q->limits, bv, offset))
                        return 0;
        }