maple_tree: Change adopt_Children to use ma_get_slots

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

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index 52c0b93a8b6c8860a2f8cb3e22d368f1c2e16d29..c4e768ef7fcb5a6db5c9f9ee141b0d868dd11f22 100644 (file)
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -1264,18 +1264,15 @@ static inline void mas_adopt_children(struct ma_state *mas,
 {
 
        enum maple_type type = mte_node_type(parent);
-       unsigned char slot_cnt = mt_slots[type];
+       void **slots = ma_get_slots(mte_to_node(mas->node), type);
        struct maple_enode *child;
-       unsigned char slot;
+       unsigned char offset;
 
-       for (slot = 0; slot < slot_cnt; slot++) {
-               if (slot != 0 && slot < slot_cnt - 1 &&
-                   _mte_get_pivot(parent, slot, type) == 0)
+       for (offset = 0; offset < mt_slots[type]; offset++) {
+               child = slots[offset];
+               if (!child)
                        break;
-
-               child = _mte_get_slot(parent, slot, type, mas->tree);
-               if (child)
-                       mte_set_parent(child, parent, slot);
+               mte_set_parent(child, parent, offset);
        }
 }