diff options
| author |   Matthew Wilcox <willy@infradead.org> | 2018-09-22 15:34:28 -0400 |
|---|---|---|
| committer | Matthew Wilcox <willy@infradead.org> | 2018-10-21 10:46:48 -0400 |
| commit | b66b5a48b8a0e43dc114573da11c1a9c586a2d4f (patch) | |
| tree | 4f825deee27540eea0fecc463387de20fa6ce5e6 /tools/testing/radix-tree | |
| parent | radix tree tests: Convert item_kill_tree to XArray (diff) | |
| download | wireguard-linux-b66b5a48b8a0e43dc114573da11c1a9c586a2d4f.tar.xz wireguard-linux-b66b5a48b8a0e43dc114573da11c1a9c586a2d4f.zip | |
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>
Diffstat (limited to 'tools/testing/radix-tree')
| -rw-r--r-- | tools/testing/radix-tree/test.c | 4 | ||||
| -rw-r--r-- | tools/testing/radix-tree/test.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/testing/radix-tree/test.c b/tools/testing/radix-tree/test.c index 19045ce3bd23..a15d0512e633 100644 --- 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 e259c0839d5d..1ee4b2c0ad10 100644 --- 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); |