tracing: Rename ftrace_event_file to trace_event_file

The name "ftrace" really refers to the function hook infrastructure. It
is not about the trace_events. The structure ftrace_event_file is really
about trace events and not "ftrace". Rename it to trace_event_file.

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

1 files changed, 4 insertions, 4 deletions

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 458031c31a37..dd29e9b6b30e 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -297,7 +297,7 @@ void trace_array_put(struct trace_array *this_tr)
         mutex_unlock(&trace_types_lock);
 }
 
-int filter_check_discard(struct ftrace_event_file *file, void *rec,
+int filter_check_discard(struct trace_event_file *file, void *rec,
                          struct ring_buffer *buffer,
                          struct ring_buffer_event *event)
 {
@@ -1694,13 +1694,13 @@ static struct ring_buffer *temp_buffer;
 
 struct ring_buffer_event *
 trace_event_buffer_lock_reserve(struct ring_buffer **current_rb,
-                          struct ftrace_event_file *ftrace_file,
+                          struct trace_event_file *trace_file,
                           int type, unsigned long len,
                           unsigned long flags, int pc)
 {
         struct ring_buffer_event *entry;
 
-        *current_rb = ftrace_file->tr->trace_buffer.buffer;
+        *current_rb = trace_file->tr->trace_buffer.buffer;
         entry = trace_buffer_lock_reserve(*current_rb,
                                          type, len, flags, pc);
         /*
@@ -1709,7 +1709,7 @@ trace_event_buffer_lock_reserve(struct ring_buffer **current_rb,
          * to store the trace event for the tigger to use. It's recusive
          * safe and will not be recorded anywhere.
          */
-        if (!entry && ftrace_file->flags & FTRACE_EVENT_FL_TRIGGER_COND) {
+        if (!entry && trace_file->flags & FTRACE_EVENT_FL_TRIGGER_COND) {
                 *current_rb = temp_buffer;
                 entry = trace_buffer_lock_reserve(*current_rb,
                                                   type, len, flags, pc);