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>

3 files changed, 5 insertions, 5 deletions

diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index 4ce865dae39e..b7d0cdd9906c 100644
--- 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 504f582b15db..7d567a4b9fa7 100644
--- 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 40764abc7d09..aa1ea7b36fa8 100644
--- 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));