From 3b471bf189fff34bb3500f03476eb25d957b3564 Mon Sep 17 00:00:00 2001
From: Jens Axboe <axboe@suse.de>
Date: Wed, 3 May 2006 10:58:22 +0200
Subject: [PATCH] --- yaml --- r: 26494 b: refs/heads/master c:
 a0548871ed267ae12eb1c860c5aaebd9e466b34e h: refs/heads/master v: v3

---
 [refs]            | 2 +-
 trunk/fs/splice.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f07ecc1c6caa..8f17fdd587e6 100644
--- 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
index 8fa9217ed585..a285fd746dc0 100644
--- 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;
 			}
 			/*