| commit | c3270e577c18b3d0e984c3371493205a4807db9d | [log] [tgz] |
|---|---|---|
| author | Tom Zanussi <zanussi@comcast.ne> | Thu Apr 24 12:52:20 2008 +0200 |
| committer | Jens Axboe <jens.axboe@oracle.com> | Tue Apr 29 09:48:15 2008 +0200 |
| tree | 4a9e418798f897a580da930a575747706d17b94b | |
| parent | a01e035ebb552223c03f2d9138ffc73f2d4d3965 [diff] [blame] |
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>
diff --git a/fs/splice.c b/fs/splice.c index eeb1a86..633f58e 100644 --- a/fs/splice.c +++ b/fs/splice.c
@@ -1075,7 +1075,7 @@ ret = splice_direct_to_actor(in, &sd, direct_splice_actor); if (ret > 0) - *ppos += ret; + *ppos = sd.pos; return ret; }