xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tracing: toplevel d_entry already initialized

Browse Source 
Currently we have following call flow:

    tracer_init_tracefs()
        tracing_init_dentry()
        event_trace_init()
            tracing_init_dentry()

This shows tracing_init_dentry() is called twice in this flow and this
is not necessary.

Let's remove the second one when it is for sure be properly initialized.

Link: https://lkml.kernel.org/r/20200712011036.70948-4-richard.weiyang@linux.alibaba.com

Signed-off-by: Wei Yang <richard.weiyang@linux.alibaba.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
This commit is contained in:
Wei Yang
2020-07-12 09:10:35 +08:00
committed by Steven Rostedt (VMware)
parent 5675fd4ef5
commit dc300d77b8
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
kernel/trace/trace_events.c
View File

@@ -3434,7 +3434,6 @@ early_initcall(event_trace_enable_again);
__init int event_trace_init(void) __init int event_trace_init(void)
{ {
struct trace_array *tr; struct trace_array *tr;
struct dentry *d_tracer;
struct dentry *entry; struct dentry *entry;
int ret; int ret;
@@ -3442,11 +3441,7 @@ __init int event_trace_init(void)
if (!tr) if (!tr)
return -ENODEV; return -ENODEV;
d_tracer = tracing_init_dentry(); entry = tracefs_create_file("available_events", 0444, NULL,
if (IS_ERR(d_tracer))
return 0;
entry = tracefs_create_file("available_events", 0444, d_tracer,
tr, &ftrace_avail_fops); tr, &ftrace_avail_fops);
if (!entry) if (!entry)
pr_warn("Could not create tracefs 'available_events' entry\n"); pr_warn("Could not create tracefs 'available_events' entry\n");
@@ -3457,7 +3452,7 @@ __init int event_trace_init(void)
if (trace_define_common_fields()) if (trace_define_common_fields())
pr_warn("tracing: Failed to allocate common fields"); pr_warn("tracing: Failed to allocate common fields");
ret = early_event_add_tracer(d_tracer, tr); ret = early_event_add_tracer(NULL, tr);
if (ret) if (ret)
return ret; return ret;