This now passes all maple tree tests, so should be good to go...
Signed-off-by: Lorenzo Stoakes <lorenzo.stoakes@xxxxxxxxxx>
---
lib/maple_tree.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index 37abf0fe380b..4c0bb56a3142 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -3527,6 +3527,7 @@ static bool mas_wr_walk(struct ma_wr_state *wr_mas)
return true;
}
+// Return whether the node actually contains entries at or greater than wr_mas->mas->index.
static bool mas_wr_walk_index(struct ma_wr_state *wr_mas)
{
struct ma_state *mas = wr_mas->mas;
@@ -3535,8 +3536,11 @@ static bool mas_wr_walk_index(struct ma_wr_state *wr_mas)
mas_wr_walk_descend(wr_mas);
wr_mas->content = mas_slot_locked(mas, wr_mas->slots,
mas->offset);
- if (ma_is_leaf(wr_mas->type))
- return true;
+ if (ma_is_leaf(wr_mas->type)) {
+ unsigned long pivot = wr_mas->pivots[mas->offset];
+
+ return pivot == 0 || mas->index <= pivot;
+ }
mas_wr_walk_traverse(wr_mas);
}
@@ -3696,6 +3700,7 @@ static noinline void mas_wr_spanning_store(struct ma_wr_state *wr_mas)
struct maple_big_node b_node;
struct ma_state *mas;
unsigned char height;
+ bool r_populated;
/* Left and Right side of spanning store */
MA_STATE(l_mas, NULL, 0, 0);
@@ -3737,7 +3742,7 @@ static noinline void mas_wr_spanning_store(struct ma_wr_state *wr_mas)
r_mas.last++;
r_mas.index = r_mas.last;
- mas_wr_walk_index(&r_wr_mas);
+ r_populated = mas_wr_walk_index(&r_wr_mas);
r_mas.last = r_mas.index = mas->last;
/* Set up left side. */
@@ -3759,9 +3764,12 @@ static noinline void mas_wr_spanning_store(struct ma_wr_state *wr_mas)
memset(&b_node, 0, sizeof(struct maple_big_node));
/* Copy l_mas and store the value in b_node. */
+
mas_store_b_node(&l_wr_mas, &b_node, l_mas.end);
+
/* Copy r_mas into b_node. */
- if (r_mas.offset <= r_mas.end)
+
+ if (r_populated && r_mas.offset <= r_mas.end)
mas_mab_cp(&r_mas, r_mas.offset, r_mas.end,
&b_node, b_node.b_end + 1);
else
--
2.46.2
