forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tracing: Kill destroy_call_preds()

Browse source 
Remove destroy_call_preds(). Its only caller, __trace_remove_event_call(),
can use free_event_filter() and nullify ->filter by hand.

Perhaps we could keep this trivial helper although imo it is pointless, but
then it should be static in trace_events.c.

Link: http://lkml.kernel.org/p/20140715184816.GA20495@redhat.com

Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
This commit is contained in:
Oleg Nesterov 2014-07-15 20:48:16 +02:00 • committed by Steven Rostedt
parent 3e5454d656
commit 57375747b6
3 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/linux/ftrace_event.h
View file

@ -404,7 +404,6 @@ enum event_trigger_type {
ETT_EVENT_ENABLE = (1 << 3), ETT_EVENT_ENABLE = (1 << 3),
}; };
extern void destroy_call_preds(struct ftrace_event_call *call);
extern int filter_match_preds(struct event_filter *filter, void *rec); extern int filter_match_preds(struct event_filter *filter, void *rec);
extern int filter_check_discard(struct ftrace_event_file *file, void *rec, extern int filter_check_discard(struct ftrace_event_file *file, void *rec,

3
kernel/trace/trace_events.c
View file

@ -1748,7 +1748,8 @@ static void __trace_remove_event_call(struct ftrace_event_call *call)
{ {
event_remove(call); event_remove(call);
trace_destroy_fields(call); trace_destroy_fields(call);
destroy_call_preds(call); free_event_filter(call->filter);
call->filter = NULL;
} }
static int probe_remove_event_call(struct ftrace_event_call *call) static int probe_remove_event_call(struct ftrace_event_call *call)

6
kernel/trace/trace_events_filter.c
View file

@ -804,12 +804,6 @@ void free_event_filter(struct event_filter *filter)
__free_filter(filter); __free_filter(filter);
} }
void destroy_call_preds(struct ftrace_event_call *call)
{
__free_filter(call->filter);
call->filter = NULL;
}
static struct event_filter *__alloc_filter(void) static struct event_filter *__alloc_filter(void)
{ {
struct event_filter *filter; struct event_filter *filter;