diff options
| author | Johannes Weiner <hannes@cmpxchg.org> | 2016-01-21 00:02:18 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-21 02:09:18 +0100 |
| commit | 6d378dac7c4905db38f8127c4e618f0f627a4ced (patch) | |
| tree | eff640b738eedd12d0c62ae8e6eb0dbc6b26c8d8 | |
| parent | memstick: use sector_div instead of do_div (diff) | |
| download | linux-6d378dac7c4905db38f8127c4e618f0f627a4ced.tar.xz linux-6d378dac7c4905db38f8127c4e618f0f627a4ced.zip | |
mm: memcontrol: drop unused @css argument in memcg_init_kmem
This series adds accounting of the historical "kmem" memory consumers to
the cgroup2 memory controller.
These consumers include the dentry cache, the inode cache, kernel stack
pages, and a few others that are pointed out in patch 7/8. The
footprint of these consumers is directly tied to userspace activity in
common workloads, and so they have to be part of the minimally viable
configuration in order to present a complete feature to our users.
The cgroup2 interface of the memory controller is far from complete, but
this series, along with the socket memory accounting series, provides
the final semantic changes for the existing memory knobs in the cgroup2
interface, which is scheduled for initial release in the next merge
window.
This patch (of 8):
Remove unused css argument frmo memcg_init_kmem()
Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: Michal Hocko <mhocko@suse.com>
Cc: Tejun Heo <tj@kernel.org>
Acked-by: Vladimir Davydov <vdavydov@virtuozzo.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | include/net/tcp_memcontrol.h | 3 | ||||
| -rw-r--r-- | mm/memcontrol.c | 6 | ||||
| -rw-r--r-- | net/ipv4/tcp_memcontrol.c | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/include/net/tcp_memcontrol.h b/include/net/tcp_memcontrol.h index 01ff7c6efada..020c2dee65e8 100644 --- a/include/net/tcp_memcontrol.h +++ b/include/net/tcp_memcontrol.h @@ -4,6 +4,7 @@ struct cgroup_subsys; struct mem_cgroup; -int tcp_init_cgroup(struct mem_cgroup *memcg, struct cgroup_subsys *ss); +int tcp_init_cgroup(struct mem_cgroup *memcg); void tcp_destroy_cgroup(struct mem_cgroup *memcg); + #endif /* _TCP_MEMCG_H */ diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 0eda67376df4..f21f29cd14f9 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -3583,7 +3583,7 @@ static int mem_cgroup_oom_control_write(struct cgroup_subsys_state *css, } #ifdef CONFIG_MEMCG_KMEM -static int memcg_init_kmem(struct mem_cgroup *memcg, struct cgroup_subsys *ss) +static int memcg_init_kmem(struct mem_cgroup *memcg) { int ret; @@ -3591,7 +3591,7 @@ static int memcg_init_kmem(struct mem_cgroup *memcg, struct cgroup_subsys *ss) if (ret) return ret; - return tcp_init_cgroup(memcg, ss); + return tcp_init_cgroup(memcg); } static void memcg_deactivate_kmem(struct mem_cgroup *memcg) @@ -4274,7 +4274,7 @@ mem_cgroup_css_online(struct cgroup_subsys_state *css) } mutex_unlock(&memcg_create_mutex); - ret = memcg_init_kmem(memcg, &memory_cgrp_subsys); + ret = memcg_init_kmem(memcg); if (ret) return ret; diff --git a/net/ipv4/tcp_memcontrol.c b/net/ipv4/tcp_memcontrol.c index 18bc7f745e9c..133eb5eac49f 100644 --- a/net/ipv4/tcp_memcontrol.c +++ b/net/ipv4/tcp_memcontrol.c @@ -6,7 +6,7 @@ #include <linux/memcontrol.h> #include <linux/module.h> -int tcp_init_cgroup(struct mem_cgroup *memcg, struct cgroup_subsys *ss) +int tcp_init_cgroup(struct mem_cgroup *memcg) { struct mem_cgroup *parent = parent_mem_cgroup(memcg); struct page_counter *counter_parent = NULL; |