radix tree tests: Move item_insert_order

The remaining tests are not suitable for moving in-kernel, so move
item_insert_order() into multiorder.c, make it static and make it use
the XArray.

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

diff --git a/tools/testing/radix-tree/multiorder.c b/tools/testing/radix-tree/multiorder.c
index 6e8d66c2aa89d793484bb88ca3e9f06279e03d38..8c41dca272b153e626713228510055116eada3a4 100644 (file)
--- a/tools/testing/radix-tree/multiorder.c
+++ b/tools/testing/radix-tree/multiorder.c
@@ -20,6 +20,25 @@
 
 #include "test.h"
 
+static int item_insert_order(struct xarray *xa, unsigned long index,
+                       unsigned order)
+{
+       XA_STATE_ORDER(xas, xa, index, order);
+       struct item *item = item_create(index, order);
+
+       do {
+               xas_lock(&xas);
+               xas_store(&xas, item);
+               xas_unlock(&xas);
+       } while (xas_nomem(&xas, GFP_KERNEL));
+
+       if (!xas_error(&xas))
+               return 0;
+
+       free(item);
+       return xas_error(&xas);
+}
+
 void multiorder_iteration(void)
 {
        RADIX_TREE(tree, GFP_KERNEL);

diff --git a/tools/testing/radix-tree/test.c b/tools/testing/radix-tree/test.c
index 5991cfd34f2bf77ef2b9fe67e46cbf58eafb0d51..5376b8c5d8d6459278cf89df889e57f86ef925ae 100644 (file)
--- a/tools/testing/radix-tree/test.c
+++ b/tools/testing/radix-tree/test.c
@@ -34,21 +34,15 @@ struct item *item_create(unsigned long index, unsigned int order)
        return ret;
 }
 
-int item_insert_order(struct radix_tree_root *root, unsigned long index,
-                       unsigned order)
+int item_insert(struct radix_tree_root *root, unsigned long index)
 {
-       struct item *item = item_create(index, order);
-       int err = __radix_tree_insert(root, item->index, item->order, item);
+       struct item *item = item_create(index, 0);
+       int err = radix_tree_insert(root, item->index, item);
        if (err)
                free(item);
        return err;
 }
 
-int item_insert(struct radix_tree_root *root, unsigned long index)
-{
-       return item_insert_order(root, index, 0);
-}
-
 void item_sanity(struct item *item, unsigned long index)
 {
        unsigned long mask;

diff --git a/tools/testing/radix-tree/test.h b/tools/testing/radix-tree/test.h
index 28961a08828e0cb99425b7ee4f337951fca8f08d..e259c0839d5d77b01c180f1faec3bb33588caa27 100644 (file)
--- a/tools/testing/radix-tree/test.h
+++ b/tools/testing/radix-tree/test.h
@@ -14,8 +14,6 @@ struct item *item_create(unsigned long index, unsigned int order);
 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_insert_order(struct radix_tree_root *root, unsigned long index,
-                       unsigned order);
 int item_delete(struct radix_tree_root *root, unsigned long index);
 int item_delete_rcu(struct radix_tree_root *root, unsigned long index);
 struct item *item_lookup(struct radix_tree_root *root, unsigned long index);