From 11ae5514c66714c1709d2814e81ec90839099d54 Mon Sep 17 00:00:00 2001 From: David Wilder Date: Wed, 27 Jun 2007 14:10:03 -0700 Subject: [PATCH] --- yaml --- r: 58093 b: refs/heads/master c: 8d62fdebdaf9b866c7e236a8f5cfe90e6dba5773 h: refs/heads/master i: 58091: 144fb6e06c8ecfd980e472706d066ce40c605c38 v: v3 --- [refs] | 2 +- trunk/kernel/relay.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 17f3573a2ac4..52bd2d316e58 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ea7fc3336b1d657c65daf55614d4aaadd8c1c244 +refs/heads/master: 8d62fdebdaf9b866c7e236a8f5cfe90e6dba5773 diff --git a/trunk/kernel/relay.c b/trunk/kernel/relay.c index 4311101b0ca7..e61156ea4e25 100644 --- a/trunk/kernel/relay.c +++ b/trunk/kernel/relay.c @@ -899,7 +899,10 @@ static size_t relay_file_read_start_pos(size_t read_pos, size_t read_subbuf, padding, padding_start, padding_end; size_t subbuf_size = buf->chan->subbuf_size; size_t n_subbufs = buf->chan->n_subbufs; + size_t consumed = buf->subbufs_consumed % n_subbufs; + if (!read_pos) + read_pos = consumed * subbuf_size + buf->bytes_consumed; read_subbuf = read_pos / subbuf_size; padding = buf->padding[read_subbuf]; padding_start = (read_subbuf + 1) * subbuf_size - padding;