aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Zanussi <zanussi@comcast.ne>2008-04-24 12:52:20 +0200
committerJens Axboe <jens.axboe@oracle.com>2008-04-29 09:48:15 +0200
commitc3270e577c18b3d0e984c3371493205a4807db9d (patch)
tree4a9e418798f897a580da930a575747706d17b94b
parenta01e035ebb552223c03f2d9138ffc73f2d4d3965 (diff)
downloadvexpress-lsk-c3270e577c18b3d0e984c3371493205a4807db9d.tar.gz
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>
-rw-r--r--fs/splice.c2
-rw-r--r--kernel/relay.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/splice.c b/fs/splice.c
index eeb1a86a701..633f58ebfb7 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -1075,7 +1075,7 @@ long do_splice_direct(struct file *in, loff_t *ppos, struct file *out,
ret = splice_direct_to_actor(in, &sd, direct_splice_actor);
if (ret > 0)
- *ppos += ret;
+ *ppos = sd.pos;
return ret;
}
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;