p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.cz

Reminded-by: Petr Mladek <pmladek@suse.cz>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
This commit is contained in:
Steven Rostedt (Red Hat) 2014-11-14 11:42:06 -05:00 committed by Steven Rostedt
parent dba39448ab
commit 8e2e095cbe
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/trace/ftrace.h
View File

@ -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); \

5
kernel/trace/trace_output.c
View File

@ -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);