From: Liam R. Howlett <Liam.Howlett@Oracle.com>
Date: Mon, 21 Sep 2020 14:12:42 +0000 (-0400)
Subject: maple_tree: Fix formatting of extend null
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=288c91e128ce2a81c4bea980faf4fb85b59c4f02;p=users%2Fjedix%2Flinux-maple.git

maple_tree: Fix formatting of extend null

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

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index d3342ec10e3ab..2742a0a542365 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -2836,8 +2836,7 @@ static inline bool mas_wr_walk(struct ma_state *mas, unsigned long *range_min,
 	return ret;
 }
 
-static inline void mas_extend_null(struct ma_state *l_mas,
-					    struct ma_state *r_mas)
+static inline void mas_extend_null(struct ma_state *l_mas, struct ma_state *r_mas)
 {
 	unsigned char l_slot = mas_offset(l_mas);
 	unsigned char r_slot = mas_offset(r_mas);
@@ -2865,14 +2864,15 @@ static inline void mas_extend_null(struct ma_state *l_mas,
 
 	slots = ma_slots(mte_to_node(r_mas->node),
 			     mte_node_type(r_mas->node));
-	if (!slots[r_slot]) {
+	if (!mas_slot(r_mas, slots, r_slot)) {
 		if (r_mas->last < range_max)
 			r_mas->last = range_max;
 		cp_r_slot++;
 	}
 
 	if (r_mas->last == range_max &&
-	    r_mas->last < r_mas->max && !slots[r_slot + 1]) {
+	    r_mas->last < r_mas->max &&
+	    !mas_slot(r_mas, slots, r_slot + 1)) {
 		r_mas->last = mas_safe_pivot(r_mas, r_slot + 1);
 		cp_r_slot++;
 	}