tracing/ftrace: Allow instances to have their own function probes

Pass around the local trace_array that is the descriptor for tracing
instances, when enabling and disabling probes. This by default sets the
enable/disable of event probe triggers to work with instances.

The other probes will need some more work to get them working with
instances.

Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 774e9108e5dc323ac2bcdfa405b9f2e0cb3dd165..6615197e65973950d0a4e7460472e16d15a48e6a 100644 (file)
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -3077,7 +3077,7 @@ static void *
 t_probe_next(struct seq_file *m, loff_t *pos)
 {
        struct ftrace_iterator *iter = m->private;
-       struct trace_array *tr = global_ops.private;
+       struct trace_array *tr = iter->ops->private;
        struct list_head *func_probes;
        struct ftrace_hash *hash;
        struct list_head *next;
@@ -4311,7 +4311,7 @@ static int ftrace_process_regex(struct ftrace_iterator *iter,
                                char *buff, int len, int enable)
 {
        struct ftrace_hash *hash = iter->hash;
-       struct trace_array *tr = global_ops.private;
+       struct trace_array *tr = iter->ops->private;
        char *func, *command, *next = buff;
        struct ftrace_func_command *p;
        int ret = -EINVAL;