Commit 8579a107 authored by Steven Rostedt (Red Hat)'s avatar Steven Rostedt (Red Hat) Committed by Steven Rostedt

tracing/uprobes: Do not use return values of trace_seq_printf()

The functions trace_seq_printf() and friends will soon no longer have
return values. Using trace_seq_has_overflowed() and trace_handle_return()
should be used instead.

Link: http://lkml.kernel.org/r/20141114011411.693008134@goodmis.org
Link: http://lkml.kernel.org/r/20141115050602.333705855@goodmis.orgReviewed-by: default avatarMasami Hiramatsu <masami.hiramatu.pt@hitachi.com>
Acked-by: default avatarSrikar Dronamraju <srikar@linux.vnet.ibm.com>
Acked-by: default avatarNamhyung Kim <namhyung@kernel.org>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent d2b0191a
...@@ -852,16 +852,14 @@ print_uprobe_event(struct trace_iterator *iter, int flags, struct trace_event *e ...@@ -852,16 +852,14 @@ print_uprobe_event(struct trace_iterator *iter, int flags, struct trace_event *e
tu = container_of(event, struct trace_uprobe, tp.call.event); tu = container_of(event, struct trace_uprobe, tp.call.event);
if (is_ret_probe(tu)) { if (is_ret_probe(tu)) {
if (!trace_seq_printf(s, "%s: (0x%lx <- 0x%lx)", trace_seq_printf(s, "%s: (0x%lx <- 0x%lx)",
ftrace_event_name(&tu->tp.call), ftrace_event_name(&tu->tp.call),
entry->vaddr[1], entry->vaddr[0])) entry->vaddr[1], entry->vaddr[0]);
goto partial;
data = DATAOF_TRACE_ENTRY(entry, true); data = DATAOF_TRACE_ENTRY(entry, true);
} else { } else {
if (!trace_seq_printf(s, "%s: (0x%lx)", trace_seq_printf(s, "%s: (0x%lx)",
ftrace_event_name(&tu->tp.call), ftrace_event_name(&tu->tp.call),
entry->vaddr[0])) entry->vaddr[0]);
goto partial;
data = DATAOF_TRACE_ENTRY(entry, false); data = DATAOF_TRACE_ENTRY(entry, false);
} }
...@@ -869,14 +867,13 @@ print_uprobe_event(struct trace_iterator *iter, int flags, struct trace_event *e ...@@ -869,14 +867,13 @@ print_uprobe_event(struct trace_iterator *iter, int flags, struct trace_event *e
struct probe_arg *parg = &tu->tp.args[i]; struct probe_arg *parg = &tu->tp.args[i];
if (!parg->type->print(s, parg->name, data + parg->offset, entry)) if (!parg->type->print(s, parg->name, data + parg->offset, entry))
goto partial; goto out;
} }
if (trace_seq_putc(s, '\n')) trace_seq_putc(s, '\n');
return TRACE_TYPE_HANDLED;
partial: out:
return TRACE_TYPE_PARTIAL_LINE; return trace_handle_return(s);
} }
typedef bool (*filter_func_t)(struct uprobe_consumer *self, typedef bool (*filter_func_t)(struct uprobe_consumer *self,
......
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