tracing: Rename ftrace_trigger_soft_disabled() to trace_trigger_soft_disabled()

The name "ftrace" really refers to the function hook infrastructure. It
is not about the trace_events. The ftrace_trigger_soft_disabled() tests if a
trace_event is soft disabled (called but not traced), and returns true if
it is. It has nothing to do with function tracing and should be renamed.

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

diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h
index a46c138b2eeace62991c1a5ac31a70f32c5e9f3d..1063c850dbab695046d973c5e91a9af499d15fee 100644 (file)
--- a/include/linux/trace_events.h
+++ b/include/linux/trace_events.h
@@ -426,7 +426,7 @@ extern void event_triggers_post_call(struct trace_event_file *file,
                                     enum event_trigger_type tt);
 
 /**
- * ftrace_trigger_soft_disabled - do triggers and test if soft disabled
+ * trace_trigger_soft_disabled - do triggers and test if soft disabled
  * @file: The file pointer of the event to test
  *
  * If any triggers without filters are attached to this event, they
@@ -435,7 +435,7 @@ extern void event_triggers_post_call(struct trace_event_file *file,
  * otherwise false.
  */
 static inline bool
-ftrace_trigger_soft_disabled(struct trace_event_file *file)
+trace_trigger_soft_disabled(struct trace_event_file *file)
 {
        unsigned long eflags = file->flags;
 

diff --git a/include/trace/perf.h b/include/trace/perf.h
index 792eca92c43a0ba435a49022161de6bb290bf16e..c9b831f3da23ad8e682fdcdc80696be1fea193da 100644 (file)
--- a/include/trace/perf.h
+++ b/include/trace/perf.h
@@ -159,7 +159,7 @@ ftrace_raw_event_##call(void *__data, proto)                                \
        struct ftrace_raw_##call *entry;                                \
        int __data_size;                                                \
                                                                        \
-       if (ftrace_trigger_soft_disabled(trace_file))                   \
+       if (trace_trigger_soft_disabled(trace_file))                    \
                return;                                                 \
                                                                        \
        __data_size = ftrace_get_offsets_##call(&__data_offsets, args); \

diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index 4ce865dae39e684e91546580939de38ffb771eac..b7d0cdd9906c1ff3e76f964f28f3a88661be2c59 100644 (file)
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -928,7 +928,7 @@ __kprobe_trace_func(struct trace_kprobe *tk, struct pt_regs *regs,
 
        WARN_ON(call != trace_file->event_call);
 
-       if (ftrace_trigger_soft_disabled(trace_file))
+       if (trace_trigger_soft_disabled(trace_file))
                return;
 
        local_save_flags(irq_flags);
@@ -976,7 +976,7 @@ __kretprobe_trace_func(struct trace_kprobe *tk, struct kretprobe_instance *ri,
 
        WARN_ON(call != trace_file->event_call);
 
-       if (ftrace_trigger_soft_disabled(trace_file))
+       if (trace_trigger_soft_disabled(trace_file))
                return;
 
        local_save_flags(irq_flags);

diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
index 504f582b15dbb0944e0ad30d886437c26f2b785c..7d567a4b9fa7b1cb6930c165b86f79a136b09e17 100644 (file)
--- a/kernel/trace/trace_syscalls.c
+++ b/kernel/trace/trace_syscalls.c
@@ -312,7 +312,7 @@ static void ftrace_syscall_enter(void *data, struct pt_regs *regs, long id)
        if (!trace_file)
                return;
 
-       if (ftrace_trigger_soft_disabled(trace_file))
+       if (trace_trigger_soft_disabled(trace_file))
                return;
 
        sys_data = syscall_nr_to_meta(syscall_nr);
@@ -359,7 +359,7 @@ static void ftrace_syscall_exit(void *data, struct pt_regs *regs, long ret)
        if (!trace_file)
                return;
 
-       if (ftrace_trigger_soft_disabled(trace_file))
+       if (trace_trigger_soft_disabled(trace_file))
                return;
 
        sys_data = syscall_nr_to_meta(syscall_nr);

diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
index 40764abc7d09fa45c19348f3e4c1bcaffd333b46..aa1ea7b36fa889877bb790831a01a8d14b472221 100644 (file)
--- a/kernel/trace/trace_uprobe.c
+++ b/kernel/trace/trace_uprobe.c
@@ -784,7 +784,7 @@ static void __uprobe_trace_func(struct trace_uprobe *tu,
        if (WARN_ON_ONCE(tu->tp.size + dsize > PAGE_SIZE))
                return;
 
-       if (ftrace_trigger_soft_disabled(trace_file))
+       if (trace_trigger_soft_disabled(trace_file))
                return;
 
        esize = SIZEOF_TRACE_ENTRY(is_ret_probe(tu));