Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 355cb093 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
parents ed4a1084 45ccaf47

mm/slab_common.c

+1 −1
Original line number Diff line number Diff line
@@ -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);