Commit 4b60667a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
parents 35f9162d 3e374919

mm/slab_common.c

+2 −0
Original line number Diff line number Diff line
@@ -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 */