summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2008-05-08 14:06:19 +0200
committerJens Axboe <jens.axboe@oracle.com>2008-05-08 14:06:19 +0200
commit75065ff619e42fe35178eda863cbcddd57776794 (patch)
treee41d6e838cb2d2fcd62e5ea1980f720e98b57de7
parentffee0259c9edcc4c0f06b60df51c461eeecad4c0 (diff)
downloadlinux-75065ff619e42fe35178eda863cbcddd57776794.tar.gz
linux-75065ff619e42fe35178eda863cbcddd57776794.tar.bz2
linux-75065ff619e42fe35178eda863cbcddd57776794.zip
Revert "relay: fix splice problem"
This reverts commit c3270e577c18b3d0e984c3371493205a4807db9d.
-rw-r--r--fs/splice.c2
-rw-r--r--kernel/relay.c2
2 files changed, 2 insertions, 2 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;
}
diff --git a/kernel/relay.c b/kernel/relay.c
index 7de644cdec43..bc24dcdc570f 100644
--- a/kernel/relay.c
+++ b/kernel/relay.c
@@ -1191,7 +1191,7 @@ static ssize_t relay_file_splice_read(struct file *in,
ret = 0;
spliced = 0;
- while (len && !spliced) {
+ while (len) {
ret = subbuf_splice_actor(in, ppos, pipe, len, flags, &nonpad_ret);
if (ret < 0)
break;