Merge tag 'urgent-slab-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm

torvalds · torvalds · commit 355cb09304c3 · 2014-07-23T15:14:46.000-07:00
Pull slab fix from Mike Snitzer: "This fixes the broken duplicate slab name check in kmem_cache_sanity_check() that has been repeatedly reported (as recently as today against Fedora rawhide). Pekka seemed to have it staged for a late 3.15-rc in his 'slab/urgent' branch but never sent a pull request, see: https://lkml.org/lkml/2014/5/23/648" * tag 'urgent-slab-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm: slab_common: fix the check for duplicate slab names
diff --git a/mm/slab_common.c b/mm/slab_common.c
@@ -55,7 +55,7 @@ static int kmem_cache_sanity_check(const char *name, size_t size)
 			continue;
 		}
 
-#if !defined(CONFIG_SLUB) || !defined(CONFIG_SLUB_DEBUG_ON)
+#if !defined(CONFIG_SLUB)
 		if (!strcmp(s->name, name)) {
 			pr_err("%s (%s): Cache name already exists.\n",
 			       __func__, name);

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ static int kmem_cache_sanity_check(const char *name, size_t size)`
`55`	`55`	`continue;`
`56`	`56`	`}`
`57`	`57`
`58`		`-#if !defined(CONFIG_SLUB) \|\| !defined(CONFIG_SLUB_DEBUG_ON)`
	`58`	`+#if !defined(CONFIG_SLUB)`
`59`	`59`	`if (!strcmp(s->name, name)) {`
`60`	`60`	`pr_err("%s (%s): Cache name already exists.\n",`
`61`	`61`	`__func__, name);`