Commit 46b34584 authored by Vernon Yang's avatar Vernon Yang Committed by Andrew Morton

maple_tree: refine ma_state init from mas_start()

If mas->node is an MAS_START, there are three cases, and they all assign
different values to mas->node and mas->offset.  So there is no need to set
them to a default value before updating.

Update them directly to make them easier to understand and for better
readability.

Link: https://lkml.kernel.org/r/20221221060058.609003-7-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 eabb3052
...@@ -1329,7 +1329,7 @@ static void mas_node_count(struct ma_state *mas, int count) ...@@ -1329,7 +1329,7 @@ static void mas_node_count(struct ma_state *mas, int count)
* mas_start() - Sets up maple state for operations. * mas_start() - Sets up maple state for operations.
* @mas: The maple state. * @mas: The maple state.
* *
* If mas->node == MAS_START, then set the min, max, depth, and offset to * If mas->node == MAS_START, then set the min, max and depth to
* defaults. * defaults.
* *
* Return: * Return:
...@@ -1343,22 +1343,22 @@ static inline struct maple_enode *mas_start(struct ma_state *mas) ...@@ -1343,22 +1343,22 @@ static inline struct maple_enode *mas_start(struct ma_state *mas)
if (likely(mas_is_start(mas))) { if (likely(mas_is_start(mas))) {
struct maple_enode *root; struct maple_enode *root;
mas->node = MAS_NONE;
mas->min = 0; mas->min = 0;
mas->max = ULONG_MAX; mas->max = ULONG_MAX;
mas->depth = 0; mas->depth = 0;
mas->offset = 0;
root = mas_root(mas); root = mas_root(mas);
/* Tree with nodes */ /* Tree with nodes */
if (likely(xa_is_node(root))) { if (likely(xa_is_node(root))) {
mas->depth = 1; mas->depth = 1;
mas->node = mte_safe_root(root); mas->node = mte_safe_root(root);
mas->offset = 0;
return NULL; return NULL;
} }
/* empty tree */ /* empty tree */
if (unlikely(!root)) { if (unlikely(!root)) {
mas->node = MAS_NONE;
mas->offset = MAPLE_NODE_SLOTS; mas->offset = MAPLE_NODE_SLOTS;
return NULL; return NULL;
} }
......
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