diff options
| author | Vladimir Davydov | 2014-04-08 00:39:26 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2014-04-08 01:36:12 +0200 |
| commit | 794b1248be4e7e157f5535c3ee49168aa4643349 (patch) | |
| tree | 93bfa09b76abff9ec2f9d154bb43971bcce2f574 /mm/memcontrol.c | |
| parent | memcg, slab: cleanup memcg cache creation (diff) | |
| download | kernel-qcow2-linux-794b1248be4e7e157f5535c3ee49168aa4643349.tar.gz kernel-qcow2-linux-794b1248be4e7e157f5535c3ee49168aa4643349.tar.xz kernel-qcow2-linux-794b1248be4e7e157f5535c3ee49168aa4643349.zip | |
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 'mm/memcontrol.c')
| -rw-r--r-- | mm/memcontrol.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 32c7342df4bf..451523c3bd4e 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -3395,13 +3395,8 @@ static void memcg_create_cache_work_func(struct work_struct *w) struct create_work *cw = container_of(w, struct create_work, work); struct mem_cgroup *memcg = cw->memcg; struct kmem_cache *cachep = cw->cachep; - struct kmem_cache *new; - new = kmem_cache_create_memcg(memcg, cachep->name, - cachep->object_size, cachep->align, - cachep->flags & ~SLAB_PANIC, cachep->ctor, cachep); - if (new) - new->allocflags |= __GFP_KMEMCG; + kmem_cache_create_memcg(memcg, cachep); css_put(&memcg->css); kfree(cw); } |