maple_tree: Separate wr_split_store and wr_rebalance store type code

path

The split and rebalance store types both go through the same function
that uses the big node.  Separate the code paths so that each can be
updated independently.

No functional change intended

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

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index f587b3c14905e573ee0a474f76f1557739d79443..0b110e6ffe81cbb0c1f7b5f9e596a281f78f46b1 100644 (file)
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -3978,24 +3978,6 @@ static void mas_split(struct ma_state *mas, struct maple_big_node *b_node)
        return;
 }
 
-/*
- * mas_commit_b_node() - Commit the big node into the tree.
- * @wr_mas: The maple write state
- * @b_node: The maple big node
- */
-static noinline_for_kasan void mas_commit_b_node(struct ma_wr_state *wr_mas,
-                           struct maple_big_node *b_node)
-{
-       enum store_type type = wr_mas->mas->store_type;
-
-       WARN_ON_ONCE(type != wr_rebalance && type != wr_split_store);
-
-       if (type == wr_rebalance)
-               return mas_rebalance(wr_mas->mas, b_node);
-
-       return mas_split(wr_mas->mas, b_node);
-}
-
 /*
  * mas_root_expand() - Expand a root to a node
  * @mas: The maple state
@@ -4619,19 +4601,34 @@ static inline void mas_wr_append(struct ma_wr_state *wr_mas,
 }
 
 /*
- * mas_wr_bnode() - Slow path for a modification.
+ * mas_wr_split() - Expand one node into two
  * @wr_mas: The write maple state
- *
- * This is where split, rebalance end up.
  */
-static void mas_wr_bnode(struct ma_wr_state *wr_mas)
+static noinline_for_kasan void mas_wr_split(struct ma_wr_state *wr_mas)
 {
        struct maple_big_node b_node;
 
        trace_ma_write(__func__, wr_mas->mas, 0, wr_mas->entry);
        memset(&b_node, 0, sizeof(struct maple_big_node));
        mas_store_b_node(wr_mas, &b_node, wr_mas->offset_end);
-       mas_commit_b_node(wr_mas, &b_node);
+       WARN_ON_ONCE(wr_mas->mas->store_type != wr_split_store);
+       return mas_split(wr_mas->mas, &b_node);
+}
+
+/*
+ * mas_wr_rebalance() - Insufficient data in one node needs to either get data
+ * from a sibling or absorb a sibling all together.
+ * @wr_mas: The write maple state
+ */
+static noinline_for_kasan void mas_wr_rebalance(struct ma_wr_state *wr_mas)
+{
+       struct maple_big_node b_node;
+
+       trace_ma_write(__func__, wr_mas->mas, 0, wr_mas->entry);
+       memset(&b_node, 0, sizeof(struct maple_big_node));
+       mas_store_b_node(wr_mas, &b_node, wr_mas->offset_end);
+       WARN_ON_ONCE(wr_mas->mas->store_type != wr_rebalance);
+       return mas_rebalance(wr_mas->mas, &b_node);
 }
 
 /*
@@ -4662,8 +4659,10 @@ static inline void mas_wr_store_entry(struct ma_wr_state *wr_mas)
                mas_wr_spanning_store(wr_mas);
                break;
        case wr_split_store:
+               mas_wr_split(wr_mas);
+               break;
        case wr_rebalance:
-               mas_wr_bnode(wr_mas);
+               mas_wr_rebalance(wr_mas);
                break;
        case wr_new_root:
                mas_new_root(mas, wr_mas->entry);