diff options
| author | Oleg Nesterov <oleg@redhat.com> | 2014-07-15 20:48:13 +0200 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2014-07-16 14:19:55 -0400 |
| commit | 3e5454d6568c203bca712e1976b052c345f47b44 (patch) | |
| tree | adbb0a9c23491a78f02a88aeb221a9e355f7a1cd /kernel/trace | |
| parent | 97b8ee845393701edc06e27ccec2876ff9596019 (diff) | |
| download | op-kernel-dev-3e5454d6568c203bca712e1976b052c345f47b44.zip op-kernel-dev-3e5454d6568c203bca712e1976b052c345f47b44.tar.gz | |
tracing: Kill destroy_preds() and destroy_file_preds()
destroy_preds() makes no sense.
The only caller, event_remove(), actually wants destroy_file_preds().
__trace_remove_event_call() does destroy_call_preds() which takes care
of call->filter.
And after the previous change we can simply remove destroy_preds() from
event_remove(), we are going to call remove_event_from_tracers() which
in turn calls remove_event_file_dir()->free_event_filter().
Link: http://lkml.kernel.org/p/20140715184813.GA20488@redhat.com
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | kernel/trace/trace_events.c | 1 | ||||
| -rw-r--r-- | kernel/trace/trace_events_filter.c | 20 |
2 files changed, 0 insertions, 21 deletions
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c index 2de53628..85914ed 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c @@ -1621,7 +1621,6 @@ static void event_remove(struct ftrace_event_call *call) if (file->event_call != call) continue; ftrace_event_enable_disable(file, 0); - destroy_preds(file); /* * The do_for_each_event_file() is * a double loop. After finding the call for this diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c index 8a86319..30fc66f 100644 --- a/kernel/trace/trace_events_filter.c +++ b/kernel/trace/trace_events_filter.c @@ -810,26 +810,6 @@ void destroy_call_preds(struct ftrace_event_call *call) call->filter = NULL; } -static void destroy_file_preds(struct ftrace_event_file *file) -{ - __free_filter(file->filter); - file->filter = NULL; -} - -/* - * Called when destroying the ftrace_event_file. - * The file is being freed, so we do not need to worry about - * the file being currently used. This is for module code removing - * the tracepoints from within it. - */ -void destroy_preds(struct ftrace_event_file *file) -{ - if (file->event_call->flags & TRACE_EVENT_FL_USE_CALL_FILTER) - destroy_call_preds(file->event_call); - else - destroy_file_preds(file); -} - static struct event_filter *__alloc_filter(void) { struct event_filter *filter; |
