| Message ID | 20200707173612.124425-1-guro@fb.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/3] mm: memcg/slab: remove unused argument by charge_slab_page() | expand |
On Tue, Jul 7, 2020 at 10:36 AM Roman Gushchin <guro@fb.com> wrote: > > charge_slab_page() is not using the gfp argument anymore, > remove it. > > Signed-off-by: Roman Gushchin <guro@fb.com> Reviewed-by: Shakeel Butt <shakeelb@google.com>
On 7/7/20 7:36 PM, Roman Gushchin wrote: > charge_slab_page() is not using the gfp argument anymore, > remove it. > > Signed-off-by: Roman Gushchin <guro@fb.com> Acked-by: Vlastimil Babka <vbabka@suse.cz> > --- > mm/slab.c | 2 +- > mm/slab.h | 3 +-- > mm/slub.c | 2 +- > 3 files changed, 3 insertions(+), 4 deletions(-) > > diff --git a/mm/slab.c b/mm/slab.c > index 2850fe3c5fb8..fafd46877504 100644 > --- a/mm/slab.c > +++ b/mm/slab.c > @@ -1379,7 +1379,7 @@ static struct page *kmem_getpages(struct kmem_cache *cachep, gfp_t flags, > return NULL; > } > > - charge_slab_page(page, flags, cachep->gfporder, cachep); > + charge_slab_page(page, cachep->gfporder, cachep); > __SetPageSlab(page); > /* Record if ALLOC_NO_WATERMARKS was set when allocating the slab */ > if (sk_memalloc_socks() && page_is_pfmemalloc(page)) > diff --git a/mm/slab.h b/mm/slab.h > index ab172dca8ce2..704a65713f81 100644 > --- a/mm/slab.h > +++ b/mm/slab.h > @@ -440,8 +440,7 @@ static inline struct kmem_cache *virt_to_cache(const void *obj) > return page->slab_cache; > } > > -static __always_inline void charge_slab_page(struct page *page, > - gfp_t gfp, int order, > +static __always_inline void charge_slab_page(struct page *page, int order, > struct kmem_cache *s) > { > mod_node_page_state(page_pgdat(page), cache_vmstat_idx(s), > diff --git a/mm/slub.c b/mm/slub.c > index 6769f5f802e9..d9b33a935e58 100644 > --- a/mm/slub.c > +++ b/mm/slub.c > @@ -1621,7 +1621,7 @@ static inline struct page *alloc_slab_page(struct kmem_cache *s, > page = __alloc_pages_node(node, flags, order); > > if (page) > - charge_slab_page(page, flags, order, s); > + charge_slab_page(page, order, s); > > return page; > } >
diff --git a/mm/slab.c b/mm/slab.c index 2850fe3c5fb8..fafd46877504 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -1379,7 +1379,7 @@ static struct page *kmem_getpages(struct kmem_cache *cachep, gfp_t flags, return NULL; } - charge_slab_page(page, flags, cachep->gfporder, cachep); + charge_slab_page(page, cachep->gfporder, cachep); __SetPageSlab(page); /* Record if ALLOC_NO_WATERMARKS was set when allocating the slab */ if (sk_memalloc_socks() && page_is_pfmemalloc(page)) diff --git a/mm/slab.h b/mm/slab.h index ab172dca8ce2..704a65713f81 100644 --- a/mm/slab.h +++ b/mm/slab.h @@ -440,8 +440,7 @@ static inline struct kmem_cache *virt_to_cache(const void *obj) return page->slab_cache; } -static __always_inline void charge_slab_page(struct page *page, - gfp_t gfp, int order, +static __always_inline void charge_slab_page(struct page *page, int order, struct kmem_cache *s) { mod_node_page_state(page_pgdat(page), cache_vmstat_idx(s), diff --git a/mm/slub.c b/mm/slub.c index 6769f5f802e9..d9b33a935e58 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -1621,7 +1621,7 @@ static inline struct page *alloc_slab_page(struct kmem_cache *s, page = __alloc_pages_node(node, flags, order); if (page) - charge_slab_page(page, flags, order, s); + charge_slab_page(page, order, s); return page; }
charge_slab_page() is not using the gfp argument anymore, remove it. Signed-off-by: Roman Gushchin <guro@fb.com> --- mm/slab.c | 2 +- mm/slab.h | 3 +-- mm/slub.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-)