[PATCH 1/5] fgraph: Use guard(mutex)(&ftrace_lock) for unregister_ftrace_graph()

[Steven Rostedt]

From: Steven Rostedt <rost...@goodmis.org>

The ftrace_lock is held throughout unregister_ftrace_graph(), use a guard
to simplify the error paths.

Signed-off-by: Steven Rostedt (Google) <rost...@goodmis.org>
---
 kernel/trace/fgraph.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/kernel/trace/fgraph.c b/kernel/trace/fgraph.c
index 001abf376c0c..0bf78517b5d4 100644
--- a/kernel/trace/fgraph.c
+++ b/kernel/trace/fgraph.c
@@ -1381,17 +1381,17 @@ void unregister_ftrace_graph(struct fgraph_ops *gops)
 {
        int command = 0;
 
-       mutex_lock(&ftrace_lock);
+       guard(mutex)(&ftrace_lock);
 
        if (unlikely(!ftrace_graph_active))
-               goto out;
+               return;
 
        if (unlikely(gops->idx < 0 || gops->idx >= FGRAPH_ARRAY_SIZE ||
                     fgraph_array[gops->idx] != gops))
-               goto out;
+               return;
 
        if (fgraph_lru_release_index(gops->idx) < 0)
-               goto out;
+               return;
 
        fgraph_array[gops->idx] = &fgraph_stub;
 
@@ -1413,7 +1413,5 @@ void unregister_ftrace_graph(struct fgraph_ops *gops)
                unregister_pm_notifier(&ftrace_suspend_notifier);
                unregister_trace_sched_switch(ftrace_graph_probe_sched_switch, 
NULL);
        }
- out:
        gops->saved_func = NULL;
-       mutex_unlock(&ftrace_lock);
 }
-- 
2.45.2