[PATCH] linux/trace_events.h: Remove duplicate struct declaration

[PATCH] linux/trace_events.h: Remove duplicate struct declaration

[Wan Jiabing]

struct trace_array is declared twice. One has been declared
at forward struct declaration. Remove the duplicate.
And sort these forward declarations alphabetically.

Signed-off-by: Wan Jiabing <wanjiabing@vivo.com>
---
 include/linux/trace_events.h | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h
index 28e7af1406f2..29ae3ec5cab9 100644
--- a/include/linux/trace_events.h
+++ b/include/linux/trace_events.h
@@ -10,11 +10,11 @@
 #include <linux/perf_event.h>
 #include <linux/tracepoint.h>
 
-struct trace_array;
 struct array_buffer;
-struct tracer;
-struct dentry;
 struct bpf_prog;
+struct dentry;
+struct tracer;
+struct trace_array;
 
 const char *trace_print_flags_seq(struct trace_seq *p, const char *delim,
 				  unsigned long flags,
@@ -404,7 +404,6 @@ trace_get_fields(struct trace_event_call *event_call)
 	return event_call->class->get_fields(event_call);
 }
 
-struct trace_array;
 struct trace_subsystem_dir;
 
 enum {
-- 
2.25.1

Re: [PATCH] linux/trace_events.h: Remove duplicate struct declaration

[Steven Rostedt]

On Tue, 30 Mar 2021 09:55:17 +0800
Wan Jiabing <wanjiabing@vivo.com> wrote:

> struct trace_array is declared twice. One has been declared
> at forward struct declaration. Remove the duplicate.
> And sort these forward declarations alphabetically.

Um, no that's not how we sort things.

> 
> Signed-off-by: Wan Jiabing <wanjiabing@vivo.com>
> ---
>  include/linux/trace_events.h | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h
> index 28e7af1406f2..29ae3ec5cab9 100644
> --- a/include/linux/trace_events.h
> +++ b/include/linux/trace_events.h
> @@ -10,11 +10,11 @@
>  #include <linux/perf_event.h>
>  #include <linux/tracepoint.h>
>  
> -struct trace_array;
>  struct array_buffer;
> -struct tracer;
> -struct dentry;
>  struct bpf_prog;
> +struct dentry;
> +struct tracer;
> +struct trace_array;

NAK to the above. If anything, we sort it by length. But the above doesn't
need to be touched.

>  
>  const char *trace_print_flags_seq(struct trace_seq *p, const char *delim,
>  				  unsigned long flags,
> @@ -404,7 +404,6 @@ trace_get_fields(struct trace_event_call *event_call)
>  	return event_call->class->get_fields(event_call);
>  }
>  
> -struct trace_array;

This part is fine.

Thanks,

-- Steve

>  struct trace_subsystem_dir;
>  
>  enum {

Re:Re: [PATCH] linux/trace_events.h: Remove duplicate struct declaration

[万家兵]

 
>On Tue, 30 Mar 2021 09:55:17 +0800>Wan Jiabing <wanjiabing@vivo.com> wrote:
>
>> struct trace_array is declared twice. One has been declared
>> at forward struct declaration. Remove the duplicate.
>> And sort these forward declarations alphabetically.
>
>Um, no that's not how we sort things.
>
>> 
>> Signed-off-by: Wan Jiabing <wanjiabing@vivo.com>
>> ---
>>  include/linux/trace_events.h | 7 +++----
>>  1 file changed, 3 insertions(+), 4 deletions(-)
>> 
>> diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h
>> index 28e7af1406f2..29ae3ec5cab9 100644
>> --- a/include/linux/trace_events.h
>> +++ b/include/linux/trace_events.h
>> @@ -10,11 +10,11 @@
>>  #include <linux/perf_event.h>
>>  #include <linux/tracepoint.h>
>>  
>> -struct trace_array;
>>  struct array_buffer;
>> -struct tracer;
>> -struct dentry;
>>  struct bpf_prog;
>> +struct dentry;
>> +struct tracer;
>> +struct trace_array;
>
>NAK to the above. If anything, we sort it by length. But the above doesn't
>need to be touched.
>

OK, I know. I resend the v2.
Please review.

Yours,
Wan Jiabing

>>  
>>  const char *trace_print_flags_seq(struct trace_seq *p, const char *delim,
>>  				  unsigned long flags,
>> @@ -404,7 +404,6 @@ trace_get_fields(struct trace_event_call *event_call)
>>  	return event_call->class->get_fields(event_call);
>>  }
>>  
>> -struct trace_array;
>
>This part is fine.
>
>Thanks,
>
>-- Steve
>
>>  struct trace_subsystem_dir;
>>  
>>  enum {
>