ftrace: rename _hook to _probe

Impact: clean up

Ingo Molnar did not like the _hook naming convention used by the
select function tracer. Luis Claudio R. Goncalves suggested using
the "_probe" extension. This patch implements the change of
calling the functions and variables "_hook" and replacing them
with "_probe".

Signed-off-by: Steven Rostedt <srostedt@redhat.com>

1 files changed, 13 insertions, 13 deletions

diff --git a/kernel/trace/trace_functions.c b/kernel/trace/trace_functions.c
index 021a574c598..6ea73ed03bf 100644
--- a/kernel/trace/trace_functions.c
+++ b/kernel/trace/trace_functions.c
@@ -269,21 +269,21 @@ ftrace_traceoff(unsigned long ip, unsigned long parent_ip, void **data)
 
 static int
 ftrace_trace_onoff_print(struct seq_file *m, unsigned long ip,
-                         struct ftrace_hook_ops *ops, void *data);
+                         struct ftrace_probe_ops *ops, void *data);
 
-static struct ftrace_hook_ops traceon_hook_ops = {
+static struct ftrace_probe_ops traceon_probe_ops = {
         .func                   = ftrace_traceon,
         .print                  = ftrace_trace_onoff_print,
 };
 
-static struct ftrace_hook_ops traceoff_hook_ops = {
+static struct ftrace_probe_ops traceoff_probe_ops = {
         .func                   = ftrace_traceoff,
         .print                  = ftrace_trace_onoff_print,
 };
 
 static int
 ftrace_trace_onoff_print(struct seq_file *m, unsigned long ip,
-                         struct ftrace_hook_ops *ops, void *data)
+                         struct ftrace_probe_ops *ops, void *data)
 {
         char str[KSYM_SYMBOL_LEN];
         long count = (long)data;
@@ -291,7 +291,7 @@ ftrace_trace_onoff_print(struct seq_file *m, unsigned long ip,
         kallsyms_lookup(ip, NULL, NULL, NULL, str);
         seq_printf(m, "%s:", str);
 
-        if (ops == &traceon_hook_ops)
+        if (ops == &traceon_probe_ops)
                 seq_printf(m, "traceon");
         else
                 seq_printf(m, "traceoff");
@@ -306,15 +306,15 @@ ftrace_trace_onoff_print(struct seq_file *m, unsigned long ip,
 static int
 ftrace_trace_onoff_unreg(char *glob, char *cmd, char *param)
 {
-        struct ftrace_hook_ops *ops;
+        struct ftrace_probe_ops *ops;
 
         /* we register both traceon and traceoff to this callback */
         if (strcmp(cmd, "traceon") == 0)
-                ops = &traceon_hook_ops;
+                ops = &traceon_probe_ops;
         else
-                ops = &traceoff_hook_ops;
+                ops = &traceoff_probe_ops;
 
-        unregister_ftrace_function_hook_func(glob, ops);
+        unregister_ftrace_function_probe_func(glob, ops);
 
         return 0;
 }
@@ -322,7 +322,7 @@ ftrace_trace_onoff_unreg(char *glob, char *cmd, char *param)
 static int
 ftrace_trace_onoff_callback(char *glob, char *cmd, char *param, int enable)
 {
-        struct ftrace_hook_ops *ops;
+        struct ftrace_probe_ops *ops;
         void *count = (void *)-1;
         char *number;
         int ret;
@@ -336,9 +336,9 @@ ftrace_trace_onoff_callback(char *glob, char *cmd, char *param, int enable)
 
         /* we register both traceon and traceoff to this callback */
         if (strcmp(cmd, "traceon") == 0)
-                ops = &traceon_hook_ops;
+                ops = &traceon_probe_ops;
         else
-                ops = &traceoff_hook_ops;
+                ops = &traceoff_probe_ops;
 
         if (!param)
                 goto out_reg;
@@ -357,7 +357,7 @@ ftrace_trace_onoff_callback(char *glob, char *cmd, char *param, int enable)
                 return ret;
 
  out_reg:
-        ret = register_ftrace_function_hook(glob, ops, count);
+        ret = register_ftrace_function_probe(glob, ops, count);
 
         return ret;
 }