aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/relay.c
diff options
context:
space:
mode:
authorTom Zanussi <zanussi@comcast.ne>2008-04-24 06:52:20 -0400
committerJens Axboe <jens.axboe@oracle.com>2008-04-29 03:48:15 -0400
commitc3270e577c18b3d0e984c3371493205a4807db9d (patch)
tree4a9e418798f897a580da930a575747706d17b94b /kernel/relay.c
parenta01e035ebb552223c03f2d9138ffc73f2d4d3965 (diff)
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>
Diffstat (limited to 'kernel/relay.c')
-rw-r--r--kernel/relay.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/relay.c b/kernel/relay.c
index d6204a485818..dc873fba90d2 100644
--- a/kernel/relay.c
+++ b/kernel/relay.c
@@ -1162,7 +1162,7 @@ static ssize_t relay_file_splice_read(struct file *in,
1162 ret = 0; 1162 ret = 0;
1163 spliced = 0; 1163 spliced = 0;
1164 1164
1165 while (len) { 1165 while (len && !spliced) {
1166 ret = subbuf_splice_actor(in, ppos, pipe, len, flags, &nonpad_ret); 1166 ret = subbuf_splice_actor(in, ppos, pipe, len, flags, &nonpad_ret);
1167 if (ret < 0) 1167 if (ret < 0)
1168 break; 1168 break;