rwsem: fix commas in initialisation
PATCH 1/1 rwsem: fix commas in initialisation
Leading comma prevents arbitrary reordering of initialisation clauses. The whole point of C99 initialisation is to allow any such reordering.
---
include/linux/rwsem.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
include/linux/rwsem.h +5 -5
@@ -66,22 +66,22 @@ static inline int rwsem_is_locked(struct rw_semaphore *sem)#ifdef CONFIG_DEBUG_LOCK_ALLOC # define __RWSEM_DEP_MAP_INIT (lockname) \ - , .dep_map = { \ + .dep_map = { \ .name = #lockname, \ .wait_type_inner = LD_WAIT_SLEEP, \ - } + },#else # define __RWSEM_DEP_MAP_INIT (lockname)#endif #ifdef CONFIG_DEBUG_RWSEMS -# define __DEBUG_RWSEM_INITIALIZER (lockname) , .magic = &lockname +# define __DEBUG_RWSEM_INITIALIZER (lockname) .magic = &lockname,#else # define __DEBUG_RWSEM_INITIALIZER (lockname)#endif #ifdef CONFIG_RWSEM_SPIN_ON_OWNER -#define __RWSEM_OPT_INIT (lockname) , .osq = OSQ_LOCK_UNLOCKED +#define __RWSEM_OPT_INIT (lockname) .osq = OSQ_LOCK_UNLOCKED,#else #define __RWSEM_OPT_INIT (lockname)#endif
@@ -90,7 +90,7 @@ static inline int rwsem_is_locked(struct rw_semaphore *sem) { __RWSEM_INIT_COUNT(name), \ .owner = ATOMIC_LONG_INIT(0), \ .wait_list = LIST_HEAD_INIT((name).wait_list), \ - .wait_lock = __RAW_SPIN_LOCK_UNLOCKED(name.wait_lock) \ + .wait_lock =__RAW_SPIN_LOCK_UNLOCKED (name.wait_lock),\ __RWSEM_OPT_INIT(name) \ __DEBUG_RWSEM_INITIALIZER(name) \ __RWSEM_DEP_MAP_INIT(name) }
Peter Zijlstra
maintainerQuoted 2 lines · Alexey Dobriyan
Leading comma prevents arbitrary reordering of initialisation clauses. The whole point of C99 initialisation is to allow any such reordering.
I'm conflicted on this argument, the only reason I'd be inclined to take this patch is that it allows fixing the initialization order to not be random.
That is, I'd fold in the below.
include/linux/rwsem.h +2 -2
@@ -89,9 +89,9 @@ static inline int rwsem_is_locked(struct#define __RWSEM_INITIALIZER (name) \ { __RWSEM_INIT_COUNT(name), \ .owner = ATOMIC_LONG_INIT(0), \ - .wait_list = LIST_HEAD_INIT((name).wait_list), \ - .wait_lock = __RAW_SPIN_LOCK_UNLOCKED(name.wait_lock),\ __RWSEM_OPT_INIT(name) \ + .wait_lock = __RAW_SPIN_LOCK_UNLOCKED(name.wait_lock),\ + .wait_list = LIST_HEAD_INIT((name).wait_list), \ __DEBUG_RWSEM_INITIALIZER(name) \ __RWSEM_DEP_MAP_INIT(name) }
Quoted 7 lines · Peter Zijlstra
Quoted 2 lines · Alexey Dobriyan
Leading comma prevents arbitrary reordering of initialisation clauses. The whole point of C99 initialisation is to allow any such reordering.
I'm conflicted on this argument, the only reason I'd be inclined to take this patch is that it allows fixing the initialization order to not be random.
Yes, this is how the issue was noticed.
include/linux/rwsem.h static inline int rwsem_is_locked(struct · line 94
Quoted 13 lines
That is, I'd fold in the below.
include/linux/rwsem.h +2
-2@@ -89,9 +89,9 @@ static inline int rwsem_is_locked(struct#define __RWSEM_INITIALIZER (name) \ { __RWSEM_INIT_COUNT(name), \ .owner = ATOMIC_LONG_INIT(0), \ - .wait_list = LIST_HEAD_INIT((name).wait_list), \ - .wait_lock = __RAW_SPIN_LOCK_UNLOCKED(name.wait_lock),\ __RWSEM_OPT_INIT(name) \ + .wait_lock = __RAW_SPIN_LOCK_UNLOCKED(name.wait_lock),\ + .wait_list = LIST_HEAD_INIT((name).wait_list), \
One less chunk to compile with g++, a billion to go :^)
The following commit has been merged into the locking/core branch of tip:
The following commit has been merged into the locking/core branch of tip:
Commit-ID: a9232dc5607dbada801f2fe83ea307cda762969a Gitweb: https://git.kernel.org/tip/a9232dc5607dbada801f2fe83ea307cda762969a Author: Alexey Dobriyan <[email protected]> AuthorDate: Sat, 11 Jul 2020 17:59:54 +03:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Thu, 16 Jul 2020 23:19:51 +02:00
rwsem: fix commas in initialisation
Leading comma prevents arbitrary reordering of initialisation clauses. The whole point of C99 initialisation is to allow any such reordering.
--- include/linux/rwsem.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
include/linux/rwsem.h +10 -10
@@ -60,39 +60,39 @@ static inline int rwsem_is_locked(struct rw_semaphore *sem) }#define RWSEM_UNLOCKED_VALUE 0L -#define __RWSEM_INIT_COUNT (name) .count = ATOMIC_LONG_INIT(RWSEM_UNLOCKED_VALUE) +#define __RWSEM_COUNT_INIT (name) .count = ATOMIC_LONG_INIT(RWSEM_UNLOCKED_VALUE)/* Common initializer macros and functions */ #ifdef CONFIG_DEBUG_LOCK_ALLOC # define __RWSEM_DEP_MAP_INIT (lockname) \ - , .dep_map = { \ + .dep_map = { \ .name = #lockname, \ .wait_type_inner = LD_WAIT_SLEEP, \ - } + },#else # define __RWSEM_DEP_MAP_INIT (lockname)#endif #ifdef CONFIG_DEBUG_RWSEMS -# define __DEBUG_RWSEM_INITIALIZER (lockname) , .magic = &lockname +# define __RWSEM_DEBUG_INIT (lockname) .magic = &lockname,#else -# define __DEBUG_RWSEM_INITIALIZER (lockname) +# define __RWSEM_DEBUG_INIT (lockname)#endif #ifdef CONFIG_RWSEM_SPIN_ON_OWNER -#define __RWSEM_OPT_INIT (lockname) , .osq = OSQ_LOCK_UNLOCKED +#define __RWSEM_OPT_INIT (lockname) .osq = OSQ_LOCK_UNLOCKED,#else #define __RWSEM_OPT_INIT (lockname)#endif #define __RWSEM_INITIALIZER (name) \ - { __RWSEM_INIT_COUNT(name), \ + { __RWSEM_COUNT_INIT(name), \ .owner = ATOMIC_LONG_INIT(0), \ - .wait_list = LIST_HEAD_INIT((name).wait_list), \ - .wait_lock = __RAW_SPIN_LOCK_UNLOCKED(name.wait_lock) \ __RWSEM_OPT_INIT(name) \ - __DEBUG_RWSEM_INITIALIZER(name) \ + .wait_lock = __RAW_SPIN_LOCK_UNLOCKED(name.wait_lock),\ + .wait_list = LIST_HEAD_INIT((name).wait_list), \ + __RWSEM_DEBUG_INIT(name) \ __RWSEM_DEP_MAP_INIT(name) }#define DECLARE_RWSEM (name) \