From: Fengguang Wu Date: Thu, 19 Jul 2007 08:48:03 +0000 (-0700) Subject: readahead: convert splice invocations X-Git-Tag: v2.6.23-rc1~432 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a08a166fe77d9f9ad88ed6d06b97e73453661f89;p=linux-2.6 readahead: convert splice invocations Convert splice reads to use on-demand readahead. Signed-off-by: Fengguang Wu Cc: Steven Pratt Cc: Ram Pai Cc: Jens Axboe Cc: Rusty Russell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/fs/splice.c b/fs/splice.c index 53fc2082a4..722449f7d5 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -286,12 +286,6 @@ __generic_file_splice_read(struct file *in, loff_t *ppos, if (nr_pages > PIPE_BUFFERS) nr_pages = PIPE_BUFFERS; - /* - * Don't try to 2nd guess the read-ahead logic, call into - * page_cache_readahead() like the page cache reads would do. - */ - page_cache_readahead(mapping, &in->f_ra, in, index, nr_pages); - /* * Lookup the (hopefully) full range of pages we need. */ @@ -310,11 +304,8 @@ __generic_file_splice_read(struct file *in, loff_t *ppos, */ page = find_get_page(mapping, index); if (!page) { - /* - * Make sure the read-ahead engine is notified - * about this failure. - */ - handle_ra_miss(mapping, &in->f_ra, index); + page_cache_readahead_ondemand(mapping, &in->f_ra, in, + NULL, index, nr_pages - spd.nr_pages); /* * page didn't exist, allocate one. @@ -361,6 +352,10 @@ __generic_file_splice_read(struct file *in, loff_t *ppos, this_len = min_t(unsigned long, len, PAGE_CACHE_SIZE - loff); page = pages[page_nr]; + if (PageReadahead(page)) + page_cache_readahead_ondemand(mapping, &in->f_ra, in, + page, index, nr_pages - page_nr); + /* * If the page isn't uptodate, we may need to start io on it */ @@ -453,6 +448,7 @@ fill_it: */ while (page_nr < nr_pages) page_cache_release(pages[page_nr++]); + in->f_ra.prev_index = index; if (spd.nr_pages) return splice_to_pipe(pipe, &spd);