summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorNick Piggin <npiggin@suse.de>2007-03-27 08:55:39 +0200
committerJens Axboe <jens.axboe@oracle.com>2007-03-27 08:55:39 +0200
commit08c72591636829d40bd695d43ec6d2a8191b668b (patch)
treeded334291dfd9b3e72727fd4d71c8036bfd911f9 /fs
parent485ddb4b9741bafb70b22e5c1f9b4f37dc3e85bd (diff)
downloadlinux-3.10-08c72591636829d40bd695d43ec6d2a8191b668b.tar.gz
linux-3.10-08c72591636829d40bd695d43ec6d2a8191b668b.tar.bz2
linux-3.10-08c72591636829d40bd695d43ec6d2a8191b668b.zip
2/2 splice: dont readpage
Splice does not need to readpage to bring the page uptodate before writing to it, because prepare_write will take care of that for us. Splice is also wrong to SetPageUptodate before the page is actually uptodate. This results in the old uninitialised memory leak. This gets fixed as a matter of course when removing the readpage logic. Signed-off-by: Nick Piggin <npiggin@suse.de> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/splice.c30
1 files changed, 0 insertions, 30 deletions
diff --git a/fs/splice.c b/fs/splice.c
index badc78ff124..ae50208e3e6 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -593,36 +593,6 @@ find_page:
goto out;
}
- /*
- * We get here with the page locked. If the page is also
- * uptodate, we don't need to do more. If it isn't, we
- * may need to bring it in if we are not going to overwrite
- * the full page.
- */
- if (!PageUptodate(page)) {
- if (this_len < PAGE_CACHE_SIZE) {
- ret = mapping->a_ops->readpage(file, page);
- if (unlikely(ret))
- goto out;
-
- lock_page(page);
-
- if (!PageUptodate(page)) {
- /*
- * Page got invalidated, repeat.
- */
- if (!page->mapping) {
- unlock_page(page);
- page_cache_release(page);
- goto find_page;
- }
- ret = -EIO;
- goto out;
- }
- } else
- SetPageUptodate(page);
- }
-
ret = mapping->a_ops->prepare_write(file, page, offset, offset+this_len);
if (unlikely(ret)) {
loff_t isize = i_size_read(mapping->host);