Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 330433
b: refs/heads/master
c: 686d550
h: refs/heads/master
i:
  330431: f966565
v: v3
  • Loading branch information
Christoph Lameter authored and Pekka Enberg committed Sep 5, 2012
1 parent d137070 commit 657d902
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 208c4358dc4a8f0fe99e49eb8d21a869b01e7d34
refs/heads/master: 686d550d222e8f83f6e709debbedf9d8ef77aec7
28 changes: 24 additions & 4 deletions trunk/mm/slab_common.c
Original file line number Diff line number Diff line change
Expand Up @@ -98,16 +98,36 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size, size_t align
unsigned long flags, void (*ctor)(void *))
{
struct kmem_cache *s = NULL;
int err = 0;

get_online_cpus();
mutex_lock(&slab_mutex);
if (kmem_cache_sanity_check(name, size) == 0)
s = __kmem_cache_create(name, size, align, flags, ctor);

if (!kmem_cache_sanity_check(name, size) == 0)
goto out_locked;


s = __kmem_cache_create(name, size, align, flags, ctor);
if (!s)
err = -ENOSYS; /* Until __kmem_cache_create returns code */

out_locked:
mutex_unlock(&slab_mutex);
put_online_cpus();

if (!s && (flags & SLAB_PANIC))
panic("kmem_cache_create: Failed to create slab '%s'\n", name);
if (err) {

if (flags & SLAB_PANIC)
panic("kmem_cache_create: Failed to create slab '%s'. Error %d\n",
name, err);
else {
printk(KERN_WARNING "kmem_cache_create(%s) failed with error %d",
name, err);
dump_stack();
}

return NULL;
}

return s;
}
Expand Down

0 comments on commit 657d902

Please sign in to comment.