[PATCH] splice: switch to using page_cache_readahead()

Avoids doing useless work, when the file is fully cached.

Signed-off-by: Jens Axboe <axboe@suse.de>

diff --git a/fs/splice.c b/fs/splice.c
index 447ebc0a37f342eea7075ee18abb2f4a7a40714e..dc205f6430901208599f3e88e2ae6321010f505c 100644 (file)
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -299,8 +299,8 @@ __generic_file_splice_read(struct file *in, loff_t *ppos,
         * read-ahead if this is a non-zero offset (we are likely doing small
         * chunk splice and the page is already there) for a single page.
         */
-       if (!loff || spd.nr_pages > 1)
-               do_page_cache_readahead(mapping, in, index, spd.nr_pages);
+       if (!loff || nr_pages > 1)
+               page_cache_readahead(mapping, &in->f_ra, in, index, nr_pages);
 
        /*
         * Now fill in the holes: