From: David Wilder Date: Wed, 27 Jun 2007 21:10:03 +0000 (-0700) Subject: relay file read: start-pos fix X-Git-Tag: v2.6.22-rc7~21 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8d62fdebdaf9b866c7e236a8f5cfe90e6dba5773;p=linux-2.6-omap-h63xx.git relay file read: start-pos fix Fix a bug in the relay read interface causing the number of consumed bytes to be set incorrectly. Signed-off-by: Tom Zanussi Signed-off-by: David Wilder Cc: Masami Hiramatsu Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/kernel/relay.c b/kernel/relay.c index 4311101b0ca..e61156ea4e2 100644 --- a/kernel/relay.c +++ b/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;