[PATCH] lib/test_rhashtable: Remove set but unused variable 'insert_retries'

[PATCH] lib/test_rhashtable: Remove set but unused variable 'insert_retries'

[Jiapeng Chong]

Variable 'insert_retries' is not effectively used in the function, so
delete it.

lib/test_rhashtable.c:437:18: warning: variable 'insert_retries' set but not used.

Link: https://bugzilla.openanolis.cn/show_bug.cgi?id=3242
Reported-by: Abaci Robot <abaci@linux.alibaba.com>
Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
---
 lib/test_rhashtable.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/test_rhashtable.c b/lib/test_rhashtable.c
index 6a8e445c8b55..a7bf3b40b67b 100644
--- a/lib/test_rhashtable.c
+++ b/lib/test_rhashtable.c
@@ -434,7 +434,7 @@ static int __init test_rhltable(unsigned int entries)
 static int __init test_rhashtable_max(struct test_obj *array,
 				      unsigned int entries)
 {
-	unsigned int i, insert_retries = 0;
+	unsigned int i;
 	int err;
 
 	test_rht_params.max_size = roundup_pow_of_two(entries / 8);
@@ -447,9 +447,7 @@ static int __init test_rhashtable_max(struct test_obj *array,
 
 		obj->value.id = i * 2;
 		err = insert_retry(&ht, obj, test_rht_params);
-		if (err > 0)
-			insert_retries += err;
-		else if (err)
+		if (err)
 			return err;
 	}
 
-- 
2.20.1.7.g153144c

Re: [PATCH] lib/test_rhashtable: Remove set but unused variable 'insert_retries'

[Herbert Xu]

On Wed, Nov 23, 2022 at 11:59:51AM +0800, Jiapeng Chong wrote:
>
> @@ -447,9 +447,7 @@ static int __init test_rhashtable_max(struct test_obj *array,
>  
>  		obj->value.id = i * 2;
>  		err = insert_retry(&ht, obj, test_rht_params);
> -		if (err > 0)
> -			insert_retries += err;
> -		else if (err)
> +		if (err)

This is wrong as you will now abort on a retried insertion.  You
should instead test for err < 0.

Thanks,
-- 
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt