---

yaml --- r: 365453 b: refs/heads/master c: fd0ccaf h: refs/heads/master i: 365451: 5c86a57 v: v3
git-mirror · Apr 29, 2013 · 03147ab · 03147ab
1 parent 0cb7da7
commit 03147ab
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 865ffef3797da2cac85b3354b5b6050dc9660978
+refs/heads/master: fd0ccaf2bd04e54d2a6979fbfdcad856694e3877
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
@@ -3215,12 +3215,12 @@ void memcg_release_cache(struct kmem_cache *s)
 
 	root = s->memcg_params->root_cache;
 	root->memcg_params->memcg_caches[id] = NULL;
-	mem_cgroup_put(memcg);
 
 	mutex_lock(&memcg->slab_caches_mutex);
 	list_del(&s->memcg_params->list);
 	mutex_unlock(&memcg->slab_caches_mutex);
 
+	mem_cgroup_put(memcg);
 out:
 	kfree(s->memcg_params);
 }