> From: Xiongwei Song <sxwjean@xxxxxxxxx>
>
> The parameter @s is useless for alloc_slab_page(). It was added in 2014
> by commit 5dfb41750992 ("sl[au]b: charge slabs to kmemcg explicitly"). The
> need for it was removed in 2020 by commit 1f3147b49d75 ("mm: slub: call
> account_slab_page() after slab page initialization"). Let's delete it.
>
> [willy@xxxxxxxxxxxxx: Added detailed history of @s]
> Signed-off-by: Xiongwei Song <sxwjean@xxxxxxxxx>
> Reviewed-by: Matthew Wilcox (Oracle) <willy@xxxxxxxxxxxxx>
> Acked-by: David Rientjes <rientjes@xxxxxxxxxx>
> Reviewed-by: Roman Gushchin <roman.gushchin@xxxxxxxxx>
> ---
> mm/slub.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/mm/slub.c b/mm/slub.c
> index 261474092e43..5d273ee04c43 100644
> --- a/mm/slub.c
> +++ b/mm/slub.c
> @@ -1788,8 +1788,8 @@ static void *setup_object(struct kmem_cache *s, struct slab *slab,
> /*
> * Slab allocation and freeing
> */
> -static inline struct slab *alloc_slab_page(struct kmem_cache *s,
> - gfp_t flags, int node, struct kmem_cache_order_objects oo)
> +static inline struct slab *alloc_slab_page(gfp_t flags, int node,
> + struct kmem_cache_order_objects oo)
> {
> struct folio *folio;
> struct slab *slab;
> @@ -1941,7 +1941,7 @@ static struct slab *allocate_slab(struct kmem_cache *s, gfp_t flags, int node)
> if ((alloc_gfp & __GFP_DIRECT_RECLAIM) && oo_order(oo) > oo_order(s->min))
> alloc_gfp = (alloc_gfp | __GFP_NOMEMALLOC) & ~(__GFP_RECLAIM|__GFP_NOFAIL);
>
>- slab = alloc_slab_page(s, alloc_gfp, node, oo);
>+ slab = alloc_slab_page(alloc_gfp, node, oo);
> if (unlikely(!slab)) {
> oo = s->min;
> alloc_gfp = flags;
>@@ -1949,7 +1949,7 @@ static struct slab *allocate_slab(struct kmem_cache *s, gfp_t flags, int node)
> * Allocation may have failed due to fragmentation.
> * Try a lower order alloc if possible
> */
>- slab = alloc_slab_page(s, alloc_gfp, node, oo);
>+ slab = alloc_slab_page(alloc_gfp, node, oo);
> if (unlikely(!slab))
> goto out;
> stat(s, ORDER_FALLBACK);
Looks good, nice changelog!
Reviewed-by: Hyeonggon Yoo <42.hyeyoo@xxxxxxxxx>
