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: Frederic Weisbecker <fweisbec@gmail.com> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Li Zefan <lizf@cn.fujitsu.com>
This commit is contained in:
Родитель
737f453fd1
Коммит
f3f3f00924
|
@ -898,9 +898,9 @@ event_subsystem_dir(const char *name, struct dentry *d_events)
|
|||
"'%s/filter' entry\n", name);
|
||||
}
|
||||
|
||||
entry = trace_create_file("enable", 0644, system->entry,
|
||||
(void *)system->name,
|
||||
&ftrace_system_enable_fops);
|
||||
trace_create_file("enable", 0644, system->entry,
|
||||
(void *)system->name,
|
||||
&ftrace_system_enable_fops);
|
||||
|
||||
return system->entry;
|
||||
}
|
||||
|
@ -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 *format)
|
||||
{
|
||||
struct dentry *entry;
|
||||
int ret;
|
||||
|
||||
/*
|
||||
|
@ -930,12 +929,12 @@ event_create_dir(struct ftrace_event_call *call, struct dentry *d_events,
|
|||
}
|
||||
|
||||
if (call->regfunc)
|
||||
entry = trace_create_file("enable", 0644, call->dir, call,
|
||||
enable);
|
||||
trace_create_file("enable", 0644, call->dir, call,
|
||||
enable);
|
||||
|
||||
if (call->id && call->profile_enable)
|
||||
entry = trace_create_file("id", 0444, call->dir, call,
|
||||
id);
|
||||
trace_create_file("id", 0444, call->dir, call,
|
||||
id);
|
||||
|
||||
if (call->define_fields) {
|
||||
ret = call->define_fields(call);
|
||||
|
@ -944,16 +943,16 @@ event_create_dir(struct ftrace_event_call *call, struct dentry *d_events,
|
|||
" events/%s\n", call->name);
|
||||
return ret;
|
||||
}
|
||||
entry = trace_create_file("filter", 0644, call->dir, call,
|
||||
filter);
|
||||
trace_create_file("filter", 0644, call->dir, call,
|
||||
filter);
|
||||
}
|
||||
|
||||
/* A trace may not want to export its format */
|
||||
if (!call->show_format)
|
||||
return 0;
|
||||
|
||||
entry = trace_create_file("format", 0444, call->dir, call,
|
||||
format);
|
||||
trace_create_file("format", 0444, call->dir, call,
|
||||
format);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче