tracing: Pass trace_array to flag_changed callback

As options (flags) may affect instances instead of being global
the flag_changed() callbacks need to receive the trace_array descriptor
of the instance they will be modifying.

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

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index d7dfc7efc4bf5b1e70b6bf59976d56de68cc8831..ee8da93e91e0b7cd2a333fd8c2c645403e8d9afc 100644 (file)
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -3393,7 +3393,7 @@ int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled)
 
        /* Give the tracer a chance to approve the change */
        if (tr->current_trace->flag_changed)
-               if (tr->current_trace->flag_changed(tr->current_trace, mask, !!enabled))
+               if (tr->current_trace->flag_changed(tr, mask, !!enabled))
                        return -EINVAL;
 
        if (enabled)

diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index 649a23d421c1ee6963e48304368988acf7c47601..36e44732c6508e991137875445911571019675ef 100644 (file)
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -358,7 +358,7 @@ struct tracer {
        int                     (*set_flag)(struct trace_array *tr,
                                            u32 old_flags, u32 bit, int set);
        /* Return 0 if OK with change, else return non-zero */
-       int                     (*flag_changed)(struct tracer *tracer,
+       int                     (*flag_changed)(struct trace_array *tr,
                                                u32 mask, int set);
        struct tracer           *next;
        struct tracer_flags     *flags;

diff --git a/kernel/trace/trace_irqsoff.c b/kernel/trace/trace_irqsoff.c
index fd99b0c183acf084a1172fc0932e9073f6451c61..4bf812f454e686a29041ef860f51a6a2beee675b 100644 (file)
--- a/kernel/trace/trace_irqsoff.c
+++ b/kernel/trace/trace_irqsoff.c
@@ -572,8 +572,10 @@ static void irqsoff_function_set(int set)
                unregister_irqsoff_function(is_graph());
 }
 
-static int irqsoff_flag_changed(struct tracer *tracer, u32 mask, int set)
+static int irqsoff_flag_changed(struct trace_array *tr, u32 mask, int set)
 {
+       struct tracer *tracer = tr->current_trace;
+
        if (mask & TRACE_ITER_FUNCTION)
                irqsoff_function_set(set);
 

diff --git a/kernel/trace/trace_sched_wakeup.c b/kernel/trace/trace_sched_wakeup.c
index f0bbdc2610287da0323b0da427b69b5a21288259..e14da5e97a69d86611d236488ce5669a28c64be5 100644 (file)
--- a/kernel/trace/trace_sched_wakeup.c
+++ b/kernel/trace/trace_sched_wakeup.c
@@ -179,8 +179,10 @@ static void wakeup_function_set(int set)
                unregister_wakeup_function(is_graph());
 }
 
-static int wakeup_flag_changed(struct tracer *tracer, u32 mask, int set)
+static int wakeup_flag_changed(struct trace_array *tr, u32 mask, int set)
 {
+       struct tracer *tracer = tr->current_trace;
+
        if (mask & TRACE_ITER_FUNCTION)
                wakeup_function_set(set);