1 files changed, 5 insertions, 6 deletions

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index afa55bb38cbd..6f3c0fcd7a2d 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -332,7 +332,7 @@ struct mem_cgroup {
         struct cg_proto tcp_mem;
 #endif
 #if defined(CONFIG_MEMCG_KMEM)
-        /* Index in the kmem_cache->memcg_params->memcg_caches array */
+        /* Index in the kmem_cache->memcg_params.memcg_caches array */
         int kmemcg_id;
 #endif
 
@@ -531,7 +531,7 @@ static void disarm_sock_keys(struct mem_cgroup *memcg)
 
 #ifdef CONFIG_MEMCG_KMEM
 /*
- * This will be the memcg's index in each cache's ->memcg_params->memcg_caches.
+ * This will be the memcg's index in each cache's ->memcg_params.memcg_caches.
  * The main reason for not using cgroup id for this:
  *  this works better in sparse environments, where we have a lot of memcgs,
  *  but only a few kmem-limited. Or also, if we have, for instance, 200
@@ -2667,8 +2667,7 @@ struct kmem_cache *__memcg_kmem_get_cache(struct kmem_cache *cachep)
         struct mem_cgroup *memcg;
         struct kmem_cache *memcg_cachep;
 
-        VM_BUG_ON(!cachep->memcg_params);
-        VM_BUG_ON(!cachep->memcg_params->is_root_cache);
+        VM_BUG_ON(!is_root_cache(cachep));
 
         if (current->memcg_kmem_skip_account)
                 return cachep;
@@ -2702,7 +2701,7 @@ out:
 void __memcg_kmem_put_cache(struct kmem_cache *cachep)
 {
         if (!is_root_cache(cachep))
-                css_put(&cachep->memcg_params->memcg->css);
+                css_put(&cachep->memcg_params.memcg->css);
 }
 
 /*
@@ -2778,7 +2777,7 @@ struct mem_cgroup *__mem_cgroup_from_kmem(void *ptr)
         if (PageSlab(page)) {
                 cachep = page->slab_cache;
                 if (!is_root_cache(cachep))
-                        memcg = cachep->memcg_params->memcg;
+                        memcg = cachep->memcg_params.memcg;
         } else
                 /* page allocated by alloc_kmem_pages */
                 memcg = page->mem_cgroup;