Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1286752

[PATCH 1/8] mm: memcontrol: drop unused @css argument in memcg_init_kmem

Show all headers | View raw

Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
---
 include/net/tcp_memcontrol.h | 3 ++-
 mm/memcontrol.c              | 6 +++---
 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 3a17b16..dc2da2f 100644
--- a/include/net/tcp_memcontrol.h
+++ b/include/net/tcp_memcontrol.h
@@ -1,6 +1,7 @@
 #ifndef _TCP_MEMCG_H
 #define _TCP_MEMCG_H
 
-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 5fe45d68..eda8d43 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -3561,7 +3561,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;
 
@@ -3569,7 +3569,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)
@@ -4252,7 +4252,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 18bc7f7..133eb5e 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;
-- 
2.6.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/8] mm: memcontrol: account "kmem" in cgroup2 Johannes Weiner <hannes@cmpxchg.org> - 2015-12-08 19:40 +0100
  [PATCH 1/8] mm: memcontrol: drop unused @css argument in memcg_init_kmem Johannes Weiner <hannes@cmpxchg.org> - 2015-12-08 19:40 +0100
    Re: [PATCH 1/8] mm: memcontrol: drop unused @css argument in  memcg_init_kmem Vladimir Davydov <vdavydov@virtuozzo.com> - 2015-12-09 10:10 +0100
    Re: [PATCH 1/8] mm: memcontrol: drop unused @css argument in  memcg_init_kmem Michal Hocko <mhocko@kernel.org> - 2015-12-10 13:40 +0100
  [PATCH 8/8] mm: memcontrol: introduce CONFIG_MEMCG_LEGACY_KMEM Johannes Weiner <hannes@cmpxchg.org> - 2015-12-08 19:40 +0100
    Re: [PATCH 8/8] mm: memcontrol: introduce CONFIG_MEMCG_LEGACY_KMEM Vladimir Davydov <vdavydov@virtuozzo.com> - 2015-12-09 12:40 +0100
  [PATCH 4/8] mm: memcontrol: group kmem init and exit functions together Johannes Weiner <hannes@cmpxchg.org> - 2015-12-08 19:40 +0100
    Re: [PATCH 4/8] mm: memcontrol: group kmem init and exit functions  together Vladimir Davydov <vdavydov@virtuozzo.com> - 2015-12-09 10:20 +0100
    Re: [PATCH 4/8] mm: memcontrol: group kmem init and exit functions  together Michal Hocko <mhocko@kernel.org> - 2015-12-10 14:00 +0100
  [PATCH 6/8] mm: memcontrol: move kmem accounting code to CONFIG_MEMCG Johannes Weiner <hannes@cmpxchg.org> - 2015-12-08 19:40 +0100
    Re: [PATCH 6/8] mm: memcontrol: move kmem accounting code to  CONFIG_MEMCG Vladimir Davydov <vdavydov@virtuozzo.com> - 2015-12-09 10:40 +0100
    Re: [PATCH 6/8] mm: memcontrol: move kmem accounting code to  CONFIG_MEMCG Michal Hocko <mhocko@kernel.org> - 2015-12-10 14:20 +0100
      Re: [PATCH 6/8] mm: memcontrol: move kmem accounting code to  CONFIG_MEMCG Johannes Weiner <hannes@cmpxchg.org> - 2015-12-10 15:10 +0100
    [PATCH 6/8 v2] mm: memcontrol: move kmem accounting code to  CONFIG_MEMCG Johannes Weiner <hannes@cmpxchg.org> - 2015-12-10 21:30 +0100
      Re: [PATCH 6/8 v2] mm: memcontrol: move kmem accounting code to  CONFIG_MEMCG Johannes Weiner <hannes@cmpxchg.org> - 2015-12-10 22:00 +0100

csiph-web