1 files changed, 11 insertions, 7 deletions

diff --git a/mm/filemap.c b/mm/filemap.c
index 9c7334bafda8..d504d6e98886 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -2095,14 +2095,21 @@ generic_file_buffered_write(struct kiocb *iocb, const struct iovec *iov,
         do {
                 unsigned long index;
                 unsigned long offset;
-                unsigned long maxlen;
                 size_t copied;
 
                 offset = (pos & (PAGE_CACHE_SIZE -1)); /* Within page */
                 index = pos >> PAGE_CACHE_SHIFT;
                 bytes = PAGE_CACHE_SIZE - offset;
-                if (bytes > count)
-                        bytes = count;
+
+                /* Limit the size of the copy to the caller's write size */
+                bytes = min(bytes, count);
+
+                /*
+                 * Limit the size of the copy to that of the current segment,
+                 * because fault_in_pages_readable() doesn't know how to walk
+                 * segments.
+                 */
+                bytes = min(bytes, cur_iov->iov_len - iov_base);
 
                 /*
                  * Bring in the user page that we will copy from _first_.
@@ -2110,10 +2117,7 @@ generic_file_buffered_write(struct kiocb *iocb, const struct iovec *iov,
                  * same page as we're writing to, without it being marked
                  * up-to-date.
                  */
-                maxlen = cur_iov->iov_len - iov_base;
-                if (maxlen > bytes)
-                        maxlen = bytes;
-                fault_in_pages_readable(buf, maxlen);
+                fault_in_pages_readable(buf, bytes);
 
                 page = __grab_cache_page(mapping,index,&cached_page,&lru_pvec);
                 if (!page) {