From: Liam R. Howlett <Liam.Howlett@Oracle.com>
Date: Fri, 17 Jul 2020 01:11:03 +0000 (-0400)
Subject: maple_tree: wip, add maple_subtree_state
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=de0b4ffb125346985295f3df468c414b520c8602;p=users%2Fjedix%2Flinux-maple.git

maple_tree: wip, add maple_subtree_state

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

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index aa1c154e6cf3..9cfaae1c6809 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -2034,6 +2034,8 @@ static inline int mas_combine_separate(struct ma_state *mas,
 		mast->orig_l->last = mast->orig_l->max;
 
 
+		if (mast->bn->b_end > mt_min_slot_cnt(mast->orig_l->node))
+			continue;
 		// Attempt to balance from this parent
 		if (mast->bn->b_end - 1 < mt_min_slot_cnt(mast->orig_l->node)) {
 			unsigned char end;