diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2007-07-19 12:48:08 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 21:04:44 +0400 |
| commit | cf914a7d656e62b9dd3e0dffe4f62b953ae6048d (patch) | |
| tree | baf7e79de006ca80eac426d2d1be4c52f5f19624 /fs/splice.c | |
| parent | fe3cba17c49471e99d3421e675fc8b3deaaf0b70 (diff) | |
| download | linux-cf914a7d656e62b9dd3e0dffe4f62b953ae6048d.tar.xz | |
readahead: split ondemand readahead interface into two functions
Split ondemand readahead interface into two functions. I think this makes it
a little clearer for non-readahead experts (like Rusty).
Internally they both call ondemand_readahead(), but the page argument is
changed to an obvious boolean flag.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Fengguang Wu <wfg@mail.ustc.edu.cn>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/splice.c')
| -rw-r--r-- | fs/splice.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/splice.c b/fs/splice.c index 6ddd0329f866..22496d2a73fa 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -295,8 +295,8 @@ __generic_file_splice_read(struct file *in, loff_t *ppos, * readahead/allocate the rest and fill in the holes. */ if (spd.nr_pages < nr_pages) - page_cache_readahead_ondemand(mapping, &in->f_ra, in, - NULL, index, req_pages - spd.nr_pages); + page_cache_sync_readahead(mapping, &in->f_ra, in, + index, req_pages - spd.nr_pages); error = 0; while (spd.nr_pages < nr_pages) { @@ -352,7 +352,7 @@ __generic_file_splice_read(struct file *in, loff_t *ppos, page = pages[page_nr]; if (PageReadahead(page)) - page_cache_readahead_ondemand(mapping, &in->f_ra, in, + page_cache_async_readahead(mapping, &in->f_ra, in, page, index, req_pages - page_nr); /* |