---

yaml --- r: 347032 b: refs/heads/master c: 5413dfb h: refs/heads/master v: v3
git-mirror · Dec 18, 2012 · f6d79ab · f6d79ab
1 parent aa1d193
commit f6d79ab
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ebe945c27628fca03723582eba138acc2e2f3d15
+refs/heads/master: 5413dfba88d6f6090c8cdf181ab9172d24752f8f
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
@@ -3153,8 +3153,19 @@ int __kmem_cache_shutdown(struct kmem_cache *s)
 {
 	int rc = kmem_cache_close(s);
 
-	if (!rc)
+	if (!rc) {
+		/*
+		 * We do the same lock strategy around sysfs_slab_add, see
+		 * __kmem_cache_create. Because this is pretty much the last
+		 * operation we do and the lock will be released shortly after
+		 * that in slab_common.c, we could just move sysfs_slab_remove
+		 * to a later point in common code. We should do that when we
+		 * have a common sysfs framework for all allocators.
+		 */
+		mutex_unlock(&slab_mutex);
 		sysfs_slab_remove(s);
+		mutex_lock(&slab_mutex);
+	}
 
 	return rc;
 }