[PATCH 4/5] ftrace: Use guard to take the ftrace_lock in release_probe()

From: Steven Rostedt
Date: Mon Oct 28 2024 - 03:13:58 EST


From: Steven Rostedt <rostedt@xxxxxxxxxxx>

The ftrace_lock is held throughout the entire release_probe() function.
Use guard to simplify any exit paths.

Signed-off-by: Steven Rostedt (Google) <rostedt@xxxxxxxxxxx>
---
kernel/trace/ftrace.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 64997416415e..c0fabd7da5b2 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -5288,7 +5288,7 @@ static void release_probe(struct ftrace_func_probe *probe)
{
struct ftrace_probe_ops *probe_ops;

- mutex_lock(&ftrace_lock);
+ guard(mutex)(&ftrace_lock);

WARN_ON(probe->ref <= 0);

@@ -5306,7 +5306,6 @@ static void release_probe(struct ftrace_func_probe *probe)
list_del(&probe->list);
kfree(probe);
}
- mutex_unlock(&ftrace_lock);
}

static void acquire_probe_locked(struct ftrace_func_probe *probe)
--
2.45.2