From c3270e577c18b3d0e984c3371493205a4807db9d Mon Sep 17 00:00:00 2001
From: Tom Zanussi <zanussi@comcast.ne>
Date: Thu, 24 Apr 2008 12:52:20 +0200
Subject: relay: fix splice problem

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

Signed-off-by: Tom Zanussi <zanussi@comcast.net>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
---
 kernel/relay.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'kernel/relay.c')

diff --git a/kernel/relay.c b/kernel/relay.c
index d6204a48581..dc873fba90d 100644
--- a/kernel/relay.c
+++ b/kernel/relay.c
@@ -1162,7 +1162,7 @@ static ssize_t relay_file_splice_read(struct file *in,
 	ret = 0;
 	spliced = 0;
 
-	while (len) {
+	while (len && !spliced) {
 		ret = subbuf_splice_actor(in, ppos, pipe, len, flags, &nonpad_ret);
 		if (ret < 0)
 			break;
-- 
cgit v1.2.3