2023-05-04 20:48:52

by Mathieu Desnoyers

[permalink] [raw]
Subject: [RFC PATCH 08/13] llist.h: Fix parentheses around macro pointer parameter use

Add missing parentheses around use of macro argument "pos" in those
patterns to ensure operator precedence behaves as expected:

- typeof(*pos)
- pos->member
- "x = y" is changed for "x = (y)", because "y" can be an expression
containing a comma if it is the result of the expansion of a macro such
as #define eval(...) __VA_ARGS__, which would cause unexpected operator
precedence. This use-case is far-fetched, but we have to choose one
way or the other (with or without parentheses) for consistency.

The typeof(*pos) lack of parentheses around "pos" is not an issue per se
in the specific macros modified here because "pos" is used as an lvalue,
which should prevent use of any operator causing issue. Still add the
extra parentheses for consistency.

Remove useless parentheses around use of macro parameter (node) in the
following patterns:

- llist_entry((node), typeof(*(pos)), member) is changed for
llist_entry(node, typeof(*(pos)), member),
- "(pos) = (node)" is changed for "pos = (node)".

Because comma is the lowest priority operator already, so the extra pair
of parentheses is redundant.

Signed-off-by: Mathieu Desnoyers <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: Huang Ying <[email protected]>
Cc: Peter Zijlstra <[email protected]>
---
include/linux/llist.h | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/linux/llist.h b/include/linux/llist.h
index 85bda2d02d65..4181b34b557f 100644
--- a/include/linux/llist.h
+++ b/include/linux/llist.h
@@ -114,7 +114,7 @@ static inline void init_llist_head(struct llist_head *list)
* reverse the order by yourself before traversing.
*/
#define llist_for_each(pos, node) \
- for ((pos) = (node); pos; (pos) = (pos)->next)
+ for (pos = (node); pos; pos = (pos)->next)

/**
* llist_for_each_safe - iterate over some deleted entries of a lock-less list
@@ -133,7 +133,7 @@ static inline void init_llist_head(struct llist_head *list)
* reverse the order by yourself before traversing.
*/
#define llist_for_each_safe(pos, n, node) \
- for ((pos) = (node); (pos) && ((n) = (pos)->next, true); (pos) = (n))
+ for (pos = (node); (pos) && (n = (pos)->next, true); pos = (n))

/**
* llist_for_each_entry - iterate over some deleted entries of lock-less list of given type
@@ -151,9 +151,9 @@ static inline void init_llist_head(struct llist_head *list)
* reverse the order by yourself before traversing.
*/
#define llist_for_each_entry(pos, node, member) \
- for ((pos) = llist_entry((node), typeof(*(pos)), member); \
+ for (pos = llist_entry(node, typeof(*(pos)), member); \
member_address_is_nonnull(pos, member); \
- (pos) = llist_entry((pos)->member.next, typeof(*(pos)), member))
+ pos = llist_entry((pos)->member.next, typeof(*(pos)), member))

/**
* llist_for_each_entry_safe - iterate over some deleted entries of lock-less list of given type
@@ -173,10 +173,10 @@ static inline void init_llist_head(struct llist_head *list)
* reverse the order by yourself before traversing.
*/
#define llist_for_each_entry_safe(pos, n, node, member) \
- for (pos = llist_entry((node), typeof(*pos), member); \
+ for (pos = llist_entry(node, typeof(*(pos)), member); \
member_address_is_nonnull(pos, member) && \
- (n = llist_entry(pos->member.next, typeof(*n), member), true); \
- pos = n)
+ (n = llist_entry((pos)->member.next, typeof(*(n)), member), true); \
+ pos = (n))

/**
* llist_empty - tests whether a lock-less list is empty
--
2.25.1