diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2014-11-12 19:19:06 +0100 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2014-11-19 21:25:41 +0100 |
| commit | 7d40f67165d9a4c9add5c0f7e599637a292bbfb2 (patch) | |
| tree | 49fc8136f93a572fb0163386ef27b9bc068663d3 /kernel/trace | |
| parent | ring-buffer: Remove check of trace_seq_{puts,printf}() return values (diff) | |
| download | linux-7d40f67165d9a4c9add5c0f7e599637a292bbfb2.tar.xz linux-7d40f67165d9a4c9add5c0f7e599637a292bbfb2.zip | |
tracing: Have branch tracer use trace_handle_return() helper function
The branch tracer should not be checking the trace_seq_printf() return value
as that will soon be void. There's a new trace_handle_return() helper function
that will return TRACE_TYPE_PARTIAL_LINE if the trace_seq overflowed
and TRACE_TYPE_HANDLED otherwise.
Reviewed-by: Petr Mladek <pmladek@suse.cz>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | kernel/trace/trace_branch.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/kernel/trace/trace_branch.c b/kernel/trace/trace_branch.c index a3916f68a1c7..7d6e2afde669 100644 --- a/kernel/trace/trace_branch.c +++ b/kernel/trace/trace_branch.c @@ -151,14 +151,13 @@ static enum print_line_t trace_branch_print(struct trace_iterator *iter, trace_assign_type(field, iter->ent); - if (trace_seq_printf(&iter->seq, "[%s] %s:%s:%d\n", - field->correct ? " ok " : " MISS ", - field->func, - field->file, - field->line)) - return TRACE_TYPE_PARTIAL_LINE; - - return TRACE_TYPE_HANDLED; + trace_seq_printf(&iter->seq, "[%s] %s:%s:%d\n", + field->correct ? " ok " : " MISS ", + field->func, + field->file, + field->line); + + return trace_handle_return(&iter->seq); } static void branch_print_header(struct seq_file *s) |