mm: memcg/slab: remove unused argument by charge_slab_page() (84950480) · Commits · 戴 / test

charge_slab_page() is not using the gfp argument anymore, remove it. Signed-off-by:

Vlastimil Babka <vbabka@suse.cz> Cc: Christoph Lameter <cl@linux.com> Cc: Pekka Enberg <penberg@kernel.org> Cc: David Rientjes <rientjes@google.com> Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com> Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: Michal Hocko <mhocko@kernel.org> Link: http://lkml.kernel.org/r/20200707173612.124425-1-guro@fb.com Signed-off-by:

mm/slab.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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))

+1 −2

Original line number	Diff line number	Diff line
		@@ -423,8 +423,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),

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}