From: Wei Yang <richard.weiyang@linux.alibaba.com>
To: rostedt@goodmis.org, mingo@redhat.com
Cc: linux-kernel@vger.kernel.org,
Wei Yang <richard.weiyang@linux.alibaba.com>
Subject: [Patch v2 3/4] tracing: toplevel d_entry already initialized
Date: Sun, 12 Jul 2020 09:10:35 +0800 [thread overview]
Message-ID: <20200712011036.70948-4-richard.weiyang@linux.alibaba.com> (raw)
In-Reply-To: <20200712011036.70948-1-richard.weiyang@linux.alibaba.com>
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.
Signed-off-by: Wei Yang <richard.weiyang@linux.alibaba.com>
---
v2:
* merged 4 & 5
---
kernel/trace/trace_events.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index f6f55682d3e2..76879b29cf33 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -3434,7 +3434,6 @@ early_initcall(event_trace_enable_again);
__init int event_trace_init(void)
{
struct trace_array *tr;
- struct dentry *d_tracer;
struct dentry *entry;
int ret;
@@ -3442,11 +3441,7 @@ __init int event_trace_init(void)
if (!tr)
return -ENODEV;
- d_tracer = tracing_init_dentry();
- if (IS_ERR(d_tracer))
- return 0;
-
- entry = tracefs_create_file("available_events", 0444, d_tracer,
+ entry = tracefs_create_file("available_events", 0444, NULL,
tr, &ftrace_avail_fops);
if (!entry)
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())
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)
return ret;
--
2.20.1 (Apple Git-117)
next prev parent reply other threads:[~2020-07-12 1:11 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-12 1:10 [Patch v2 0/4] tracing: trivial cleanup Wei Yang
2020-07-12 1:10 ` [Patch v2 1/4] tracing: simplify the logic by defining next to be "lasst + 1" Wei Yang
2020-07-12 1:10 ` [Patch v2 2/4] tracing: save one trace_event->type by using __TRACE_LAST_TYPE Wei Yang
2020-07-12 1:10 ` Wei Yang [this message]
2020-07-12 1:10 ` [Patch v2 4/4] tracing: make tracing_init_dentry() returns an integer instead of a d_entry pointer Wei Yang
2020-08-28 3:42 ` [Patch v2 0/4] tracing: trivial cleanup Wei Yang
2020-09-14 22:55 ` Steven Rostedt
2020-09-15 1:32 ` Wei Yang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200712011036.70948-4-richard.weiyang@linux.alibaba.com \
--to=richard.weiyang@linux.alibaba.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).