maple_tree: Drop 128B node support

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

diff --git a/include/linux/maple_tree.h b/include/linux/maple_tree.h
index 5b428896923771d63b8d00f9e8a4c864c1a9550f..6ca90fc6693c74c25515bb9c4d7cb5d5de881b6c 100644 (file)
--- a/include/linux/maple_tree.h
+++ b/include/linux/maple_tree.h
@@ -26,20 +26,11 @@
  *
  * Nodes in the tree point to their parent unless bit 0 is set.
  */
-#define NODE256
 #if defined(CONFIG_64BIT) || defined(BUILD_VDSO32_64)
-#if defined(NODE256)
 #define MAPLE_NODE_SLOTS       31      /* 256 bytes including ->parent */
 #define MAPLE_RANGE64_SLOTS    16      /* 256 bytes */
 #define MAPLE_ARANGE64_SLOTS   10      /* 240 bytes */
 #define MAPLE_NODE_MASK                255UL
-#else
-#define MAPLE_NODE_SLOTS       15      /* 128 bytes including ->parent */
-#define MAPLE_RANGE64_SLOTS    8       /* 128 bytes */
-#define MAPLE_ARANGE64_SLOTS   5       /* 120 bytes */
-#define MAPLE_NODE_MASK                127UL
-#endif // End NODE256
-
 #else
 /* Need to do corresponding calculations for 32-bit kernels */
 #endif

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index b58d84fd213436c43c1fa9db7ed26806bad60b41..f98d78e22277dfbd77a4298790c85b136358737b 100644 (file)
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -56,11 +56,7 @@ unsigned char mt_min_slots[] = {
        [maple_dense]           = MAPLE_NODE_SLOTS / 2,
        [maple_leaf_64]         = (MAPLE_RANGE64_SLOTS / 2) - 2,
        [maple_range_64]        = (MAPLE_RANGE64_SLOTS / 2) - 2,
-#if defined(NODE256)
        [maple_arange_64]       = (MAPLE_ARANGE64_SLOTS / 2) - 1,
-#else
-       [maple_arange_64]       = (MAPLE_ARANGE64_SLOTS / 2),
-#endif
 };
 #define mt_min_slot_count(x) mt_min_slots[mte_node_type(x)]
 

diff --git a/lib/test_maple_tree.c b/lib/test_maple_tree.c
index bbf0cc58ccaea28249132868010b51f2973c004d..e5d44dd551ec4273e1eaa5933d508e50410ad790 100644 (file)
--- a/lib/test_maple_tree.c
+++ b/lib/test_maple_tree.c
@@ -35038,7 +35038,6 @@ static noinline void check_gap_combining(struct maple_tree *mt)
        struct maple_enode *mn1, *mn2;
        void *entry;
 
-#if defined(NODE256)
        unsigned long seq100[] = {
                /* 0-5 */
                78, 79, 80,
@@ -35061,31 +35060,6 @@ static noinline void check_gap_combining(struct maple_tree *mt)
                256, 260, 266, 270, 275, 280, 290, 398,
                286, 310,
        };
-#else
-       // Seq test 100 data
-       unsigned long seq100[] = {
-               82, 83, 84,
-               50, 100, 2,
-
-               38, 39, 40, 37,
-               20, 50, 3,
-
-               79, 80, 81,
-               76, 2, 78, 85, 4,
-       };
-       // seq test 2000 data
-       unsigned long seq2000[] = {
-               1792, 1791,
-               1700, 1800, 2,
-       };
-
-       // seq test 400 data
-       unsigned long seq400[] = {
-               376, 391,
-               352, 356, 360, 364, 378, 384, 388, 398,
-               374, 375,
-       };
-#endif
 
        unsigned long index = seq100[0];