commit a82c53a0e3f57f02782330372b7adad67b417645
author Tom Zanussi <zanussi@comcast.net> Fri May 09 13:28:36 2008 +0200
committer Jens Axboe <jens.axboe@oracle.com> Wed May 28 14:49:27 2008 +0200
tree 3a4e65ab1a2420f8fc5d0091a6992d6f7e430ad8
parent 1ec7d99c16e69a9ed8ffeaa6c1846025b84bebad

splice: fix sendfile() issue with relay

Splice isn't always incrementing the ppos correctly, which broke
relay splice.

Signed-off-by: Tom Zanussi <zanussi@comcast.net>
Tested-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

kernel/relay.c

diff --git a/kernel/relay.c b/kernel/relay.c
index bc24dcd..7de644c 100644
--- a/kernel/relay.c
+++ b/kernel/relay.c
@@ -1191,7 +1191,7 @@
 	ret = 0;
 	spliced = 0;
 
-	while (len) {
+	while (len && !spliced) {
 		ret = subbuf_splice_actor(in, ppos, pipe, len, flags, &nonpad_ret);
 		if (ret < 0)
 			break;