---

yaml --- r: 119806 b: refs/heads/master c: fbb5b7a h: refs/heads/master v: v3
git-mirror · Dec 10, 2008 · 0e1c88b · 0e1c88b
1 parent 0acd466
commit 0e1c88b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 361371201b60ffd686a694c848c1d5ad6061725f
+refs/heads/master: fbb5b7ae4b442f1923513dc6165a66c7a7f29073
diff --git a/trunk/kernel/relay.c b/trunk/kernel/relay.c
@@ -1317,12 +1317,9 @@ static ssize_t relay_file_splice_read(struct file *in,
 		if (ret < 0)
 			break;
 		else if (!ret) {
-			if (spliced)
-				break;
-			if (flags & SPLICE_F_NONBLOCK) {
+			if (flags & SPLICE_F_NONBLOCK)
 				ret = -EAGAIN;
-				break;
-			}
+			break;
 		}
 
 		*ppos += ret;