maple_tree: Don't pass through height in mas_wr_spanning_store

Height is not used locally in the function, so call the height argument
closer to where it is passed in the next level.

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

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index e572d626c2a4beaf71b6f0a8786634dc8a77dc95..8d36715358cabc26d59138af4214d76ef0834fe3 100644 (file)
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -2968,10 +2968,10 @@ static void mas_spanning_rebalance(struct ma_state *mas,
 
 
 static noinline void mas_wr_spanning_rebalance(struct ma_state *mas,
-               struct maple_subtree_state *mast, unsigned char height,
-               struct ma_wr_state *wr_mas)
+               struct maple_subtree_state *mast, struct ma_wr_state *wr_mas)
 {
        struct maple_big_node b_node;
+       unsigned char height;
        MA_STATE(l_mas, mas->tree, mas->index, mas->index);
        MA_STATE(r_mas, mas->tree, mas->index, mas->last);
        MA_STATE(m_mas, mas->tree, mas->index, mas->index);
@@ -3006,6 +3006,7 @@ static noinline void mas_wr_spanning_rebalance(struct ma_state *mas,
            unlikely(mast->bn->b_end <= mt_min_slots[mast->bn->type]))
                mast_spanning_rebalance(mast);
 
+       height = mas_mt_height(mas) + 1;
        mas_spanning_rebalance_loop(mas, mast, height);
 }
 /*
@@ -3786,7 +3787,6 @@ static void mas_wr_spanning_store(struct ma_wr_state *wr_mas)
 {
        struct maple_subtree_state mast;
        struct ma_state *mas;
-       unsigned char height;
 
        /* Left and Right side of spanning store */
        MA_STATE(l_mas, NULL, 0, 0);
@@ -3814,7 +3814,6 @@ static void mas_wr_spanning_store(struct ma_wr_state *wr_mas)
         * Node rebalancing may occur due to this store, so there may be three new
         * entries per level plus a new root.
         */
-       height = mas_mt_height(mas);
 
        /*
         * Set up right side.  Need to get to the next offset after the spanning
@@ -3847,7 +3846,7 @@ static void mas_wr_spanning_store(struct ma_wr_state *wr_mas)
        l_mas = *mas;
        mast.orig_l = &l_mas;
        mast.orig_r = &r_mas;
-       mas_wr_spanning_rebalance(mas, &mast, height + 1, wr_mas);
+       mas_wr_spanning_rebalance(mas, &mast, wr_mas);
 }
 
 /*