diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2008-05-08 14:06:19 +0200 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2008-05-08 14:06:19 +0200 |
| commit | 75065ff619e42fe35178eda863cbcddd57776794 (patch) | |
| tree | e41d6e838cb2d2fcd62e5ea1980f720e98b57de7 /fs | |
| parent | ffee0259c9edcc4c0f06b60df51c461eeecad4c0 (diff) | |
| download | linux-stable-75065ff619e42fe35178eda863cbcddd57776794.tar.gz linux-stable-75065ff619e42fe35178eda863cbcddd57776794.tar.bz2 linux-stable-75065ff619e42fe35178eda863cbcddd57776794.zip | |
Revert "relay: fix splice problem"
This reverts commit c3270e577c18b3d0e984c3371493205a4807db9d.
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 cece15b4ef72..78150038b584 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -1072,7 +1072,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 = sd.pos; + *ppos += ret; return ret; } |