Commit 6c05353e authored by Steven Rostedt's avatar Steven Rostedt Committed by Steven Rostedt (Google)
Browse files

tracing: Switch trace_stack.c code over to use guard() 

The function stack_trace_sysctl() uses a goto on the error path to jump to
the mutex_unlock() code. Replace the logic to use guard() and let the
compiler worry about it.

Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/20241225222931.684913592@goodmis.org


Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
parent 930d2b32

kernel/trace/trace_stack.c

+2 −4
Original line number Diff line number Diff line
@@ -520,20 +520,18 @@ stack_trace_sysctl(const struct ctl_table *table, int write, void *buffer, 
	int was_enabled;

	int ret;



	mutex_lock(&stack_sysctl_mutex);

	guard(mutex)(&stack_sysctl_mutex);

	was_enabled = !!stack_tracer_enabled;



	ret = proc_dointvec(table, write, buffer, lenp, ppos);



	if (ret || !write || (was_enabled == !!stack_tracer_enabled))

		goto out;

		return ret;



	if (stack_tracer_enabled)

		register_ftrace_function(&trace_ops);

	else

		unregister_ftrace_function(&trace_ops);

 out:

	mutex_unlock(&stack_sysctl_mutex);

	return ret;

}