Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux.git] / block / bio.c

diff --git a/block/bio.c b/block/bio.c
index daa1c1ae72cd9926a3580bb140b360c9444fe28b..ce797d73bb436afafdc0434d708426813836ea95 100644 (file)
--- a/block/bio.c
+++ b/block/bio.c
@@ -896,6 +896,7 @@ static int __bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter)
        unsigned short entries_left = bio->bi_max_vecs - bio->bi_vcnt;
        struct bio_vec *bv = bio->bi_io_vec + bio->bi_vcnt;
        struct page **pages = (struct page **)bv;
+       bool same_page = false;
        ssize_t size, left;
        unsigned len, i;
        size_t offset;
@@ -916,8 +917,15 @@ static int __bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter)
                struct page *page = pages[i];
 
                len = min_t(size_t, PAGE_SIZE - offset, left);
-               if (WARN_ON_ONCE(bio_add_page(bio, page, len, offset) != len))
-                       return -EINVAL;
+
+               if (__bio_try_merge_page(bio, page, len, offset, &same_page)) {
+                       if (same_page)
+                               put_page(page);
+               } else {
+                       if (WARN_ON_ONCE(bio_full(bio)))
+                                return -EINVAL;
+                       __bio_add_page(bio, page, len, offset);
+               }
                offset = 0;
        }