slub: don't panic for memcg kmem cache creation failure

[tomoyo/tomoyo-test1.git] / mm / slub.c

diff --git a/mm/slub.c b/mm/slub.c
index cd04dbd..d46a917 100644 (file)
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -1313,9 +1313,7 @@ slab_flags_t kmem_cache_flags(unsigned int object_size,
                char *end, *glob;
                size_t cmplen;
 
-               end = strchr(iter, ',');
-               if (!end)
-                       end = iter + strlen(iter);
+               end = strchrnul(iter, ',');
 
                glob = strnchr(iter, end - iter, '*');
                if (glob)
@@ -3652,10 +3650,6 @@ static int kmem_cache_open(struct kmem_cache *s, slab_flags_t flags)
 
        free_kmem_cache_nodes(s);
 error:
-       if (flags & SLAB_PANIC)
-               panic("Cannot create slab %s size=%u realsize=%u order=%u offset=%u flags=%lx\n",
-                     s->name, s->size, s->size,
-                     oo_order(s->oo), s->offset, (unsigned long)flags);
        return -EINVAL;
 }