From: Liam R. Howlett <Liam.Howlett@Oracle.com>
Date: Tue, 21 Apr 2020 19:52:31 +0000 (-0400)
Subject: maple_tree: Fix gap on skip entries caused by relocated data.
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=195746d336bb3e053783d02c3ad7c15fb0102a8c;p=users%2Fjedix%2Flinux-maple.git

maple_tree: Fix gap on skip entries caused by relocated data.

The gap should be zero for skip entries.

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

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index bcf03a1fccebc..d11b98b781e48 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -2355,6 +2355,8 @@ curr_is_empty:
 	mas_dup_state(&parent, &next);
 	mas_ascend(&parent);
 	mte_set_rcu_slot(parent.node, slot, XA_SKIP_ENTRY); // relocated.
+	if (mt_is_alloc(mas->tree))
+		mte_set_gap(parent.node, slot, 0);
 	mte_set_parent(next.node, mn, mte_parent_slot(curr.node));
 
 	mte_free(curr.node);