X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=fs%2Fsplice.c;h=a285fd746dc0d34aa97762a6e138416acae292e7;hb=e46e490368f87032a6e54969194413339b35a385;hp=8fa9217ed5858d60e1069ab78b545a6ece896224;hpb=76ad4d11105ccd40a536db1057083f28326019fd;p=linux-2.6

diff --git a/fs/splice.c b/fs/splice.c
index 8fa9217ed5..a285fd746d 100644
--- a/fs/splice.c
+++ b/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;
 			}
 			/*