From cd036da41911d11e2bc95c2c18616b5d630ef230 Mon Sep 17 00:00:00 2001 From: Masami Hiramatsu Date: Wed, 27 Jun 2007 14:10:04 -0700 Subject: [PATCH] --- yaml --- r: 58094 b: refs/heads/master c: a66e356c04ece4a96f44b942b68234c3de8ec3f5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/relay.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 52bd2d316e58..f8958bda4e2d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8d62fdebdaf9b866c7e236a8f5cfe90e6dba5773 +refs/heads/master: a66e356c04ece4a96f44b942b68234c3de8ec3f5 diff --git a/trunk/kernel/relay.c b/trunk/kernel/relay.c index e61156ea4e25..95db8c79fe8f 100644 --- a/trunk/kernel/relay.c +++ b/trunk/kernel/relay.c @@ -812,7 +812,10 @@ static void relay_file_read_consume(struct rchan_buf *buf, } buf->bytes_consumed += bytes_consumed; - read_subbuf = read_pos / buf->chan->subbuf_size; + if (!read_pos) + read_subbuf = buf->subbufs_consumed % n_subbufs; + else + read_subbuf = read_pos / buf->chan->subbuf_size; if (buf->bytes_consumed + buf->padding[read_subbuf] == subbuf_size) { if ((read_subbuf == buf->subbufs_produced % n_subbufs) && (buf->offset == subbuf_size)) @@ -841,8 +844,9 @@ static int relay_file_read_avail(struct rchan_buf *buf, size_t read_pos) } if (unlikely(produced - consumed >= n_subbufs)) { - consumed = (produced / n_subbufs) * n_subbufs; + consumed = produced - n_subbufs + 1; buf->subbufs_consumed = consumed; + buf->bytes_consumed = 0; } produced = (produced % n_subbufs) * subbuf_size + buf->offset;