maple_tree: Pass maple copy node to mas_wmb_replace()

mas_wmb_replace() is called in three places with the same setup, move
the setup into the function itself.  The function needs to be relocated
as it calls mtree_range_walk().

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

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index fd86808c8f4bc5b2050b0161ecc75bd3a02320a4..3b91fcc874a4c67ea122e4d408e8fe1dead35517 100644 (file)
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -2094,26 +2094,6 @@ static inline void mas_topiary_replace(struct ma_state *mas,
        mas_mat_destroy(mas, &subtrees);
 }
 
-/*
- * mas_wmb_replace() - Write memory barrier and replace
- * @mas: The maple state
- * @old_enode: The old maple encoded node that is being replaced.
- * @new_height: The new height of the tree as a result of the operation
- *
- * Updates gap as necessary.
- */
-static inline void mas_wmb_replace(struct ma_state *mas,
-               struct maple_enode *old_enode, unsigned char new_height)
-{
-       /* Insert the new data in the tree */
-       mas_topiary_replace(mas, old_enode, new_height);
-
-       if (mte_is_leaf(mas->node))
-               return;
-
-       mas_update_gap(mas);
-}
-
 /*
  * node_copy() - Copy from one node to another.
  *
@@ -2277,6 +2257,28 @@ dead_node:
        return NULL;
 }
 
+/*
+ * mas_wmb_replace() - Write memory barrier and replace
+ * @mas: The maple state
+ * @cp: The maple copy node
+ *
+ * Updates gap as necessary.
+ */
+static inline void mas_wmb_replace(struct ma_state *mas, struct maple_copy *cp)
+{
+       struct maple_enode *old_enode;
+
+       old_enode = mas->node;
+       mas->node = cp->slot[0];
+       /* Insert the new data in the tree */
+       mas_topiary_replace(mas, old_enode, cp->height);
+       if (!mte_is_leaf(mas->node))
+               mas_update_gap(mas);
+
+       mtree_range_walk(mas);
+}
+
+
 /*
  * cp_leaf_init() - Initialize a maple_copy node for the leaf level of a
  * spanning store
@@ -3334,7 +3336,6 @@ done:
  */
 static void mas_wr_spanning_store(struct ma_wr_state *wr_mas)
 {
-       struct maple_enode *old_enode;
        struct maple_copy cp;
        struct ma_state *mas;
        struct ma_state sib;
@@ -3402,10 +3403,7 @@ static void mas_wr_spanning_store(struct ma_wr_state *wr_mas)
                cp_data_write(&cp, mas);
        } while (spanning_ascend(&cp, mas, wr_mas, &r_wr_mas, &sib));
 
-       old_enode = mas->node;
-       mas->node = cp.slot[0];
-       mas_wmb_replace(mas, old_enode, cp.height);
-       mtree_range_walk(mas);
+       mas_wmb_replace(mas, &cp);
 }
 
 /*
@@ -3725,7 +3723,6 @@ static inline void split_data(struct maple_copy *cp,
  */
 static void mas_wr_split(struct ma_wr_state *wr_mas)
 {
-       struct maple_enode *old_enode;
        struct ma_state parent;
        struct ma_state *mas;
        struct maple_copy cp;
@@ -3746,10 +3743,7 @@ static void mas_wr_split(struct ma_wr_state *wr_mas)
                cp_data_write(&cp, mas);
        } while (split_ascend(&cp, wr_mas, &sib, &parent));
 
-       old_enode = mas->node;
-       mas->node = cp.slot[0];
-       mas_wmb_replace(mas, old_enode, cp.height);
-       mtree_range_walk(mas);
+       mas_wmb_replace(mas, &cp);
 }
 
 /*
@@ -3762,7 +3756,6 @@ static void mas_wr_split(struct ma_wr_state *wr_mas)
  */
 static void mas_wr_rebalance(struct ma_wr_state *wr_mas)
 {
-       struct maple_enode *old_enode;
        struct ma_state parent;
        struct ma_state *mas;
        struct maple_copy cp;
@@ -3793,10 +3786,7 @@ static void mas_wr_rebalance(struct ma_wr_state *wr_mas)
                cp_data_write(&cp, mas);
        } while (rebalance_ascend(&cp, wr_mas, &sib, &parent));
 
-       old_enode = mas->node;
-       mas->node = cp.slot[0];
-       mas_wmb_replace(mas, old_enode, cp.height);
-       mtree_range_walk(mas);
+       mas_wmb_replace(mas, &cp);
 }
 
 /*