diff options
| author | Tom Zanussi <zanussi@comcast.ne> | 2008-04-24 12:52:20 +0200 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2008-04-29 09:48:15 +0200 |
| commit | c3270e577c18b3d0e984c3371493205a4807db9d (patch) | |
| tree | 4a9e418798f897a580da930a575747706d17b94b /fs/splice.c | |
| parent | drivers: fix integer as NULL pointer warnings (diff) | |
| download | linux-c3270e577c18b3d0e984c3371493205a4807db9d.tar.xz linux-c3270e577c18b3d0e984c3371493205a4807db9d.zip | |
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.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, ret = splice_direct_to_actor(in, &sd, direct_splice_actor); if (ret > 0) - *ppos += ret; + *ppos = sd.pos; return ret; } |