diff options
author | Vladimir Davydov <vdavydov@parallels.com> | 2014-04-07 18:39:26 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-07 19:36:12 -0400 |
commit | 794b1248be4e7e157f5535c3ee49168aa4643349 (patch) | |
tree | 93bfa09b76abff9ec2f9d154bb43971bcce2f574 /include/linux/memcontrol.h | |
parent | 5722d094ad2b56fa2c1cb3adaf40071a55bbf242 (diff) |
memcg, slab: separate memcg vs root cache creation paths
Memcg-awareness turned kmem_cache_create() into a dirty interweaving of
memcg-only and except-for-memcg calls. To clean this up, let's move the
code responsible for memcg cache creation to a separate function.
Signed-off-by: Vladimir Davydov <vdavydov@parallels.com>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: David Rientjes <rientjes@google.com>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Glauber Costa <glommer@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/memcontrol.h')
-rw-r--r-- | include/linux/memcontrol.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index ab7f02884983..02d3072841e9 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h | |||
@@ -638,12 +638,6 @@ static inline int memcg_cache_id(struct mem_cgroup *memcg) | |||
638 | return -1; | 638 | return -1; |
639 | } | 639 | } |
640 | 640 | ||
641 | static inline char *memcg_create_cache_name(struct mem_cgroup *memcg, | ||
642 | struct kmem_cache *root_cache) | ||
643 | { | ||
644 | return NULL; | ||
645 | } | ||
646 | |||
647 | static inline int memcg_alloc_cache_params(struct mem_cgroup *memcg, | 641 | static inline int memcg_alloc_cache_params(struct mem_cgroup *memcg, |
648 | struct kmem_cache *s, struct kmem_cache *root_cache) | 642 | struct kmem_cache *s, struct kmem_cache *root_cache) |
649 | { | 643 | { |