diff options
| author | Oleg Nesterov <oleg@redhat.com> | 2014-07-15 14:48:24 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2014-07-16 14:25:19 -0400 |
| commit | ede392a75090aab49b01ecd6f7694bb9130ad461 (patch) | |
| tree | ee0d47b039c05d67cbfb3607cbddaaa713e425a4 /kernel/trace | |
| parent | b5d09db5ac02660a358f2ac477e85172929e02c8 (diff) | |
tracing/uprobes: Kill the dead TRACE_EVENT_FL_USE_CALL_FILTER logic
alloc_trace_uprobe() sets TRACE_EVENT_FL_USE_CALL_FILTER for unknown
reason and this is simply wrong. Fortunately this has no effect because
register_uprobe_event() clears call->flags after that.
Kill both. This trace_uprobe was kzalloc'ed and we rely on this fact
anyway.
Link: http://lkml.kernel.org/p/20140715184824.GA20505@redhat.com
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | kernel/trace/trace_uprobe.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c index 3c9b97e6b1f4..33ff6a24b802 100644 --- a/kernel/trace/trace_uprobe.c +++ b/kernel/trace/trace_uprobe.c | |||
| @@ -265,7 +265,6 @@ alloc_trace_uprobe(const char *group, const char *event, int nargs, bool is_ret) | |||
| 265 | if (is_ret) | 265 | if (is_ret) |
| 266 | tu->consumer.ret_handler = uretprobe_dispatcher; | 266 | tu->consumer.ret_handler = uretprobe_dispatcher; |
| 267 | init_trace_uprobe_filter(&tu->filter); | 267 | init_trace_uprobe_filter(&tu->filter); |
| 268 | tu->tp.call.flags |= TRACE_EVENT_FL_USE_CALL_FILTER; | ||
| 269 | return tu; | 268 | return tu; |
| 270 | 269 | ||
| 271 | error: | 270 | error: |
| @@ -1292,7 +1291,7 @@ static int register_uprobe_event(struct trace_uprobe *tu) | |||
| 1292 | kfree(call->print_fmt); | 1291 | kfree(call->print_fmt); |
| 1293 | return -ENODEV; | 1292 | return -ENODEV; |
| 1294 | } | 1293 | } |
| 1295 | call->flags = 0; | 1294 | |
| 1296 | call->class->reg = trace_uprobe_register; | 1295 | call->class->reg = trace_uprobe_register; |
| 1297 | call->data = tu; | 1296 | call->data = tu; |
| 1298 | ret = trace_add_event_call(call); | 1297 | ret = trace_add_event_call(call); |
