| 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/kernel/relay.c b/kernel/relay.c index d6204a4..dc873fb 100644 --- a/kernel/relay.c +++ b/kernel/relay.c
@@ -1162,7 +1162,7 @@ ret = 0; spliced = 0; - while (len) { + while (len && !spliced) { ret = subbuf_splice_actor(in, ppos, pipe, len, flags, &nonpad_ret); if (ret < 0) break;