asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[PATCH] net: don't call kmem_cache_create with a spinlock held

Browse source 
This fixes the warning reported by Marcel Holtmann (Thanks!).
  
Signed-off-by: Arnaldo Carvalho de Melo <acme@conectiva.com.br>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Arnaldo Carvalho de Melo 2005-04-16 15:24:09 -07:00 committed by Linus Torvalds
parent 9f3786dc8b
commit 2a27805127
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
net/core/sock.c
View file

@ -1359,8 +1359,6 @@ int proto_register(struct proto *prot, int alloc_slab)
{ {
int rc = -ENOBUFS; int rc = -ENOBUFS;
write_lock(&proto_list_lock);
if (alloc_slab) { if (alloc_slab) {
prot->slab = kmem_cache_create(prot->name, prot->obj_size, 0, prot->slab = kmem_cache_create(prot->name, prot->obj_size, 0,
SLAB_HWCACHE_ALIGN, NULL, NULL); SLAB_HWCACHE_ALIGN, NULL, NULL);
@ -1368,14 +1366,15 @@ int proto_register(struct proto *prot, int alloc_slab)
if (prot->slab == NULL) { if (prot->slab == NULL) {
printk(KERN_CRIT "%s: Can't create sock SLAB cache!\n", printk(KERN_CRIT "%s: Can't create sock SLAB cache!\n",
prot->name); prot->name);
goto out_unlock; goto out;
} }
} }
write_lock(&proto_list_lock);
list_add(&prot->node, &proto_list); list_add(&prot->node, &proto_list);
rc = 0;
out_unlock:
write_unlock(&proto_list_lock); write_unlock(&proto_list_lock);
rc = 0;
out:
return rc; return rc;
} }