Commit 86aa5ac5 authored by Jens Axboe's avatar Jens Axboe

[PATCH] splice: always call into page_cache_readahead()

Don't try to guess what the read-ahead logic will do, allow it
to make its own decisions.
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 9ae9d68c
...@@ -289,11 +289,9 @@ __generic_file_splice_read(struct file *in, loff_t *ppos, ...@@ -289,11 +289,9 @@ __generic_file_splice_read(struct file *in, loff_t *ppos,
nr_pages = PIPE_BUFFERS; nr_pages = PIPE_BUFFERS;
/* /*
* Initiate read-ahead on this page range. however, don't call into * Don't try to 2nd guess the read-ahead logic, call into
* read-ahead if this is a non-zero offset (we are likely doing small * page_cache_readahead() like the page cache reads would do.
* chunk splice and the page is already there) for a single page.
*/ */
if (!loff || nr_pages > 1)
page_cache_readahead(mapping, &in->f_ra, in, index, nr_pages); page_cache_readahead(mapping, &in->f_ra, in, index, nr_pages);
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment