From 2a27805127aee1e7e62854bcf9ca8c355c23b73e Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo Date: Sat, 16 Apr 2005 15:24:09 -0700 Subject: [PATCH] [PATCH] net: don't call kmem_cache_create with a spinlock held This fixes the warning reported by Marcel Holtmann (Thanks!). Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- net/core/sock.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/net/core/sock.c b/net/core/sock.c index 629ab4a5b45b..f52c87a9268a 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -1359,8 +1359,6 @@ int proto_register(struct proto *prot, int alloc_slab) { int rc = -ENOBUFS; - write_lock(&proto_list_lock); - if (alloc_slab) { prot->slab = kmem_cache_create(prot->name, prot->obj_size, 0, SLAB_HWCACHE_ALIGN, NULL, NULL); @@ -1368,14 +1366,15 @@ int proto_register(struct proto *prot, int alloc_slab) if (prot->slab == NULL) { printk(KERN_CRIT "%s: Can't create sock SLAB cache!\n", prot->name); - goto out_unlock; + goto out; } } + write_lock(&proto_list_lock); list_add(&prot->node, &proto_list); - rc = 0; -out_unlock: write_unlock(&proto_list_lock); + rc = 0; +out: return rc; } -- 2.30.2