tracing: fix multiple use of __print_flags and __print_symbolic

Here is an updated patch to include the extra call to
trace_seq_init() as requested. This is vs. the latest
-tip tree and fixes the use of multiple __print_flags
and __print_symbolic in a single tracer. Also tested
to ensure its working now:

mount.gfs2-2534  [000]   235.850587: gfs2_glock_queue: 8.7 glock 1:2 dequeue PR
mount.gfs2-2534  [000]   235.850591: gfs2_demote_rq: 8.7 glock 1:0 demote EX to NL flags:DI
mount.gfs2-2534  [000]   235.850591: gfs2_glock_queue: 8.7 glock 1:0 dequeue EX
glock_workqueue-2529  [000]   235.850666: gfs2_glock_state_change: 8.7 glock 1:0 state EX => NL tgt:NL dmt:NL flags:lDpI
glock_workqueue-2529  [000]   235.850672: gfs2_glock_put: 8.7 glock 1:0 state NL => IV flags:I

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
LKML-Reference: <1244037123.29604.603.camel@localhost.localdomain>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

1 files changed, 2 insertions, 0 deletions

diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h
index b5478dab579b..40ede4db4d88 100644
--- a/include/trace/ftrace.h
+++ b/include/trace/ftrace.h
@@ -104,6 +104,7 @@
  *      field = (typeof(field))entry;
  *
  *      p = get_cpu_var(ftrace_event_seq);
+ *      trace_seq_init(p);
  *      ret = trace_seq_printf(s, <TP_printk> "\n");
  *      put_cpu();
  *      if (!ret)
@@ -167,6 +168,7 @@ ftrace_raw_output_##call(struct trace_iterator *iter, int flags)	\
         field = (typeof(field))entry;                                   \
                                                                         \
         p = &get_cpu_var(ftrace_event_seq);                             \
+        trace_seq_init(p);                                              \
         ret = trace_seq_printf(s, #call ": " print);                    \
         put_cpu();                                                      \
         if (!ret)                                                       \