---

yaml --- r: 26494 b: refs/heads/master c: a054887 h: refs/heads/master v: v3
git-mirror · May 4, 2006 · 3b471bf · 3b471bf
1 parent cffa8de
commit 3b471bf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76ad4d11105ccd40a536db1057083f28326019fd
+refs/heads/master: a0548871ed267ae12eb1c860c5aaebd9e466b34e
diff --git a/trunk/fs/splice.c b/trunk/fs/splice.c
@@ -324,6 +324,8 @@ __generic_file_splice_read(struct file *in, loff_t *ppos,
 					      mapping_gfp_mask(mapping));
 			if (unlikely(error)) {
 				page_cache_release(page);
+				if (error == -EEXIST)
+					continue;
 				break;
 			}
 			/*