summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Axboe <axboe@suse.de>2006-04-27 08:44:27 +0200
committerJens Axboe <axboe@nelson.home.kernel.dk>2006-04-27 08:59:48 +0200
commiteb645a24de82496434cc81171d7f350edb327399 (patch)
tree1cb104eb1123d42b001290c0480a9ad55af07051
parent2be4d50295e2b6f62c07b614e1b103e280dddb84 (diff)
downloadlinux-eb645a24de82496434cc81171d7f350edb327399.tar.bz2
[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>
-rw-r--r--fs/splice.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/splice.c b/fs/splice.c
index 447ebc0a37f3..dc205f643090 100644
--- 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: