[tip:tracing/urgent] trace_stat: Don't increment @pos in seq start()

From: tip-bot for Li Zefan
Date: Wed Jun 24 2009 - 05:46:54 EST


Commit-ID: 2961bf345fd1b736c3db46cad0f69855f67fbe9c
Gitweb: http://git.kernel.org/tip/2961bf345fd1b736c3db46cad0f69855f67fbe9c
Author: Li Zefan <lizf@xxxxxxxxxxxxxx>
AuthorDate: Wed, 24 Jun 2009 09:53:26 +0800
Committer: Ingo Molnar <mingo@xxxxxxx>
CommitDate: Wed, 24 Jun 2009 11:02:51 +0200

trace_stat: Don't increment @pos in seq start()

It's wrong to increment @pos in stat_seq_start(). It causes some
stat entries lost when reading stat file, if the output of the file
is larger than PAGE_SIZE.

Reviewed-by: Liming Wang <liming.wang@xxxxxxxxxxxxx>
Signed-off-by: Li Zefan <lizf@xxxxxxxxxxxxxx>
Cc: Steven Rostedt <rostedt@xxxxxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
LKML-Reference: <4A418716.90209@xxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>


---
kernel/trace/trace_stat.c | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/kernel/trace/trace_stat.c b/kernel/trace/trace_stat.c
index c006437..e66f5e4 100644
--- a/kernel/trace/trace_stat.c
+++ b/kernel/trace/trace_stat.c
@@ -199,17 +199,13 @@ static void *stat_seq_start(struct seq_file *s, loff_t *pos)
mutex_lock(&session->stat_mutex);

/* If we are in the beginning of the file, print the headers */
- if (!*pos && session->ts->stat_headers) {
- (*pos)++;
+ if (!*pos && session->ts->stat_headers)
return SEQ_START_TOKEN;
- }

node = rb_first(&session->stat_root);
for (i = 0; node && i < *pos; i++)
node = rb_next(node);

- (*pos)++;
-
return node;
}

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/