Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=75065f...
Commit: 75065ff619e42fe35178eda863cbcddd57776794
Parent: ffee0259c9edcc4c0f06b60df51c461eeecad4c0
Author: Jens Axboe <jens.axboe@oracle.com>
AuthorDate: Thu May 8 14:06:19 2008 +0200
Committer: Jens Axboe <jens.axboe@oracle.com>
CommitDate: Thu May 8 14:06:19 2008 +0200
Revert "relay: fix splice problem"
This reverts commit c3270e577c18b3d0e984c3371493205a4807db9d.
---
fs/splice.c | 2 +-
kernel/relay.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/splice.c b/fs/splice.c
index cece15b..7815003 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 7de644c..bc24dcd 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;
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
