* Wei Yang <richard.weiyang@xxxxxxxxx> [241124 21:42]: > The loop condition makes sure (mas.last < max), so we can directly use > mas_next_slot() here. > > Since no other use of mas_next_entry(), it is removed. > > Signed-off-by: Wei Yang <richard.weiyang@xxxxxxxxx> > CC: Liam R. Howlett <Liam.Howlett@xxxxxxxxxx> > CC: Sidhartha Kumar <sidhartha.kumar@xxxxxxxxxx> > CC: Lorenzo Stoakes <lorenzo.stoakes@xxxxxxxxxx> Reviewed-by: Liam R. Howlett <Liam.Howlett@xxxxxxxxxx> > --- > lib/maple_tree.c | 25 +------------------------ > 1 file changed, 1 insertion(+), 24 deletions(-) > > diff --git a/lib/maple_tree.c b/lib/maple_tree.c > index b67dae356182..7efb1520f9bd 100644 > --- a/lib/maple_tree.c > +++ b/lib/maple_tree.c > @@ -4733,29 +4733,6 @@ static void *mas_next_slot(struct ma_state *mas, unsigned long max, bool empty) > return entry; > } > > -/* > - * mas_next_entry() - Internal function to get the next entry. > - * @mas: The maple state > - * @limit: The maximum range start. > - * > - * Set the @mas->node to the next entry and the range_start to > - * the beginning value for the entry. Does not check beyond @limit. > - * Sets @mas->index and @mas->last to the range, Does not update @mas->index and > - * @mas->last on overflow. > - * Restarts on dead nodes. > - * > - * Return: the next entry or %NULL. > - */ > -static inline void *mas_next_entry(struct ma_state *mas, unsigned long limit) > -{ > - if (mas->last >= limit) { > - mas->status = ma_overflow; > - return NULL; > - } > - > - return mas_next_slot(mas, limit, false); > -} > - > /* > * mas_rev_awalk() - Internal function. Reverse allocation walk. Find the > * highest gap address of a given size in a given node and descend. > @@ -6919,7 +6896,7 @@ void *mt_find(struct maple_tree *mt, unsigned long *index, unsigned long max) > goto unlock; > > while (mas_is_active(&mas) && (mas.last < max)) { > - entry = mas_next_entry(&mas, max); > + entry = mas_next_slot(&mas, max, false); > if (likely(entry && !xa_is_zero(entry))) > break; > } > -- > 2.34.1 >