From: Liam R. Howlett <Liam.Howlett@oracle.com>
Date: Thu, 18 Nov 2021 04:05:18 +0000 (-0500)
Subject: maple_tree: Whitespace fix
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6c9a0f759d12cdad52f29d49e1e58be9bd4da220;p=users%2Fjedix%2Flinux-maple.git

maple_tree: Whitespace fix

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

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index 48b12e2a16b8..fc4b8799f20b 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -125,7 +125,6 @@ static unsigned int mt_height(const struct maple_tree *mt)
 	return (mt->ma_flags & MT_FLAGS_HEIGHT_MASK) >> MT_FLAGS_HEIGHT_OFFSET;
 }
 
-
 static void mas_set_height(struct ma_state *mas)
 {
 	unsigned int new_flags = mas->tree->ma_flags;
@@ -376,7 +375,6 @@ enum maple_type mte_parent_enum(struct maple_enode *p_enode,
 	p_type &= MAPLE_NODE_MASK;
 	p_type = p_type & ~(MAPLE_PARENT_ROOT | mte_parent_slot_mask(p_type));
 
-
 	switch (p_type) {
 	case MAPLE_PARENT_RANGE64: /* or MAPLE_PARENT_ARANGE64 */
 		if (mt_is_alloc(mt))
@@ -462,7 +460,6 @@ static inline struct maple_node *mte_parent(const struct maple_enode *enode)
 			(mte_to_node(enode)->parent) & ~MAPLE_NODE_MASK);
 }
 
-
 /*
  * ma_dead_node() - check if the @enode is dead.
  * @enode: The encoded maple node
@@ -1030,7 +1027,6 @@ static int mas_ascend(struct ma_state *mas)
 	unsigned char offset;
 	bool set_max = false, set_min = false;
 
-
 	a_node = mas_mn(mas);
 	if (ma_is_root(a_node)) {
 		mas->offset = 0;
@@ -1307,7 +1303,6 @@ static inline struct maple_enode *mas_start(struct ma_state *mas)
 		if (unlikely(!root))
 			goto done;
 
-
 		if (likely(xa_is_node(root))) {
 			mas->node = mte_safe_root(root);
 		} else {
@@ -1339,7 +1334,6 @@ static inline unsigned char ma_data_end(struct maple_node *node,
 	if (likely(!pivots[offset]))
 		return ma_meta_end(node, type);
 
-
 	if (likely(pivots[offset] == max))
 		return offset;
 
@@ -1372,7 +1366,6 @@ static inline unsigned char mas_data_end(struct ma_state *mas)
 	if (likely(!pivots[offset]))
 		return ma_meta_end(node, type);
 
-
 	if (likely(pivots[offset] == mas->max))
 		return offset;
 
@@ -1643,7 +1636,6 @@ static inline void mas_replace(struct ma_state *mas, bool advanced)
 	unsigned char offset = 0;
 	void __rcu **slots = NULL;
 
-
 	if (ma_is_root(mn)) {
 		old_enode = mas_root_locked(mas);
 	} else {
@@ -1959,7 +1951,6 @@ static inline void mas_descend_adopt(struct ma_state *mas)
 	}
 	next[0] = *mas;
 
-
 	while (!mte_is_leaf(list[0].node)) {
 		n = 0;
 		for (i = 0; i < 3; i++) {
@@ -2215,7 +2206,6 @@ static inline void mast_topiary(struct maple_subtree_state *mast)
 	void __rcu **slots;
 	struct ma_wr_state wr_mas;
 
-
 	wr_mas.mas = mast->orig_l;
 	wr_mas.type = mte_node_type(mast->orig_l->node);
 	/* The left node is consumed, so add to the free list. */
@@ -2380,6 +2370,7 @@ mast_ascend_free(struct maple_subtree_state *mast)
 	mas_ascend(mast->orig_l);
 	mas_ascend(mast->orig_r);
 	mat_add(mast->free, left);
+
 	if (left != right)
 		mat_add(mast->free, right);
 
@@ -2847,7 +2838,6 @@ static int mas_spanning_rebalance(struct ma_state *mas,
 		if (mas_is_root_limits(mast->orig_l))
 			break;
 
-
 		/* Try to get enough data for the next iteration. */
 		if (!mast_sibling_rebalance_right(mast, true))
 			if (!mast_cousin_rebalance_right(mast, true))
@@ -2919,7 +2909,6 @@ static inline int mas_rebalance(struct ma_state *mas,
 	if (mas_is_err(mas))
 		return 0;
 
-
 	mast.orig_l = &l_mas;
 	mast.orig_r = &r_mas;
 	mast.bn = b_node;
@@ -3039,7 +3028,6 @@ static inline void mas_destroy_rebalance(struct ma_state *mas, unsigned char end
 	ma_set_meta(new_left, mt, 0, split);
 	l_mas.node = mt_mk_node(new_left, mt);
 
-
 	/* replace parent. */
 	offset = mte_parent_slot(mas->node);
 	mt = mas_parent_enum(&l_mas, l_mas.node);
@@ -3448,7 +3436,6 @@ static inline int mas_root_expand(struct ma_state *mas, void *entry)
 	unsigned long *pivots;
 	int slot = 0;
 
-
 	mas_node_count(mas, 1);
 	if (unlikely(mas_is_err(mas)))
 		return 0;
@@ -3482,7 +3469,6 @@ static inline int mas_root_expand(struct ma_state *mas, void *entry)
 	return slot;
 }
 
-
 static inline void mas_store_root(struct ma_state *mas, void *entry)
 {
 	if (likely((mas->last != 0) || (mas->index != 0)))
@@ -3516,7 +3502,6 @@ static bool mas_is_span_wr(struct ma_wr_state *wr_mas)
 	enum maple_type type = wr_mas->type;
 	void *entry = wr_mas->entry;
 
-
 	/* Contained in this pivot */
 	if (piv > last)
 		return false;
@@ -6954,6 +6939,7 @@ void mt_validate_nulls(struct maple_tree *mt)
 
 	} while (!mas_is_none(&mas));
 }
+
 /*
  * validate a maple tree by checking:
  * 1. The limits (pivots are within mas->min to mas->max)
@@ -6994,4 +6980,5 @@ done:
 	rcu_read_unlock();
 
 }
+
 #endif /* CONFIG_DEBUG_MAPLE_TREE */