tracing: Rename ftrace_data_offset_##call to trace_event_data_offset_##call

The name "ftrace" really refers to the function hook infrastructure. It
is not about the trace_events. The structure ftrace_data_offset_##call is
used to find the offsets of dynamically allocated fields in trace_events.
It has nothing to do with function tracing. Rename it.

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

2 files changed, 6 insertions, 6 deletions

diff --git a/include/trace/perf.h b/include/trace/perf.h
index c3fe3c859a17..1b635c63c600 100644
--- a/include/trace/perf.h
+++ b/include/trace/perf.h
@@ -11,7 +11,7 @@
  * {
  *      struct trace_event_file *trace_file = __data;
  *      struct trace_event_call *event_call = trace_file->event_call;
- *      struct ftrace_data_offsets_<call> __maybe_unused __data_offsets;
+ *      struct trace_event_data_offsets_<call> __maybe_unused __data_offsets;
  *      unsigned long eflags = trace_file->flags;
  *      enum event_trigger_type __tt = ETT_NONE;
  *      struct ring_buffer_event *event;
@@ -154,7 +154,7 @@ static notrace void							\
 trace_event_raw_event_##call(void *__data, proto)                       \
 {                                                                       \
         struct trace_event_file *trace_file = __data;                   \
-        struct ftrace_data_offsets_##call __maybe_unused __data_offsets;\
+        struct trace_event_data_offsets_##call __maybe_unused __data_offsets;\
         struct trace_event_buffer fbuffer;                              \
         struct trace_event_raw_##call *entry;                           \
         int __data_size;                                                \
@@ -293,7 +293,7 @@ static notrace void							\
 perf_trace_##call(void *__data, proto)                                  \
 {                                                                       \
         struct trace_event_call *event_call = __data;                   \
-        struct ftrace_data_offsets_##call __maybe_unused __data_offsets;\
+        struct trace_event_data_offsets_##call __maybe_unused __data_offsets;\
         struct trace_event_raw_##call *entry;                           \
         struct pt_regs *__regs;                                         \
         u64 __addr = 0, __count = 1;                                    \
diff --git a/include/trace/trace_events.h b/include/trace/trace_events.h
index 0e9519d5eacb..18c7c0248aeb 100644
--- a/include/trace/trace_events.h
+++ b/include/trace/trace_events.h
@@ -138,7 +138,7 @@ TRACE_MAKE_SYSTEM_STR();
  *
  * Include the following:
  *
- * struct ftrace_data_offsets_<call> {
+ * struct trace_event_data_offsets_<call> {
  *      u32                             <item1>;
  *      u32                             <item2>;
  *      [...]
@@ -178,7 +178,7 @@ TRACE_MAKE_SYSTEM_STR();
 
 #undef DECLARE_EVENT_CLASS
 #define DECLARE_EVENT_CLASS(call, proto, args, tstruct, assign, print)  \
-        struct ftrace_data_offsets_##call {                             \
+        struct trace_event_data_offsets_##call {                        \
                 tstruct;                                                \
         };
 
@@ -486,7 +486,7 @@ ftrace_define_fields_##call(struct trace_event_call *event_call)	\
 #undef DECLARE_EVENT_CLASS
 #define DECLARE_EVENT_CLASS(call, proto, args, tstruct, assign, print)  \
 static inline notrace int ftrace_get_offsets_##call(                    \
-        struct ftrace_data_offsets_##call *__data_offsets, proto)       \
+        struct trace_event_data_offsets_##call *__data_offsets, proto)  \
 {                                                                       \
         int __data_size = 0;                                            \
         int __maybe_unused __item_length;                               \