block: merge BIOVEC_SEG_BOUNDARY into biovec_phys_mergeable

These two checks should always be performed together, so merge them into
a single helper.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

1 files changed, 1 insertions, 3 deletions

diff --git a/block/bio.c b/block/bio.c
index c254e5aa331f..e9f92b50724d 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -731,9 +731,7 @@ int bio_add_pc_page(struct request_queue *q, struct bio *bio, struct page
         }
 
         /* If we may be able to merge these biovecs, force a recount */
-        if (bio->bi_vcnt > 1 &&
-            biovec_phys_mergeable(bvec - 1, bvec) &&
-            BIOVEC_SEG_BOUNDARY(q, bvec - 1, bvec))
+        if (bio->bi_vcnt > 1 && biovec_phys_mergeable(q, bvec - 1, bvec))
                 bio_clear_flag(bio, BIO_SEG_VALID);
 
  done: