diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-06 15:42:07 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-06 15:42:07 -0700 |
| commit | 26abd53d8e9e51bbeea0b4772e8dffece3eeff38 (patch) | |
| tree | d9dc6f45c9142e6a8f58f1aa8fc75e66f9edd0e9 /mm/filemap.c | |
| parent | ff89bf3bc0534aa03b5375aa906544d96911bad4 (diff) | |
| parent | 8f5bb0438b86d1a5393176ceeec2836fd469edf8 (diff) | |
auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'mm/filemap.c')
| -rw-r--r-- | mm/filemap.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index 1d33fec7bac6..4a2fee2cb62b 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -1968,6 +1968,7 @@ 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 */ @@ -1982,7 +1983,10 @@ 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. */ - fault_in_pages_readable(buf, bytes); + maxlen = cur_iov->iov_len - iov_base; + if (maxlen > bytes) + maxlen = bytes; + fault_in_pages_readable(buf, maxlen); page = __grab_cache_page(mapping,index,&cached_page,&lru_pvec); if (!page) { @@ -2024,6 +2028,8 @@ generic_file_buffered_write(struct kiocb *iocb, const struct iovec *iov, filemap_set_next_iovec(&cur_iov, &iov_base, status); buf = cur_iov->iov_base + iov_base; + } else { + iov_base += status; } } } |