radix tree tests: Convert item_delete_rcu to XArray

In preparation for the removal of the multiorder radix tree code,
convert item_delete_rcu() to use the XArray so it can still be called
for XArrays containing multi-index entries.

Signed-off-by: Matthew Wilcox <willy@infradead.org>

diff --git a/tools/testing/radix-tree/test.c b/tools/testing/radix-tree/test.c
index 19045ce..a15d051 100644 (file)
--- a/tools/testing/radix-tree/test.c
+++ b/tools/testing/radix-tree/test.c
@@ -76,9 +76,9 @@ static void item_free_rcu(struct rcu_head *head)
        free(item);
 }
 
-int item_delete_rcu(struct radix_tree_root *root, unsigned long index)
+int item_delete_rcu(struct xarray *xa, unsigned long index)
 {
-       struct item *item = radix_tree_delete(root, index);
+       struct item *item = xa_erase(xa, index);
 
        if (item) {
                item_sanity(item, index);

diff --git a/tools/testing/radix-tree/test.h b/tools/testing/radix-tree/test.h
index e259c08..1ee4b2c 100644 (file)
--- a/tools/testing/radix-tree/test.h
+++ b/tools/testing/radix-tree/test.h
@@ -15,7 +15,7 @@ int item_insert(struct radix_tree_root *root, unsigned long index);
 void item_sanity(struct item *item, unsigned long index);
 void item_free(struct item *item, unsigned long index);
 int item_delete(struct radix_tree_root *root, unsigned long index);
-int item_delete_rcu(struct radix_tree_root *root, unsigned long index);
+int item_delete_rcu(struct xarray *xa, unsigned long index);
 struct item *item_lookup(struct radix_tree_root *root, unsigned long index);
 
 void item_check_present(struct radix_tree_root *root, unsigned long index);