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

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



Reviewed-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

kernel/trace/trace_uprobe.c

+10 −13
Original line number Diff line number Diff line
@@ -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);



	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),

					entry->vaddr[1], entry->vaddr[0]))

			goto partial;

				 entry->vaddr[1], entry->vaddr[0]);

		data = DATAOF_TRACE_ENTRY(entry, true);

	} else {

		if (!trace_seq_printf(s, "%s: (0x%lx)",

		trace_seq_printf(s, "%s: (0x%lx)",

				 ftrace_event_name(&tu->tp.call),

					entry->vaddr[0]))

			goto partial;

				 entry->vaddr[0]);

		data = DATAOF_TRACE_ENTRY(entry, false);

	}
@@ -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];



		if (!parg->type->print(s, parg->name, data + parg->offset, entry))

			goto partial;

			goto out;

	}



	if (trace_seq_putc(s, '\n'))

		return TRACE_TYPE_HANDLED;

	trace_seq_putc(s, '\n');



partial:

	return TRACE_TYPE_PARTIAL_LINE;

 out:

	return trace_handle_return(s);

}



typedef bool (*filter_func_t)(struct uprobe_consumer *self,

CRA Git | Maintained and supported by SUSTech CRA and CCSE