public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

tracing: Check state.disabled in synth event trace functions

Browse source 
Since trace_state.disabled is set in __synth_event_trace_start() at
the same time -ENOENT is returned, don't bother returning -ENOENT -
just have callers check trace_state.disabled instead, and avoid the
extra return val munging.

Link: http://lkml.kernel.org/r/87315c3889af870e8370e82b76cf48b426d70130.1585941485.git.zanussi@kernel.org

Suggested-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Tom Zanussi <zanussi@kernel.org>
Signed-off-by: Steven Rostedt (VMware) <rostedt@godmis.org>
This commit is contained in:
Tom Zanussi 2020-04-03 14:31:19 -05:00 • committed by Steven Rostedt (VMware)
parent fc9d276f22
commit 1b94b3aed3
1 changed files with 3 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
kernel/trace/trace_events_hist.c
View file

@ -1845,7 +1845,6 @@ __synth_event_trace_start(struct trace_event_file *file,
if (!(file->flags & EVENT_FILE_FL_ENABLED) || if (!(file->flags & EVENT_FILE_FL_ENABLED) ||
trace_trigger_soft_disabled(file)) { trace_trigger_soft_disabled(file)) {
trace_state->disabled = true; trace_state->disabled = true;
ret = -ENOENT;
goto out; goto out;
} }
@ -1907,11 +1906,8 @@ int synth_event_trace(struct trace_event_file *file, unsigned int n_vals, ...)
int ret; int ret;
ret = __synth_event_trace_start(file, &state); ret = __synth_event_trace_start(file, &state);
if (ret) { if (ret || state.disabled)
if (ret == -ENOENT)
ret = 0; /* just disabled, not really an error */
return ret; return ret;
}
if (n_vals != state.event->n_fields) { if (n_vals != state.event->n_fields) {
ret = -EINVAL; ret = -EINVAL;
@ -1987,11 +1983,8 @@ int synth_event_trace_array(struct trace_event_file *file, u64 *vals,
int ret; int ret;
ret = __synth_event_trace_start(file, &state); ret = __synth_event_trace_start(file, &state);
if (ret) { if (ret || state.disabled)
if (ret == -ENOENT)
ret = 0; /* just disabled, not really an error */
return ret; return ret;
}
if (n_vals != state.event->n_fields) { if (n_vals != state.event->n_fields) {
ret = -EINVAL; ret = -EINVAL;
@ -2067,16 +2060,10 @@ EXPORT_SYMBOL_GPL(synth_event_trace_array);
int synth_event_trace_start(struct trace_event_file *file, int synth_event_trace_start(struct trace_event_file *file,
struct synth_event_trace_state *trace_state) struct synth_event_trace_state *trace_state)
{ {
int ret;
if (!trace_state) if (!trace_state)
return -EINVAL; return -EINVAL;
ret = __synth_event_trace_start(file, trace_state); return __synth_event_trace_start(file, trace_state);
if (ret == -ENOENT)
ret = 0; /* just disabled, not really an error */
return ret;
} }
EXPORT_SYMBOL_GPL(synth_event_trace_start); EXPORT_SYMBOL_GPL(synth_event_trace_start);