Skip to content

Commit

Permalink
maple_tree: remove extra space and blank line
Browse files Browse the repository at this point in the history
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.com
Signed-off-by: Vernon Yang <vernon2gm@gmail.com>
Reviewed-by: Liam R. Howlett <Liam.Howlett@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
  • Loading branch information
Vernon Yang authored and Andrew Morton committed Jan 19, 2023
1 parent 80b1d8f commit 831978e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 12 deletions.
2 changes: 0 additions & 2 deletions include/linux/maple_tree.h
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,6 @@ static inline void mas_reset(struct ma_state *mas)
* entry.
*
* Note: may return the zero entry.
*
*/
#define mas_for_each(__mas, __entry, __max) \
while (((__entry) = mas_find((__mas), (__max))) != NULL)
Expand Down Expand Up @@ -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)

{
return (mt->ma_flags & MT_FLAGS_HEIGHT_MASK) >> MT_FLAGS_HEIGHT_OFFSET;
}
Expand Down
14 changes: 4 additions & 10 deletions lib/maple_tree.c
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,6 @@ static void ma_free_rcu(struct maple_node *node)
call_rcu(&node->rcu, mt_free_rcu);
}


static void mas_set_height(struct ma_state *mas)
{
unsigned int new_flags = mas->tree->ma_flags;
Expand Down Expand Up @@ -468,7 +467,7 @@ static inline
void mte_set_parent(struct maple_enode *enode, const struct maple_enode *parent,
unsigned char slot)
{
unsigned long val = (unsigned long) parent;
unsigned long val = (unsigned long)parent;
unsigned long shift;
unsigned long type;
enum maple_type p_type = mte_node_type(parent);
Expand Down Expand Up @@ -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)
{
unsigned long val = (unsigned long) mte_to_node(enode)->parent;
unsigned long val = (unsigned long)mte_to_node(enode)->parent;

/* Root. */
if (val & 1)
Expand Down Expand Up @@ -1278,7 +1277,6 @@ static inline void mas_alloc_nodes(struct ma_state *mas, gfp_t gfp)
mas->alloc->total = success;
mas_set_err(mas, -ENOMEM);
return;

}

/*
Expand Down Expand Up @@ -2946,7 +2944,7 @@ static inline void *mtree_range_walk(struct ma_state *mas)
mas->min = prev_min;
mas->max = prev_max;
mas->node = last;
return (void *) next;
return (void *)next;

dead_node:
mas_reset(mas);
Expand Down Expand Up @@ -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)
{

struct maple_subtree_state mast;
int height = 0;
unsigned char mid_split, split = 0;
Expand Down Expand Up @@ -3892,7 +3889,7 @@ static inline void *mtree_lookup_walk(struct ma_state *mas)
goto dead_node;
} while (!ma_is_leaf(type));

return (void *) next;
return (void *)next;

dead_node:
mas_reset(mas);
Expand Down Expand Up @@ -4710,15 +4707,13 @@ static inline void *mas_next_nentry(struct ma_state *mas,

static inline void mas_rewalk(struct ma_state *mas, unsigned long index)
{

retry:
mas_set(mas, index);
mas_state_walk(mas);
if (mas_is_start(mas))
goto retry;

return;

}

/*
Expand Down Expand Up @@ -5620,7 +5615,6 @@ static void mas_wr_store_setup(struct ma_wr_state *wr_mas)
mas_reset(wr_mas->mas);
}
}

}

/* Interface */
Expand Down

0 comments on commit 831978e

Please sign in to comment.