aboutsummaryrefslogtreecommitdiffstats
path: root/mm/slab_common.c
diff options
context:
space:
mode:
Diffstat (limited to 'mm/slab_common.c')
-rw-r--r--mm/slab_common.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/slab_common.c b/mm/slab_common.c
index 989784bd88be..6087b1f9a385 100644
--- a/mm/slab_common.c
+++ b/mm/slab_common.c
@@ -488,6 +488,7 @@ void memcg_create_kmem_cache(struct mem_cgroup *memcg,
488 struct kmem_cache *root_cache) 488 struct kmem_cache *root_cache)
489{ 489{
490 static char memcg_name_buf[NAME_MAX + 1]; /* protected by slab_mutex */ 490 static char memcg_name_buf[NAME_MAX + 1]; /* protected by slab_mutex */
491 struct cgroup_subsys_state *css = mem_cgroup_css(memcg);
491 struct memcg_cache_array *arr; 492 struct memcg_cache_array *arr;
492 struct kmem_cache *s = NULL; 493 struct kmem_cache *s = NULL;
493 char *cache_name; 494 char *cache_name;
@@ -510,10 +511,9 @@ void memcg_create_kmem_cache(struct mem_cgroup *memcg,
510 if (arr->entries[idx]) 511 if (arr->entries[idx])
511 goto out_unlock; 512 goto out_unlock;
512 513
513 cgroup_name(mem_cgroup_css(memcg)->cgroup, 514 cgroup_name(css->cgroup, memcg_name_buf, sizeof(memcg_name_buf));
514 memcg_name_buf, sizeof(memcg_name_buf));
515 cache_name = kasprintf(GFP_KERNEL, "%s(%d:%s)", root_cache->name, 515 cache_name = kasprintf(GFP_KERNEL, "%s(%d:%s)", root_cache->name,
516 idx, memcg_name_buf); 516 css->id, memcg_name_buf);
517 if (!cache_name) 517 if (!cache_name)
518 goto out_unlock; 518 goto out_unlock;
519 519