diff options
author | Tom Zanussi <zanussi@comcast.ne> | 2008-04-24 06:52:20 -0400 |
---|---|---|
committer | Jens Axboe <jens.axboe@oracle.com> | 2008-04-29 03:48:15 -0400 |
commit | c3270e577c18b3d0e984c3371493205a4807db9d (patch) | |
tree | 4a9e418798f897a580da930a575747706d17b94b /fs | |
parent | a01e035ebb552223c03f2d9138ffc73f2d4d3965 (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')
-rw-r--r-- | fs/splice.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/splice.c b/fs/splice.c index eeb1a86a7014..633f58ebfb72 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, | |||
1075 | 1075 | ||
1076 | ret = splice_direct_to_actor(in, &sd, direct_splice_actor); | 1076 | ret = splice_direct_to_actor(in, &sd, direct_splice_actor); |
1077 | if (ret > 0) | 1077 | if (ret > 0) |
1078 | *ppos += ret; | 1078 | *ppos = sd.pos; |
1079 | 1079 | ||
1080 | return ret; | 1080 | return ret; |
1081 | } | 1081 | } |