Skip to content

Commit

Permalink
maple_tree: drop mas_first_entry()
Browse files Browse the repository at this point in the history
The internal function mas_first_entry() is no longer used, so drop it.

Link: https://lkml.kernel.org/r/20230711035444.526-9-zhangpeng.00@bytedance.com
Signed-off-by: Peng Zhang <zhangpeng.00@bytedance.com>
Reviewed-by: Liam R. Howlett <Liam.Howlett@oracle.com>
Tested-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
  • Loading branch information
Peng Zhang authored and Andrew Morton committed Aug 18, 2023
1 parent 29b2681 commit 6783bd4
Showing 1 changed file with 0 additions and 72 deletions.
72 changes: 0 additions & 72 deletions lib/maple_tree.c
Original file line number Diff line number Diff line change
Expand Up @@ -6636,78 +6636,6 @@ static inline struct maple_enode *mas_get_slot(struct ma_state *mas,
offset);
}


/*
* mas_first_entry() - Go the first leaf and find the first entry.
* @mas: the maple state.
* @limit: the maximum index to check.
* @*r_start: Pointer to set to the range start.
*
* Sets mas->offset to the offset of the entry, r_start to the range minimum.
*
* Return: The first entry or MAS_NONE.
*/
static inline void *mas_first_entry(struct ma_state *mas, struct maple_node *mn,
unsigned long limit, enum maple_type mt)

{
unsigned long max;
unsigned long *pivots;
void __rcu **slots;
void *entry = NULL;

mas->index = mas->min;
if (mas->index > limit)
goto none;

max = mas->max;
mas->offset = 0;
while (likely(!ma_is_leaf(mt))) {
MAS_WARN_ON(mas, mte_dead_node(mas->node));
slots = ma_slots(mn, mt);
entry = mas_slot(mas, slots, 0);
pivots = ma_pivots(mn, mt);
if (unlikely(ma_dead_node(mn)))
return NULL;
max = pivots[0];
mas->node = entry;
mn = mas_mn(mas);
mt = mte_node_type(mas->node);
}
MAS_WARN_ON(mas, mte_dead_node(mas->node));

mas->max = max;
slots = ma_slots(mn, mt);
entry = mas_slot(mas, slots, 0);
if (unlikely(ma_dead_node(mn)))
return NULL;

/* Slot 0 or 1 must be set */
if (mas->index > limit)
goto none;

if (likely(entry))
return entry;

mas->offset = 1;
entry = mas_slot(mas, slots, 1);
pivots = ma_pivots(mn, mt);
if (unlikely(ma_dead_node(mn)))
return NULL;

mas->index = pivots[0] + 1;
if (mas->index > limit)
goto none;

if (likely(entry))
return entry;

none:
if (likely(!ma_dead_node(mn)))
mas->node = MAS_NONE;
return NULL;
}

/* Depth first search, post-order */
static void mas_dfs_postorder(struct ma_state *mas, unsigned long max)
{
Expand Down

0 comments on commit 6783bd4

Please sign in to comment.