]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
fgragh: No need to invoke the function call_filter_check_discard()
authorSteven Rostedt <rostedt@goodmis.org>
Thu, 10 Oct 2024 23:40:20 +0000 (19:40 -0400)
committerSteven Rostedt (Google) <rostedt@goodmis.org>
Thu, 10 Oct 2024 23:49:41 +0000 (19:49 -0400)
The function call_filter_check_discard() has been removed in the
commit 49e4154f4b16 ("tracing: Remove TRACE_EVENT_FL_FILTERED logic"),
from another topic branch. But when merged together with commit
21e92806d39c6 ("function_graph: Support recording and printing the
function return address") which added another call to
call_filter_check_discard(), it caused the build to fail. Since the
function call_filter_check_discard() is useless, it can simply be removed
regardless of being merged with commit 49e4154f4b16 or not.

Link: https://lore.kernel.org/all/20241010134649.43ed357c@canb.auug.org.au/
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Donglin Peng <dolinux.peng@gmail.com>
Link: https://lore.kernel.org/20241010194020.46192b21@gandalf.local.home
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Fixes: 21e92806d39c6 ("function_graph: Support recording and printing the function return address")
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
kernel/trace/trace_functions_graph.c

index 20d0c579d3b528e287ffdcb01ef2103fb8ba8e6f..03c5a0d300a5d024a0abfc93bd7dd7c4a612e555 100644 (file)
@@ -137,7 +137,6 @@ int __trace_graph_retaddr_entry(struct trace_array *tr,
                                unsigned int trace_ctx,
                                unsigned long retaddr)
 {
-       struct trace_event_call *call = &event_fgraph_retaddr_entry;
        struct ring_buffer_event *event;
        struct trace_buffer *buffer = tr->array_buffer.buffer;
        struct fgraph_retaddr_ent_entry *entry;
@@ -150,8 +149,7 @@ int __trace_graph_retaddr_entry(struct trace_array *tr,
        entry->graph_ent.func = trace->func;
        entry->graph_ent.depth = trace->depth;
        entry->graph_ent.retaddr = retaddr;
-       if (!call_filter_check_discard(call, entry, buffer, event))
-               trace_buffer_unlock_commit_nostack(buffer, event);
+       trace_buffer_unlock_commit_nostack(buffer, event);
 
        return 1;
 }