diff options
| author | Jens Axboe <axboe@suse.de> | 2006-04-10 09:05:04 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@suse.de> | 2006-04-10 09:05:04 +0200 |
| commit | 0b749ce3802428007a37870eb51ba3c0bdf90857 (patch) | |
| tree | 8e3a2278fab3dae95310570ea54d0dfee1af9fe5 | |
| parent | 49d0b21be21efc07526d637e0ae935019667e532 (diff) | |
[PATCH] splice: be smarter about calling do_page_cache_readahead()
We don't want to call into the read-ahead logic unless we are at the
start of a page, _or_ we have multiple pages to read.
Signed-off-by: Jens Axboe <axboe@suse.de>
| -rw-r--r-- | fs/splice.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/splice.c b/fs/splice.c index 50c43a1e092..9bfd6af0cf4 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -250,9 +250,12 @@ static int __generic_file_splice_read(struct file *in, struct inode *pipe, nr_pages = PIPE_BUFFERS; /* - * initiate read-ahead on this page range + * initiate read-ahead on this page range. however, don't call into + * 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. */ - do_page_cache_readahead(mapping, in, index, nr_pages); + if (!offset || nr_pages > 1) + do_page_cache_readahead(mapping, in, index, nr_pages); /* * now fill in the holes |