Commit f3f3f009 authored by Frederic Weisbecker's avatar Frederic Weisbecker

tracing/event: Cleanup the useless dentry variable

Cleanup the useless dentry variable while creating a kernel
event set of files. trace_create_file() warns if it fails to
create the file anyway, and we don't store the dentry anywhere.

v2: Fix a small conflict in kernel/trace/trace_events.c
Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Li Zefan <lizf@cn.fujitsu.com>
parent 737f453f
...@@ -898,9 +898,9 @@ event_subsystem_dir(const char *name, struct dentry *d_events) ...@@ -898,9 +898,9 @@ event_subsystem_dir(const char *name, struct dentry *d_events)
"'%s/filter' entry\n", name); "'%s/filter' entry\n", name);
} }
entry = trace_create_file("enable", 0644, system->entry, trace_create_file("enable", 0644, system->entry,
(void *)system->name, (void *)system->name,
&ftrace_system_enable_fops); &ftrace_system_enable_fops);
return system->entry; return system->entry;
} }
...@@ -912,7 +912,6 @@ event_create_dir(struct ftrace_event_call *call, struct dentry *d_events, ...@@ -912,7 +912,6 @@ event_create_dir(struct ftrace_event_call *call, struct dentry *d_events,
const struct file_operations *filter, const struct file_operations *filter,
const struct file_operations *format) const struct file_operations *format)
{ {
struct dentry *entry;
int ret; int ret;
/* /*
...@@ -930,12 +929,12 @@ event_create_dir(struct ftrace_event_call *call, struct dentry *d_events, ...@@ -930,12 +929,12 @@ event_create_dir(struct ftrace_event_call *call, struct dentry *d_events,
} }
if (call->regfunc) if (call->regfunc)
entry = trace_create_file("enable", 0644, call->dir, call, trace_create_file("enable", 0644, call->dir, call,
enable); enable);
if (call->id && call->profile_enable) if (call->id && call->profile_enable)
entry = trace_create_file("id", 0444, call->dir, call, trace_create_file("id", 0444, call->dir, call,
id); id);
if (call->define_fields) { if (call->define_fields) {
ret = call->define_fields(call); ret = call->define_fields(call);
...@@ -944,16 +943,16 @@ event_create_dir(struct ftrace_event_call *call, struct dentry *d_events, ...@@ -944,16 +943,16 @@ event_create_dir(struct ftrace_event_call *call, struct dentry *d_events,
" events/%s\n", call->name); " events/%s\n", call->name);
return ret; return ret;
} }
entry = trace_create_file("filter", 0644, call->dir, call, trace_create_file("filter", 0644, call->dir, call,
filter); filter);
} }
/* A trace may not want to export its format */ /* A trace may not want to export its format */
if (!call->show_format) if (!call->show_format)
return 0; return 0;
entry = trace_create_file("format", 0444, call->dir, call, trace_create_file("format", 0444, call->dir, call,
format); format);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment