---

yaml --- r: 25603 b: refs/heads/master c: 0b749ce h: refs/heads/master i: 25601: 7bb8a08 25599: e77db04 v: v3
git-mirror · Apr 10, 2006 · addd2ea · addd2ea
1 parent 9bdb8f2
commit addd2ea
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 49d0b21be21efc07526d637e0ae935019667e532
+refs/heads/master: 0b749ce3802428007a37870eb51ba3c0bdf90857
diff --git a/trunk/fs/splice.c b/trunk/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