---

yaml --- r: 54981 b: refs/heads/master c: 86aa5ac h: refs/heads/master i: 54979: e2a5ebf v: v3
git-mirror · May 8, 2007 · 5c341f5 · 5c341f5
1 parent 3d46112
commit 5c341f5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ae9d68cbf3fe0ec17c17c9ecaa2188ffb854a66
+refs/heads/master: 86aa5ac53e478c94ee39a15b6eadde1ed1317be3
diff --git a/trunk/fs/splice.c b/trunk/fs/splice.c
@@ -289,12 +289,10 @@ __generic_file_splice_read(struct file *in, loff_t *ppos,
 		nr_pages = PIPE_BUFFERS;
 
 	/*
-	 * 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.
+	 * Don't try to 2nd guess the read-ahead logic, call into
+	 * page_cache_readahead() like the page cache reads would do.
 	 */
-	if (!loff || nr_pages > 1)
-		page_cache_readahead(mapping, &in->f_ra, in, index, nr_pages);
+	page_cache_readahead(mapping, &in->f_ra, in, index, nr_pages);
 
 	/*
 	 * Now fill in the holes: