]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
trace_stat: don't call seq_printf() in seq_operation->start()
authorLai Jiangshan <laijs@cn.fujitsu.com>
Wed, 25 Mar 2009 08:27:17 +0000 (16:27 +0800)
committerIngo Molnar <mingo@elte.hu>
Wed, 25 Mar 2009 17:32:34 +0000 (18:32 +0100)
Impact: Fix incorrect way using seq_file's API

Use SEQ_START_TOKEN instead of calling ->stat_headers()
int seq_operation->start().

Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Acked-by: Steven Rostedt <srostedt@redhat.com>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
LKML-Reference: <49C9EAE5.5070202@cn.fujitsu.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
kernel/trace/trace_stat.c

index f71b85b22cfe29ae6a58067b7e9f6f66c802fabb..8c129dd480ade8b17fff243b92487c74db580bb6 100644 (file)
@@ -163,7 +163,7 @@ static void *stat_seq_start(struct seq_file *s, loff_t *pos)
 
        /* If we are in the beginning of the file, print the headers */
        if (!*pos && session->ts->stat_headers)
-               session->ts->stat_headers(s);
+               return SEQ_START_TOKEN;
 
        return seq_list_start(&session->stat_list, *pos);
 }
@@ -172,6 +172,9 @@ static void *stat_seq_next(struct seq_file *s, void *p, loff_t *pos)
 {
        struct tracer_stat_session *session = s->private;
 
+       if (p == SEQ_START_TOKEN)
+               return seq_list_start(&session->stat_list, *pos);
+
        return seq_list_next(p, &session->stat_list, pos);
 }
 
@@ -186,6 +189,9 @@ static int stat_seq_show(struct seq_file *s, void *v)
        struct tracer_stat_session *session = s->private;
        struct trace_stat_list *l = list_entry(v, struct trace_stat_list, list);
 
+       if (v == SEQ_START_TOKEN)
+               return session->ts->stat_headers(s);
+
        return session->ts->stat_show(s, l->stat);
 }