Commit a485e1da authored by Xiongwei Song's avatar Xiongwei Song Committed by Vlastimil Babka

mm: slub: Delete useless parameter of alloc_slab_page()

The parameter @s is useless for alloc_slab_page(). It was added in 2014
by commit 5dfb4175 ("sl[au]b: charge slabs to kmemcg explicitly"). The
need for it was removed in 2020 by commit 1f3147b4 ("mm: slub: call
account_slab_page() after slab page initialization"). Let's delete it.

[willy@infradead.org: Added detailed history of @s]
Signed-off-by: default avatarXiongwei Song <sxwjean@gmail.com>
Reviewed-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Acked-by: default avatarDavid Rientjes <rientjes@google.com>
Reviewed-by: default avatarRoman Gushchin <roman.gushchin@linux.dev>
Reviewed-by: default avatarHyeonggon Yoo <42.hyeyoo@gmail.com>
Signed-off-by: default avatarVlastimil Babka <vbabka@suse.cz>
Link: https://lore.kernel.org/r/20220310140701.87908-3-sxwjean@me.com
parent 38262782
...@@ -1788,8 +1788,8 @@ static void *setup_object(struct kmem_cache *s, struct slab *slab, ...@@ -1788,8 +1788,8 @@ static void *setup_object(struct kmem_cache *s, struct slab *slab,
/* /*
* Slab allocation and freeing * Slab allocation and freeing
*/ */
static inline struct slab *alloc_slab_page(struct kmem_cache *s, static inline struct slab *alloc_slab_page(gfp_t flags, int node,
gfp_t flags, int node, struct kmem_cache_order_objects oo) struct kmem_cache_order_objects oo)
{ {
struct folio *folio; struct folio *folio;
struct slab *slab; struct slab *slab;
...@@ -1941,7 +1941,7 @@ static struct slab *allocate_slab(struct kmem_cache *s, gfp_t flags, int node) ...@@ -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)) if ((alloc_gfp & __GFP_DIRECT_RECLAIM) && oo_order(oo) > oo_order(s->min))
alloc_gfp = (alloc_gfp | __GFP_NOMEMALLOC) & ~(__GFP_RECLAIM|__GFP_NOFAIL); 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)) { if (unlikely(!slab)) {
oo = s->min; oo = s->min;
alloc_gfp = flags; alloc_gfp = flags;
...@@ -1949,7 +1949,7 @@ static struct slab *allocate_slab(struct kmem_cache *s, gfp_t flags, int node) ...@@ -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. * Allocation may have failed due to fragmentation.
* Try a lower order alloc if possible * 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)) if (unlikely(!slab))
goto out; goto out;
stat(s, ORDER_FALLBACK); stat(s, ORDER_FALLBACK);
......
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