summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wilcox <willy@infradead.org>2018-09-12 12:52:45 -0400
committerMatthew Wilcox <willy@infradead.org>2018-10-21 10:46:47 -0400
commit9076b33d7dad8e316c90918845417e85347f682c (patch)
treeee62f3aaa6450bd859eed14314f2cc59a91708fa
parentbcfa4b72111c9a4d483024cb1f877803b354aa11 (diff)
radix tree test suite: Remove __item_insert
Inline it into its one caller Signed-off-by: Matthew Wilcox <willy@infradead.org>
-rw-r--r--tools/testing/radix-tree/test.c7
-rw-r--r--tools/testing/radix-tree/test.h1
2 files changed, 1 insertions, 7 deletions
diff --git a/tools/testing/radix-tree/test.c b/tools/testing/radix-tree/test.c
index 32973dd51ec5..5991cfd34f2b 100644
--- a/tools/testing/radix-tree/test.c
+++ b/tools/testing/radix-tree/test.c
@@ -25,11 +25,6 @@ int item_tag_get(struct radix_tree_root *root, unsigned long index, int tag)
25 return radix_tree_tag_get(root, index, tag); 25 return radix_tree_tag_get(root, index, tag);
26} 26}
27 27
28int __item_insert(struct radix_tree_root *root, struct item *item)
29{
30 return __radix_tree_insert(root, item->index, item->order, item);
31}
32
33struct item *item_create(unsigned long index, unsigned int order) 28struct item *item_create(unsigned long index, unsigned int order)
34{ 29{
35 struct item *ret = malloc(sizeof(*ret)); 30 struct item *ret = malloc(sizeof(*ret));
@@ -43,7 +38,7 @@ int item_insert_order(struct radix_tree_root *root, unsigned long index,
43 unsigned order) 38 unsigned order)
44{ 39{
45 struct item *item = item_create(index, order); 40 struct item *item = item_create(index, order);
46 int err = __item_insert(root, item); 41 int err = __radix_tree_insert(root, item->index, item->order, item);
47 if (err) 42 if (err)
48 free(item); 43 free(item);
49 return err; 44 return err;
diff --git a/tools/testing/radix-tree/test.h b/tools/testing/radix-tree/test.h
index a2f53c889a31..28961a08828e 100644
--- a/tools/testing/radix-tree/test.h
+++ b/tools/testing/radix-tree/test.h
@@ -11,7 +11,6 @@ struct item {
11}; 11};
12 12
13struct item *item_create(unsigned long index, unsigned int order); 13struct item *item_create(unsigned long index, unsigned int order);
14int __item_insert(struct radix_tree_root *root, struct item *item);
15int item_insert(struct radix_tree_root *root, unsigned long index); 14int item_insert(struct radix_tree_root *root, unsigned long index);
16void item_sanity(struct item *item, unsigned long index); 15void item_sanity(struct item *item, unsigned long index);
17void item_free(struct item *item, unsigned long index); 16void item_free(struct item *item, unsigned long index);