[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 <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>

diff --git a/net/core/sock.c b/net/core/sock.c
index 629ab4a5b45b5a0c45b100752080fc9a4d816980..f52c87a9268a772398e937a80730d576ab32a066 100644 (file)
--- 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;
 }