Commit 8e2e095c authored by Steven Rostedt (Red Hat)'s avatar Steven Rostedt (Red Hat) Committed by Steven Rostedt

tracing: Fix return value of ftrace_raw_output_prep()

If the trace_seq of ftrace_raw_output_prep() is full this function
returns TRACE_TYPE_PARTIAL_LINE, otherwise it returns zero.

The problem is that TRACE_TYPE_PARTIAL_LINE happens to be zero!

The thing is, the caller of ftrace_raw_output_prep() expects a
success to be zero. Change that to expect it to be
TRACE_TYPE_HANDLED.

Link: http://lkml.kernel.org/r/20141114112522.GA2988@dhcp128.suse.czReminded-by: default avatarPetr Mladek <pmladek@suse.cz>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent dba39448
...@@ -277,7 +277,7 @@ ftrace_raw_output_##call(struct trace_iterator *iter, int flags, \ ...@@ -277,7 +277,7 @@ ftrace_raw_output_##call(struct trace_iterator *iter, int flags, \
field = (typeof(field))iter->ent; \ field = (typeof(field))iter->ent; \
\ \
ret = ftrace_raw_output_prep(iter, trace_event); \ ret = ftrace_raw_output_prep(iter, trace_event); \
if (ret) \ if (ret != TRACE_TYPE_HANDLED) \
return ret; \ return ret; \
\ \
trace_seq_printf(s, print); \ trace_seq_printf(s, print); \
......
...@@ -196,10 +196,7 @@ int ftrace_raw_output_prep(struct trace_iterator *iter, ...@@ -196,10 +196,7 @@ int ftrace_raw_output_prep(struct trace_iterator *iter,
trace_seq_init(p); trace_seq_init(p);
trace_seq_printf(s, "%s: ", ftrace_event_name(event)); trace_seq_printf(s, "%s: ", ftrace_event_name(event));
if (trace_seq_has_overflowed(s)) return trace_handle_return(s);
return TRACE_TYPE_PARTIAL_LINE;
return 0;
} }
EXPORT_SYMBOL(ftrace_raw_output_prep); EXPORT_SYMBOL(ftrace_raw_output_prep);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment