mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-10-31 16:48:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

tracing: Introduce remove_event_file_dir()

Browse source 
Preparation for the next patch. Extract the common code from
remove_event_from_tracers() and __trace_remove_event_dirs()
into the new helper, remove_event_file_dir().

The patch looks more complicated than it actually is, it also
moves remove_subsystem() up to avoid the forward declaration.

Link: http://lkml.kernel.org/r/20130726172547.GA3629@redhat.com

Reviewed-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
This commit is contained in:
Oleg Nesterov 2013-07-26 19:25:47 +02:00 committed by Steven Rostedt
parent c5a44a1200
commit f6a84bdc75
1 changed files with 23 additions and 24 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

47
kernel/trace/trace_events.c
View file

@ -409,11 +409,31 @@ static void put_system(struct ftrace_subsystem_dir *dir)
mutex_unlock(&event_mutex); mutex_unlock(&event_mutex);
} }
static void remove_subsystem(struct ftrace_subsystem_dir *dir)
{
if (!dir)
return;
if (!--dir->nr_events) {
debugfs_remove_recursive(dir->entry);
list_del(&dir->list);
__put_system_dir(dir);
}
}
static void *event_file_data(struct file *filp) static void *event_file_data(struct file *filp)
{ {
return ACCESS_ONCE(file_inode(filp)->i_private); return ACCESS_ONCE(file_inode(filp)->i_private);
} }
static void remove_event_file_dir(struct ftrace_event_file *file)
{
list_del(&file->list);
debugfs_remove_recursive(file->dir);
remove_subsystem(file->system);
kmem_cache_free(file_cachep, file);
}
/* /*
* Open and update trace_array ref count. * Open and update trace_array ref count.
* Must have the current trace_array passed to it. * Must have the current trace_array passed to it.
@ -1549,33 +1569,16 @@ event_create_dir(struct dentry *parent,
return 0; return 0;
} }
static void remove_subsystem(struct ftrace_subsystem_dir *dir)
{
if (!dir)
return;
if (!--dir->nr_events) {
debugfs_remove_recursive(dir->entry);
list_del(&dir->list);
__put_system_dir(dir);
}
}
static void remove_event_from_tracers(struct ftrace_event_call *call) static void remove_event_from_tracers(struct ftrace_event_call *call)
{ {
struct ftrace_event_file *file; struct ftrace_event_file *file;
struct trace_array *tr; struct trace_array *tr;
do_for_each_event_file_safe(tr, file) { do_for_each_event_file_safe(tr, file) {
if (file->event_call != call) if (file->event_call != call)
continue; continue;
list_del(&file->list); remove_event_file_dir(file);
debugfs_remove_recursive(file->dir);
remove_subsystem(file->system);
kmem_cache_free(file_cachep, file);
/* /*
* The do_for_each_event_file_safe() is * The do_for_each_event_file_safe() is
* a double loop. After finding the call for this * a double loop. After finding the call for this
@ -2305,12 +2308,8 @@ __trace_remove_event_dirs(struct trace_array *tr)
{ {
struct ftrace_event_file *file, *next; struct ftrace_event_file *file, *next;
list_for_each_entry_safe(file, next, &tr->events, list) { list_for_each_entry_safe(file, next, &tr->events, list)
list_del(&file->list); remove_event_file_dir(file);
debugfs_remove_recursive(file->dir);
remove_subsystem(file->system);
kmem_cache_free(file_cachep, file);
}
} }
static void static void