mm: kmem: cleanup memcg_kmem_uncharge_memcg() arguments

Drop the unused page argument and put the memcg pointer at the first
place.  This make the function consistent with its peers:
__memcg_kmem_uncharge_memcg(), memcg_kmem_charge_memcg(), etc.

Signed-off-by: Roman Gushchin <guro@fb.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: Shakeel Butt <shakeelb@google.com>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Vladimir Davydov <vdavydov.dev@gmail.com>
Link: http://lkml.kernel.org/r/20200109202659.752357-3-guro@fb.com
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
index f1542d6558c2c64fec4804a4bf07e2e1817a7280..13b5d70b8b0eeeb818403dcb27137d349172be61 100644 (file)
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
@@ -1414,8 +1414,8 @@ static inline int memcg_kmem_charge_memcg(struct mem_cgroup *memcg, gfp_t gfp,
        return 0;
 }
 
-static inline void memcg_kmem_uncharge_memcg(struct page *page, int order,
-                                            struct mem_cgroup *memcg)
+static inline void memcg_kmem_uncharge_memcg(struct mem_cgroup *memcg,
+                                            int order)
 {
        if (memcg_kmem_enabled())
                __memcg_kmem_uncharge_memcg(memcg, 1 << order);

diff --git a/mm/slab.h b/mm/slab.h
index c4c93e991250d5fc1eed9f8655a7b577596c13f7..e7da63fb8211f6bc59ed8bfffc96af520d356075 100644 (file)
--- a/mm/slab.h
+++ b/mm/slab.h
@@ -395,7 +395,7 @@ static __always_inline void memcg_uncharge_slab(struct page *page, int order,
        if (likely(!mem_cgroup_is_root(memcg))) {
                lruvec = mem_cgroup_lruvec(memcg, page_pgdat(page));
                mod_lruvec_state(lruvec, cache_vmstat_idx(s), -(1 << order));
-               memcg_kmem_uncharge_memcg(page, order, memcg);
+               memcg_kmem_uncharge_memcg(memcg, order);
        } else {
                mod_node_page_state(page_pgdat(page), cache_vmstat_idx(s),
                                    -(1 << order));