[v1] locking/ww_mutex/test: Use swap() macro

[RESEND PATCH] locking/ww_mutex/test: Use swap() macro

Posted by Thorsten Blum 1 year, 6 months ago

Fixes the following Coccinelle/coccicheck warning reported by
swap.cocci:

  WARNING opportunity for swap()

Compile-tested only.

Acked-by: Waiman Long <longman@redhat.com>
Signed-off-by: Thorsten Blum <thorsten.blum@toblux.com>
---
 kernel/locking/test-ww_mutex.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/kernel/locking/test-ww_mutex.c b/kernel/locking/test-ww_mutex.c
index 78719e1ef1b1..252bef786aef 100644
--- a/kernel/locking/test-ww_mutex.c
+++ b/kernel/locking/test-ww_mutex.c
@@ -402,7 +402,7 @@ static inline u32 prandom_u32_below(u32 ceil)
 static int *get_random_order(int count)
 {
 	int *order;
-	int n, r, tmp;
+	int n, r;
 
 	order = kmalloc_array(count, sizeof(*order), GFP_KERNEL);
 	if (!order)
@@ -413,11 +413,8 @@ static int *get_random_order(int count)
 
 	for (n = count - 1; n > 1; n--) {
 		r = prandom_u32_below(n + 1);
-		if (r != n) {
-			tmp = order[n];
-			order[n] = order[r];
-			order[r] = tmp;
-		}
+		if (r != n)
+			swap(order[n], order[r]);
 	}
 
 	return order;
-- 
2.45.2

Re: [RESEND PATCH] locking/ww_mutex/test: Use swap() macro

Posted by Boqun Feng 1 year, 3 months ago

On Wed, Jul 31, 2024 at 03:58:51PM +0200, Thorsten Blum wrote:
> Fixes the following Coccinelle/coccicheck warning reported by
> swap.cocci:
> 
>   WARNING opportunity for swap()
> 
> Compile-tested only.
> 
> Acked-by: Waiman Long <longman@redhat.com>
> Signed-off-by: Thorsten Blum <thorsten.blum@toblux.com>

Queued into lockdep-for-tip, with additional tags from:

	https://lore.kernel.org/r/20241025081455.55089-1-jiapeng.chong@linux.alibaba.com

Thanks!

Regards,
Boqun

> ---
>  kernel/locking/test-ww_mutex.c | 9 +++------
>  1 file changed, 3 insertions(+), 6 deletions(-)
> 
> diff --git a/kernel/locking/test-ww_mutex.c b/kernel/locking/test-ww_mutex.c
> index 78719e1ef1b1..252bef786aef 100644
> --- a/kernel/locking/test-ww_mutex.c
> +++ b/kernel/locking/test-ww_mutex.c
> @@ -402,7 +402,7 @@ static inline u32 prandom_u32_below(u32 ceil)
>  static int *get_random_order(int count)
>  {
>  	int *order;
> -	int n, r, tmp;
> +	int n, r;
>  
>  	order = kmalloc_array(count, sizeof(*order), GFP_KERNEL);
>  	if (!order)
> @@ -413,11 +413,8 @@ static int *get_random_order(int count)
>  
>  	for (n = count - 1; n > 1; n--) {
>  		r = prandom_u32_below(n + 1);
> -		if (r != n) {
> -			tmp = order[n];
> -			order[n] = order[r];
> -			order[r] = tmp;
> -		}
> +		if (r != n)
> +			swap(order[n], order[r]);
>  	}
>  
>  	return order;
> -- 
> 2.45.2
>