This is the mail archive of the
systemtap@sourceware.org
mailing list for the systemtap project.
[PATCH] relay-file-read-start-pos-fix.patch
- From: David Wilder <dwilder at us dot ibm dot com>
- To: linux-kernel at vger dot kernel dot org
- Cc: systemtap at sources dot redhat dot com
- Date: Sun, 17 Jun 2007 21:57:03 -0700
- Subject: [PATCH] relay-file-read-start-pos-fix.patch
--
David Wilder
IBM Linux Technology Center
Beaverton, Oregon, USA
dwilder@us.ibm.com
(503)578-3789
This patch fixes a bug in the relay read interface causing the number
of consumed bytes to be set incorrectly.
Signed-off-by: Tom Zanussi <zanussi@us.ibm.com>
Signed-off-by: David Wilder <dwilder@us.ibm.com>
kernel/relay.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/kernel/relay.c b/kernel/relay.c
index 4311101..e61156e 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;