[NET] sem2mutex: net/

[deliverable/linux.git] / net / ipv6 / ipcomp6.c

diff --git a/net/ipv6/ipcomp6.c b/net/ipv6/ipcomp6.c
index 6107592fbd8cd7d92fa7ff2aff0f415139ceb8d5..3c7b324cd20c01ea4adbb2ac42f8592b824dff11 100644 (file)
--- a/net/ipv6/ipcomp6.c
+++ b/net/ipv6/ipcomp6.c
@@ -50,6 +50,7 @@
 #include <net/protocol.h>
 #include <linux/ipv6.h>
 #include <linux/icmpv6.h>
+#include <linux/mutex.h>
 
 struct ipcomp6_tfms {
        struct list_head list;
@@ -57,7 +58,7 @@ struct ipcomp6_tfms {
        int users;
 };
 
-static DECLARE_MUTEX(ipcomp6_resource_sem);
+static DEFINE_MUTEX(ipcomp6_resource_mutex);
 static void **ipcomp6_scratches;
 static int ipcomp6_scratch_users;
 static LIST_HEAD(ipcomp6_tfms_list);
@@ -405,9 +406,9 @@ static void ipcomp6_destroy(struct xfrm_state *x)
        if (!ipcd)
                return;
        xfrm_state_delete_tunnel(x);
-       down(&ipcomp6_resource_sem);
+       mutex_lock(&ipcomp6_resource_mutex);
        ipcomp6_free_data(ipcd);
-       up(&ipcomp6_resource_sem);
+       mutex_unlock(&ipcomp6_resource_mutex);
        kfree(ipcd);
 
        xfrm6_tunnel_free_spi((xfrm_address_t *)&x->props.saddr);
@@ -436,14 +437,14 @@ static int ipcomp6_init_state(struct xfrm_state *x)
        if (x->props.mode)
                x->props.header_len += sizeof(struct ipv6hdr);
        
-       down(&ipcomp6_resource_sem);
+       mutex_lock(&ipcomp6_resource_mutex);
        if (!ipcomp6_alloc_scratches())
                goto error;
 
        ipcd->tfms = ipcomp6_alloc_tfms(x->calg->alg_name);
        if (!ipcd->tfms)
                goto error;
-       up(&ipcomp6_resource_sem);
+       mutex_unlock(&ipcomp6_resource_mutex);
 
        if (x->props.mode) {
                err = ipcomp6_tunnel_attach(x);
@@ -459,10 +460,10 @@ static int ipcomp6_init_state(struct xfrm_state *x)
 out:
        return err;
 error_tunnel:
-       down(&ipcomp6_resource_sem);
+       mutex_lock(&ipcomp6_resource_mutex);
 error:
        ipcomp6_free_data(ipcd);
-       up(&ipcomp6_resource_sem);
+       mutex_unlock(&ipcomp6_resource_mutex);
        kfree(ipcd);
 
        goto out;