maple_tree: Create ma_leaf_max_gap() to not depend on maple state

Pass through the min, max, pivots, and slots so that a maple state is not needed.

This is neede dlater to avoid the min and max extraction from the struct which isn't always available.

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

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index 6a78f293951416676f6b28f65ae44636fbe39d3d..5ff76eab36d829baff62fdc8cc47aa186519cbe3 100644 (file)
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -1507,26 +1507,14 @@ void wr_mas_ascend(struct ma_wr_state *wr_mas)
        //WARN_ON_ONCE(wr_mas->end_piv < mas->last);
 }
 
-
-/*
- * mas_leaf_max_gap() - Returns the largest gap in a leaf node
- * @mas: the maple state
- *
- * Return: The maximum gap in the leaf.
- */
-static unsigned long mas_leaf_max_gap(struct ma_state *mas)
+static inline unsigned long ma_leaf_max_gap(struct maple_node *mn,
+               enum maple_type mt, unsigned long min, unsigned long max,
+               unsigned long *pivots, void __rcu **slots)
 {
-       enum maple_type mt;
        unsigned long pstart, gap, max_gap;
-       struct maple_node *mn;
-       unsigned long *pivots;
-       void __rcu **slots;
        unsigned char i;
        unsigned char max_piv;
 
-       mt = mte_node_type(mas->node);
-       mn = mas_mn(mas);
-       slots = ma_slots(mn, mt);
        max_gap = 0;
        if (unlikely(ma_is_dense(mt))) {
                gap = 0;
@@ -1548,26 +1536,25 @@ static unsigned long mas_leaf_max_gap(struct ma_state *mas)
         * Check the first implied pivot optimizes the loop below and slot 1 may
         * be skipped if there is a gap in slot 0.
         */
-       pivots = ma_pivots(mn, mt);
        if (likely(!slots[0])) {
-               max_gap = pivots[0] - mas->min + 1;
+               max_gap = pivots[0] - min + 1;
                i = 2;
        } else {
                i = 1;
        }
 
        /* reduce max_piv as the special case is checked before the loop */
-       max_piv = ma_data_end(mn, mt, pivots, mas->max) - 1;
+       max_piv = ma_data_end(mn, mt, pivots, max) - 1;
        /*
         * Check end implied pivot which can only be a gap on the right most
         * node.
         */
-       if (unlikely(mas->max == ULONG_MAX) && !slots[max_piv + 1]) {
+       if (unlikely(max == ULONG_MAX) && !slots[max_piv + 1]) {
                gap = ULONG_MAX - pivots[max_piv];
                if (gap > max_gap)
                        max_gap = gap;
 
-               if (max_gap > pivots[max_piv] - mas->min)
+               if (max_gap > pivots[max_piv] - min)
                        return max_gap;
        }
 
@@ -1587,6 +1574,27 @@ static unsigned long mas_leaf_max_gap(struct ma_state *mas)
        return max_gap;
 }
 
+/*
+ * mas_leaf_max_gap() - Returns the largest gap in a leaf node
+ * @mas: the maple state
+ *
+ * Return: The maximum gap in the leaf.
+ */
+static unsigned long mas_leaf_max_gap(struct ma_state *mas)
+{
+       enum maple_type mt;
+       struct maple_node *mn;
+       unsigned long *pivots;
+       void __rcu **slots;
+
+       mn = mas_mn(mas);
+       mt = mte_node_type(mas->node);
+       slots = ma_slots(mn, mt);
+       pivots = ma_pivots(mn, mt);
+
+       return ma_leaf_max_gap(mn, mt, mas->min, mas->max, pivots, slots);
+}
+
 /*
  * ma_max_gap() - Get the maximum gap in a maple node (non-leaf)
  * @node: The maple node