mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 02:50:43 +00:00
maple_tree: refine ma_state init from mas_start()
commit46b3458482
upstream. 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.com Cc: <Stable@vger.kernel.org> Fixes:54a611b605
("Maple Tree: add new data structure") Signed-off-by: Vernon Yang <vernon2gm@gmail.com> Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
64cb480523
commit
3825e4495b
1 changed files with 3 additions and 3 deletions
|
@ -1334,7 +1334,7 @@ static void mas_node_count(struct ma_state *mas, int count)
|
|||
* mas_start() - Sets up maple state for operations.
|
||||
* @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.
|
||||
*
|
||||
* Return:
|
||||
|
@ -1348,22 +1348,22 @@ static inline struct maple_enode *mas_start(struct ma_state *mas)
|
|||
if (likely(mas_is_start(mas))) {
|
||||
struct maple_enode *root;
|
||||
|
||||
mas->node = MAS_NONE;
|
||||
mas->min = 0;
|
||||
mas->max = ULONG_MAX;
|
||||
mas->depth = 0;
|
||||
mas->offset = 0;
|
||||
|
||||
root = mas_root(mas);
|
||||
/* Tree with nodes */
|
||||
if (likely(xa_is_node(root))) {
|
||||
mas->depth = 1;
|
||||
mas->node = mte_safe_root(root);
|
||||
mas->offset = 0;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* empty tree */
|
||||
if (unlikely(!root)) {
|
||||
mas->node = MAS_NONE;
|
||||
mas->offset = MAPLE_NODE_SLOTS;
|
||||
return NULL;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue