Commit 831978e3 authored by Vernon Yang's avatar Vernon Yang Committed by Andrew Morton

maple_tree: remove extra space and blank line

Patch series "Clean up and refinement for maple tree", v2.

This patchset cleans up and refines some maple tree code.  A few small
changes make the code easier to understand and for better readability.


This patch (of 7):

These extra space and blank lines are unnecessary, so drop them.

Link: https://lkml.kernel.org/r/20221221060058.609003-1-vernon2gm@gmail.com
Link: https://lkml.kernel.org/r/20221221060058.609003-2-vernon2gm@gmail.comSigned-off-by: default avatarVernon Yang <vernon2gm@gmail.com>
Reviewed-by: default avatarLiam R. Howlett <Liam.Howlett@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 80b1d8fd
...@@ -517,7 +517,6 @@ static inline void mas_reset(struct ma_state *mas) ...@@ -517,7 +517,6 @@ static inline void mas_reset(struct ma_state *mas)
* entry. * entry.
* *
* Note: may return the zero entry. * Note: may return the zero entry.
*
*/ */
#define mas_for_each(__mas, __entry, __max) \ #define mas_for_each(__mas, __entry, __max) \
while (((__entry) = mas_find((__mas), (__max))) != NULL) while (((__entry) = mas_find((__mas), (__max))) != NULL)
...@@ -639,7 +638,6 @@ static inline void mt_set_in_rcu(struct maple_tree *mt) ...@@ -639,7 +638,6 @@ static inline void mt_set_in_rcu(struct maple_tree *mt)
} }
static inline unsigned int mt_height(const struct maple_tree *mt) static inline unsigned int mt_height(const struct maple_tree *mt)
{ {
return (mt->ma_flags & MT_FLAGS_HEIGHT_MASK) >> MT_FLAGS_HEIGHT_OFFSET; return (mt->ma_flags & MT_FLAGS_HEIGHT_MASK) >> MT_FLAGS_HEIGHT_OFFSET;
} }
......
...@@ -183,7 +183,6 @@ static void ma_free_rcu(struct maple_node *node) ...@@ -183,7 +183,6 @@ static void ma_free_rcu(struct maple_node *node)
call_rcu(&node->rcu, mt_free_rcu); call_rcu(&node->rcu, mt_free_rcu);
} }
static void mas_set_height(struct ma_state *mas) static void mas_set_height(struct ma_state *mas)
{ {
unsigned int new_flags = mas->tree->ma_flags; unsigned int new_flags = mas->tree->ma_flags;
...@@ -468,7 +467,7 @@ static inline ...@@ -468,7 +467,7 @@ static inline
void mte_set_parent(struct maple_enode *enode, const struct maple_enode *parent, void mte_set_parent(struct maple_enode *enode, const struct maple_enode *parent,
unsigned char slot) unsigned char slot)
{ {
unsigned long val = (unsigned long) parent; unsigned long val = (unsigned long)parent;
unsigned long shift; unsigned long shift;
unsigned long type; unsigned long type;
enum maple_type p_type = mte_node_type(parent); enum maple_type p_type = mte_node_type(parent);
...@@ -502,7 +501,7 @@ void mte_set_parent(struct maple_enode *enode, const struct maple_enode *parent, ...@@ -502,7 +501,7 @@ void mte_set_parent(struct maple_enode *enode, const struct maple_enode *parent,
*/ */
static inline unsigned int mte_parent_slot(const struct maple_enode *enode) static inline unsigned int mte_parent_slot(const struct maple_enode *enode)
{ {
unsigned long val = (unsigned long) mte_to_node(enode)->parent; unsigned long val = (unsigned long)mte_to_node(enode)->parent;
/* Root. */ /* Root. */
if (val & 1) if (val & 1)
...@@ -1278,7 +1277,6 @@ static inline void mas_alloc_nodes(struct ma_state *mas, gfp_t gfp) ...@@ -1278,7 +1277,6 @@ static inline void mas_alloc_nodes(struct ma_state *mas, gfp_t gfp)
mas->alloc->total = success; mas->alloc->total = success;
mas_set_err(mas, -ENOMEM); mas_set_err(mas, -ENOMEM);
return; return;
} }
/* /*
...@@ -2946,7 +2944,7 @@ static inline void *mtree_range_walk(struct ma_state *mas) ...@@ -2946,7 +2944,7 @@ static inline void *mtree_range_walk(struct ma_state *mas)
mas->min = prev_min; mas->min = prev_min;
mas->max = prev_max; mas->max = prev_max;
mas->node = last; mas->node = last;
return (void *) next; return (void *)next;
dead_node: dead_node:
mas_reset(mas); mas_reset(mas);
...@@ -3466,7 +3464,6 @@ static inline bool mas_push_data(struct ma_state *mas, int height, ...@@ -3466,7 +3464,6 @@ static inline bool mas_push_data(struct ma_state *mas, int height,
*/ */
static int mas_split(struct ma_state *mas, struct maple_big_node *b_node) static int mas_split(struct ma_state *mas, struct maple_big_node *b_node)
{ {
struct maple_subtree_state mast; struct maple_subtree_state mast;
int height = 0; int height = 0;
unsigned char mid_split, split = 0; unsigned char mid_split, split = 0;
...@@ -3892,7 +3889,7 @@ static inline void *mtree_lookup_walk(struct ma_state *mas) ...@@ -3892,7 +3889,7 @@ static inline void *mtree_lookup_walk(struct ma_state *mas)
goto dead_node; goto dead_node;
} while (!ma_is_leaf(type)); } while (!ma_is_leaf(type));
return (void *) next; return (void *)next;
dead_node: dead_node:
mas_reset(mas); mas_reset(mas);
...@@ -4710,7 +4707,6 @@ static inline void *mas_next_nentry(struct ma_state *mas, ...@@ -4710,7 +4707,6 @@ static inline void *mas_next_nentry(struct ma_state *mas,
static inline void mas_rewalk(struct ma_state *mas, unsigned long index) static inline void mas_rewalk(struct ma_state *mas, unsigned long index)
{ {
retry: retry:
mas_set(mas, index); mas_set(mas, index);
mas_state_walk(mas); mas_state_walk(mas);
...@@ -4718,7 +4714,6 @@ static inline void mas_rewalk(struct ma_state *mas, unsigned long index) ...@@ -4718,7 +4714,6 @@ static inline void mas_rewalk(struct ma_state *mas, unsigned long index)
goto retry; goto retry;
return; return;
} }
/* /*
...@@ -5620,7 +5615,6 @@ static void mas_wr_store_setup(struct ma_wr_state *wr_mas) ...@@ -5620,7 +5615,6 @@ static void mas_wr_store_setup(struct ma_wr_state *wr_mas)
mas_reset(wr_mas->mas); mas_reset(wr_mas->mas);
} }
} }
} }
/* Interface */ /* Interface */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment