maple_tree: mas_data_end starts at offset mt_min_slots now

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

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index ec1f782d2a6836b3021f97b0f93275438eba289c..66c539b4c815c8382abb137bddb9023ce3a40c09 100644 (file)
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -1024,15 +1024,23 @@ done:
  */
 static inline unsigned char mas_data_end(const struct ma_state *mas)
 {
-       unsigned char offset = 0;
        enum maple_type type = mte_node_type(mas->node);
+       unsigned char offset = mt_min_slots[type];
        unsigned long piv, *pivots = ma_pivots(mas_mn(mas), type);
 
-       while (offset < mt_slots[type]) {
-               piv = _mas_safe_pivot(mas, pivots, offset, type);
-               if ((!piv && offset) || piv >= mas->max)
-                       break;
-               offset++;
+       if (pivots[offset]) {
+               while (offset < mt_slots[type]) {
+                       piv = _mas_safe_pivot(mas, pivots, offset, type);
+                       if ((!piv && offset) || piv >= mas->max)
+                               break;
+                       offset++;
+               }
+       } else {
+               offset--;
+               do {
+                       if (pivots[offset])
+                               break;
+               } while (--offset);
        }
 
        return offset;