memcg: zap memcg_name argument of memcg_create_kmem_cache

[karo-tx-linux.git] / mm / slab_common.c

diff --git a/mm/slab_common.c b/mm/slab_common.c
index e03dd6f2a27212768fb3f623115cea9f3579a06a..1b782a2d3b3d1a7006fcc027fc7895767a04c51f 100644 (file)
--- a/mm/slab_common.c
+++ b/mm/slab_common.c
@@ -331,7 +331,7 @@ out:
 
 out_free_cache:
        memcg_free_cache_params(s);
-       kfree(s);
+       kmem_cache_free(kmem_cache, s);
        goto out;
 }
 
@@ -430,16 +430,15 @@ EXPORT_SYMBOL(kmem_cache_create);
  * memcg_create_kmem_cache - Create a cache for a memory cgroup.
  * @memcg: The memory cgroup the new cache is for.
  * @root_cache: The parent of the new cache.
- * @memcg_name: The name of the memory cgroup (used for naming the new cache).
  *
  * This function attempts to create a kmem cache that will serve allocation
  * requests going from @memcg to @root_cache. The new cache inherits properties
  * from its parent.
  */
 struct kmem_cache *memcg_create_kmem_cache(struct mem_cgroup *memcg,
-                                          struct kmem_cache *root_cache,
-                                          const char *memcg_name)
+                                          struct kmem_cache *root_cache)
 {
+       static char memcg_name_buf[NAME_MAX + 1]; /* protected by slab_mutex */
        struct kmem_cache *s = NULL;
        char *cache_name;
 
@@ -448,8 +447,10 @@ struct kmem_cache *memcg_create_kmem_cache(struct mem_cgroup *memcg,
 
        mutex_lock(&slab_mutex);
 
+       cgroup_name(mem_cgroup_css(memcg)->cgroup,
+                   memcg_name_buf, sizeof(memcg_name_buf));
        cache_name = kasprintf(GFP_KERNEL, "%s(%d:%s)", root_cache->name,
-                              memcg_cache_id(memcg), memcg_name);
+                              memcg_cache_id(memcg), memcg_name_buf);
        if (!cache_name)
                goto out_unlock;