Merge commit 'jwb/next' into next

[deliverable/linux.git] / fs / bio.c

diff --git a/fs/bio.c b/fs/bio.c
index 7bbc98f0eda151d27e22a720998a5f8480ce78f6..98711647ece49548a94409a99ce4b680ee085ca1 100644 (file)
--- a/fs/bio.c
+++ b/fs/bio.c
@@ -817,6 +817,9 @@ struct bio *bio_copy_user_iov(struct request_queue *q,
                len += iov[i].iov_len;
        }
 
+       if (offset)
+               nr_pages++;
+
        bmd = bio_alloc_map_data(nr_pages, iov_count, gfp_mask);
        if (!bmd)
                return ERR_PTR(-ENOMEM);