[PATCH -next] radix tree test suite: Remove usage of the deprecated ida_simple_xx() API

[PATCH -next] radix tree test suite: Remove usage of the deprecated ida_simple_xx() API

[Hongbo Li]

ida_alloc() and ida_free() should be preferred to the deprecated
ida_simple_get() and ida_simple_remove().

Note that the upper limit of ida_simple_get() is exclusive, but
the one of ida_alloc_max() is inclusive. So a -1 has been added
when needed.

Signed-off-by: Hongbo Li <lihongbo22@huawei.com>
---
 tools/testing/radix-tree/idr-test.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/testing/radix-tree/idr-test.c b/tools/testing/radix-tree/idr-test.c
index 84b8c3c92c79..06ad10b5719c 100644
--- a/tools/testing/radix-tree/idr-test.c
+++ b/tools/testing/radix-tree/idr-test.c
@@ -499,18 +499,18 @@ void ida_check_random(void)
 		goto repeat;
 }
 
-void ida_simple_get_remove_test(void)
+void ida_alloc_free_test(void)
 {
 	DEFINE_IDA(ida);
 	unsigned long i;
 
 	for (i = 0; i < 10000; i++) {
-		assert(ida_simple_get(&ida, 0, 20000, GFP_KERNEL) == i);
+		assert(ida_alloc_max(&ida, 0, 19999, GFP_KERNEL) == i);
 	}
-	assert(ida_simple_get(&ida, 5, 30, GFP_KERNEL) < 0);
+	assert(ida_alloc_max(&ida, 5, 29, GFP_KERNEL) < 0);
 
 	for (i = 0; i < 10000; i++) {
-		ida_simple_remove(&ida, i);
+		ida_free(&ida, i);
 	}
 	assert(ida_is_empty(&ida));
 
@@ -524,7 +524,7 @@ void user_ida_checks(void)
 	ida_check_nomem();
 	ida_check_conv_user();
 	ida_check_random();
-	ida_simple_get_remove_test();
+	ida_alloc_free_test();
 
 	radix_tree_cpu_dead(1);
 }
-- 
2.34.1

Re: [PATCH -next] radix tree test suite: Remove usage of the deprecated ida_simple_xx() API

[Matthew Wilcox]

On Wed, Aug 21, 2024 at 02:59:27PM +0800, Hongbo Li wrote:
> ida_alloc() and ida_free() should be preferred to the deprecated
> ida_simple_get() and ida_simple_remove().

Already sent by Christopher JAILLET.
https://lore.kernel.org/linux-fsdevel/cover.1722853349.git.christophe.jaillet@wanadoo.fr/

Re: [PATCH -next] radix tree test suite: Remove usage of the deprecated ida_simple_xx() API

[Hongbo Li]

On 2024/8/21 20:57, Matthew Wilcox wrote:
> On Wed, Aug 21, 2024 at 02:59:27PM +0800, Hongbo Li wrote:
>> ida_alloc() and ida_free() should be preferred to the deprecated
>> ida_simple_get() and ida_simple_remove().
> 
> Already sent by Christopher JAILLET.
> https://lore.kernel.org/linux-fsdevel/cover.1722853349.git.christophe.jaillet@wanadoo.fr/
> 
ha, I haven't notice that. I'll drop this.

Thanks
Hongbo