Merge branch 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux

torvalds · torvalds · commit 4b60667a0637 · 2013-10-14T10:00:36.000-07:00
Pull SLAB fix from Pekka Enberg:
 "A regression fix for overly eager slab cache name checks"

* 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux:
  slab_common: Do not check for duplicate slab names
diff --git a/mm/slab_common.c b/mm/slab_common.c
@@ -56,6 +56,7 @@ static int kmem_cache_sanity_check(struct mem_cgroup *memcg, const char *name,
 			continue;
 		}
 
+#if !defined(CONFIG_SLUB) || !defined(CONFIG_SLUB_DEBUG_ON)
 		/*
 		 * For simplicity, we won't check this in the list of memcg
 		 * caches. We have control over memcg naming, and if there
@@ -69,6 +70,7 @@ static int kmem_cache_sanity_check(struct mem_cgroup *memcg, const char *name,
 			s = NULL;
 			return -EINVAL;
 		}
+#endif
 	}
 
 	WARN_ON(strchr(name, ' '));	/* It confuses parsers */

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,7 @@ static int kmem_cache_sanity_check(struct mem_cgroup memcg, const char name,`
`56`	`56`	`continue;`
`57`	`57`	`}`
`58`	`58`
	`59`	`+#if !defined(CONFIG_SLUB) \|\| !defined(CONFIG_SLUB_DEBUG_ON)`
`59`	`60`	`/*`
`60`	`61`	`* For simplicity, we won't check this in the list of memcg`
`61`	`62`	`* caches. We have control over memcg naming, and if there`
`@@ -69,6 +70,7 @@ static int kmem_cache_sanity_check(struct mem_cgroup memcg, const char name,`
`69`	`70`	`s = NULL;`
`70`	`71`	`return -EINVAL;`
`71`	`72`	`}`
	`73`	`+#endif`
`72`	`74`	`}`
`73`	`75`
`74`	`76`	`WARN_ON(strchr(name, ' ')); /* It confuses parsers */`