aboutsummaryrefslogtreecommitdiff
path: root/fs/splice.c
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 /fs/splice.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 'fs/splice.c')
-rw-r--r--fs/splice.c2
1 files changed, 1 insertions, 1 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;
}