maple_tree: Fix tests and search mess

Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index d024f7618e314431921db71699d47485c432ca55..cf92a5fd4f8323b460c30c3b5249624d0ec61ce3 100644 (file)
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -5165,7 +5165,8 @@ unsigned long mt_get_alloc_size(void)
 #else // __KERNEL__ is defined.
 #define MA_PTR "%px"
 #endif
-#if defined (CONFIG_MAPLE_SEARCH)
+
+#ifdef CONFIG_MAPLE_SEARCH
 /* mas limits not adjusted */
 static void mas_dfs_preorder(struct ma_state *mas)
 {
@@ -5210,7 +5211,7 @@ walk_up:
 done:
        mas->node = MAS_NONE;
 }
-
+#ifdef CONFIG_MAPLE_EXTRAS
 static void mas_bfs_preorder(struct ma_state *mas)
 {
 
@@ -5227,6 +5228,8 @@ static void mas_bfs_preorder(struct ma_state *mas)
 }
 #endif
 
+#endif
+
 /* Depth first search, post-order */
 static void mas_dfs_postorder(struct ma_state *mas, unsigned long max)
 {

diff --git a/lib/test_maple_tree.c b/lib/test_maple_tree.c
index df4c15a78421c22e069a6db26430eea11f490e33..3d198b053bc9d585ff729d285ddc93b9edbd0015 100644 (file)
--- a/lib/test_maple_tree.c
+++ b/lib/test_maple_tree.c
@@ -10,6 +10,7 @@
 
 #define MTREE_ALLOC_MAX 0x2000000000000Ul
 #define CONFIG_DEBUG_MAPLE_TREE
+#define CONFIG_MAPLE_SEARCH
 //#define BENCH_SLOT_STORE
 //#define BENCH_NODE_STORE
 //#define BENCH_AWALK

diff --git a/tools/testing/radix-tree/maple.c b/tools/testing/radix-tree/maple.c
index 99013c1cfaf8e6b0341472de7d57a8ba916b29f7..35082671928ad5305efd743d5955f4556f3bba45 100644 (file)
--- a/tools/testing/radix-tree/maple.c
+++ b/tools/testing/radix-tree/maple.c
@@ -5,6 +5,7 @@
  */
 
 #define CONFIG_DEBUG_MAPLE_TREE
+#define CONFIG_MAPLE_SEARCH
 #include "test.h"
 
 #define module_init(x)