Merge tag 'platform-drivers-x86-v6.6-5' of git://git.kernel.org/pub/scm/linux/kernel...

[platform/kernel/linux-rpi.git] / lib / test_rhashtable.c

diff --git a/lib/test_rhashtable.c b/lib/test_rhashtable.c
index f2ba578..c20f6cb 100644 (file)
--- a/lib/test_rhashtable.c
+++ b/lib/test_rhashtable.c
@@ -368,8 +368,8 @@ static int __init test_rhltable(unsigned int entries)
 
        pr_info("test %d random rhlist add/delete operations\n", entries);
        for (j = 0; j < entries; j++) {
-               u32 i = prandom_u32_max(entries);
-               u32 prand = prandom_u32_max(4);
+               u32 i = get_random_u32_below(entries);
+               u32 prand = get_random_u32_below(4);
 
                cond_resched();
 
@@ -396,7 +396,7 @@ static int __init test_rhltable(unsigned int entries)
                }
 
                if (prand & 2) {
-                       i = prandom_u32_max(entries);
+                       i = get_random_u32_below(entries);
                        if (test_bit(i, obj_in_table)) {
                                err = rhltable_remove(&rhlt, &rhl_test_objects[i].list_node, test_rht_params);
                                WARN(err, "cannot remove element at slot %d", i);
@@ -434,7 +434,7 @@ out_free:
 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 < 0)
                        return err;
        }