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

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.com


Signed-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

include/linux/maple_tree.h

+0 −2
Original line number Diff line number Diff line
@@ -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)
@@ -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;

}

lib/maple_tree.c

+4 −10
Original line number Diff line number Diff line
@@ -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;
@@ -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;



}



/*
@@ -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;
@@ -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)

{



retry:

	mas_set(mas, index);

	mas_state_walk(mas);
@@ -4718,7 +4714,6 @@ static inline void mas_rewalk(struct ma_state *mas, unsigned long index) 
		goto retry;



	return;



}



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

		}

	}



}



/* Interface */