From: Arnaldo Carvalho de Melo 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 --- 25-akpm/net/core/sock.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff -puN net/core/sock.c~dont-call-kmem_cache_create-with-a-spinlock-held net/core/sock.c --- 25/net/core/sock.c~dont-call-kmem_cache_create-with-a-spinlock-held 2005-04-06 01:36:01.000000000 -0700 +++ 25-akpm/net/core/sock.c 2005-04-06 01:36:01.000000000 -0700 @@ -1359,8 +1359,6 @@ int proto_register(struct proto *prot, i { 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, i 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; } _