[PATCH] locking/mutex: Remove repeated declaration

[PATCH] locking/mutex: Remove repeated declaration

[Shaokun Zhang]

Commit 0cd39f4600ed ("locking/seqlock, headers: Untangle the spaghetti monster")
introduces 'struct ww_acquire_ctx' again, remove the repeated declaration.

Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Will Deacon <will@kernel.org>
Cc: Waiman Long <longman@redhat.com>
Cc: Boqun Feng <boqun.feng@gmail.com>
Signed-off-by: Shaokun Zhang <zhangshaokun@hisilicon.com>
---
 include/linux/mutex.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/include/linux/mutex.h b/include/linux/mutex.h
index 0cd631a19727..d80c0e22c822 100644
--- a/include/linux/mutex.h
+++ b/include/linux/mutex.h
@@ -20,8 +20,6 @@
 #include <linux/osq_lock.h>
 #include <linux/debug_locks.h>
 
-struct ww_acquire_ctx;
-
 /*
  * Simple, straightforward mutexes with strict semantics:
  *
-- 
2.7.4

Re: [PATCH] locking/mutex: Remove repeated declaration

[Waiman Long]

On 3/22/21 9:09 PM, Shaokun Zhang wrote:
> Commit 0cd39f4600ed ("locking/seqlock, headers: Untangle the spaghetti monster")
> introduces 'struct ww_acquire_ctx' again, remove the repeated declaration.
>
> Cc: Peter Zijlstra <peterz@infradead.org>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: Will Deacon <will@kernel.org>
> Cc: Waiman Long <longman@redhat.com>
> Cc: Boqun Feng <boqun.feng@gmail.com>
> Signed-off-by: Shaokun Zhang <zhangshaokun@hisilicon.com>
> ---
>   include/linux/mutex.h | 2 --
>   1 file changed, 2 deletions(-)
>
> diff --git a/include/linux/mutex.h b/include/linux/mutex.h
> index 0cd631a19727..d80c0e22c822 100644
> --- a/include/linux/mutex.h
> +++ b/include/linux/mutex.h
> @@ -20,8 +20,6 @@
>   #include <linux/osq_lock.h>
>   #include <linux/debug_locks.h>
>   
> -struct ww_acquire_ctx;
> -
>   /*
>    * Simple, straightforward mutexes with strict semantics:
>    *

Yes, it is duplicated.

Acked-by: Waiman Long <longman@redhat.com>

Re: [PATCH] locking/mutex: Remove repeated declaration

[Ingo Molnar]

* Shaokun Zhang <zhangshaokun@hisilicon.com> wrote:

> Commit 0cd39f4600ed ("locking/seqlock, headers: Untangle the spaghetti monster")
> introduces 'struct ww_acquire_ctx' again, remove the repeated declaration.
> 
> Cc: Peter Zijlstra <peterz@infradead.org>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: Will Deacon <will@kernel.org>
> Cc: Waiman Long <longman@redhat.com>
> Cc: Boqun Feng <boqun.feng@gmail.com>
> Signed-off-by: Shaokun Zhang <zhangshaokun@hisilicon.com>
> ---
>  include/linux/mutex.h | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/include/linux/mutex.h b/include/linux/mutex.h
> index 0cd631a19727..d80c0e22c822 100644
> --- a/include/linux/mutex.h
> +++ b/include/linux/mutex.h
> @@ -20,8 +20,6 @@
>  #include <linux/osq_lock.h>
>  #include <linux/debug_locks.h>
>  
> -struct ww_acquire_ctx;
> -
>  /*
>   * Simple, straightforward mutexes with strict semantics:
>   *

Please also group the pre-declarations together, that's the canonical 
pattern we use in headers.

I.e. have something like this at the top:

  struct ww_class;
  struct ww_acquire_ctx;

Thanks,

	Ingo

Re: [PATCH] locking/mutex: Remove repeated declaration

[Shaokun Zhang]

Hi Ingo,

On 2021/3/23 19:23, Ingo Molnar wrote:
> 
> * Shaokun Zhang <zhangshaokun@hisilicon.com> wrote:
> 
>> Commit 0cd39f4600ed ("locking/seqlock, headers: Untangle the spaghetti monster")
>> introduces 'struct ww_acquire_ctx' again, remove the repeated declaration.
>>
>> Cc: Peter Zijlstra <peterz@infradead.org>
>> Cc: Ingo Molnar <mingo@redhat.com>
>> Cc: Will Deacon <will@kernel.org>
>> Cc: Waiman Long <longman@redhat.com>
>> Cc: Boqun Feng <boqun.feng@gmail.com>
>> Signed-off-by: Shaokun Zhang <zhangshaokun@hisilicon.com>
>> ---
>>  include/linux/mutex.h | 2 --
>>  1 file changed, 2 deletions(-)
>>
>> diff --git a/include/linux/mutex.h b/include/linux/mutex.h
>> index 0cd631a19727..d80c0e22c822 100644
>> --- a/include/linux/mutex.h
>> +++ b/include/linux/mutex.h
>> @@ -20,8 +20,6 @@
>>  #include <linux/osq_lock.h>
>>  #include <linux/debug_locks.h>
>>  
>> -struct ww_acquire_ctx;
>> -
>>  /*
>>   * Simple, straightforward mutexes with strict semantics:
>>   *
> 
> Please also group the pre-declarations together, that's the canonical 
> pattern we use in headers.

Ok,

> 
> I.e. have something like this at the top:
> 

Got it, I will do it in next version.

Thanks,
Shaokun

>   struct ww_class;
>   struct ww_acquire_ctx;
> 
> Thanks,
> 
> 	Ingo
> .
>