re-enable testing of size

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

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index dd8f6596b3532bd06f24773a85c58aa538d95bfe..b31140f4839718476282281e13a20f370e200739 100644 (file)
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -1363,7 +1363,7 @@ static void mas_node_count_gfp(struct ma_state *mas, int count, gfp_t gfp)
  */
 static void mas_node_count(struct ma_state *mas, int count)
 {
-       return mas_node_count_gfp(mas, count*2, GFP_NOWAIT);
+       return mas_node_count_gfp(mas, count, GFP_NOWAIT);
 }
 
 /*

diff --git a/lib/test_maple_tree.c b/lib/test_maple_tree.c
index 1e2c41cb24af9fb4cf2ab6c055f526f79c3de4a1..08033fa7a236b35420b4bd7c38c0dc0514c7eb8b 100644 (file)
--- a/lib/test_maple_tree.c
+++ b/lib/test_maple_tree.c
@@ -1065,8 +1065,6 @@ static noinline void __init check_ranges(struct maple_tree *mt)
        check_load(mt, 135, NULL);
        check_load(mt, 140, NULL);
        mt_validate(mt);
-       mt_dump(mt, mt_dump_hex);
-       //exit(0);
        mt_set_non_kernel(0);
        MT_BUG_ON(mt, !mt_height(mt));
        mtree_destroy(mt);

diff --git a/tools/testing/radix-tree/maple.c b/tools/testing/radix-tree/maple.c
index 64267e397762e114ef7e9addd72e5b7e9757f8cd..c397cddf353f7a8d378e5d6d346e3f8b4d0f6b5b 100644 (file)
--- a/tools/testing/radix-tree/maple.c
+++ b/tools/testing/radix-tree/maple.c
@@ -99,7 +99,6 @@ static noinline void __init check_new_node(struct maple_tree *mt)
        int i, j, total;
 
        MA_STATE(mas, mt, 0, 0);
-       return;
 
        check_mas_alloc_node_count(&mas);
 
@@ -35705,8 +35704,6 @@ static noinline void __init check_prealloc(struct maple_tree *mt)
        height = mas_mt_height(&mas);
        MT_BUG_ON(mt, allocated != 0);
 
-       return;
-       /*FIXME */
        /* Chaining multiple preallocations */
        mt_set_in_rcu(mt);
        mas_set_range(&mas, 800, 805); /* Slot store, should be 0 allocations */