tracing: Simplify conditional compilation code in tracing_set_tracer()

sunliming · rostedt · commit f4b0d318097e · 2022-06-17T18:42:17.000-04:00
Two conditional compilation directives "#ifdef CONFIG_TRACER_MAX_TRACE" are used consecutively, and no other code in between. Simplify conditional the compilation code and only use one "#ifdef CONFIG_TRACER_MAX_TRACE". Link: https://lkml.kernel.org/r/20220602140613.545069-1-sunliming@kylinos.cn Signed-off-by: sunliming <sunliming@kylinos.cn> Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
@@ -6424,9 +6424,7 @@ int tracing_set_tracer(struct trace_array *tr, const char *buf)
 		synchronize_rcu();
 		free_snapshot(tr);
 	}
-#endif
 
-#ifdef CONFIG_TRACER_MAX_TRACE
 	if (t->use_max_tr && !had_max_tr) {
 		ret = tracing_alloc_snapshot_instance(tr);
 		if (ret < 0)

Original file line number	Diff line number	Diff line change
`@@ -6424,9 +6424,7 @@ int tracing_set_tracer(struct trace_array tr, const char buf)`
`6424`	`6424`	`synchronize_rcu();`
`6425`	`6425`	`free_snapshot(tr);`
`6426`	`6426`	`}`
`6427`		`-#endif`
`6428`	`6427`
`6429`		`-#ifdef CONFIG_TRACER_MAX_TRACE`
`6430`	`6428`	`if (t->use_max_tr && !had_max_tr) {`
`6431`	`6429`	`ret = tracing_alloc_snapshot_instance(tr);`
`6432`	`6430`	`if (ret < 0)`