3 files changed, 16 insertions, 13 deletions

diff --git a/net/ipv4/ipvs/ip_vs_ctl.c b/net/ipv4/ipvs/ip_vs_ctl.c
index 7f0288b25fa1..f28ec6882162 100644
--- a/net/ipv4/ipvs/ip_vs_ctl.c
+++ b/net/ipv4/ipvs/ip_vs_ctl.c
@@ -34,6 +34,7 @@
 
 #include <linux/netfilter.h>
 #include <linux/netfilter_ipv4.h>
+#include <linux/mutex.h>
 
 #include <net/ip.h>
 #include <net/route.h>
@@ -44,7 +45,7 @@
 #include <net/ip_vs.h>
 
 /* semaphore for IPVS sockopts. And, [gs]etsockopt may sleep. */
-static DECLARE_MUTEX(__ip_vs_mutex);
+static DEFINE_MUTEX(__ip_vs_mutex);
 
 /* lock for service table */
 static DEFINE_RWLOCK(__ip_vs_svc_lock);
@@ -1950,7 +1951,7 @@ do_ip_vs_set_ctl(struct sock *sk, int cmd, void __user *user, unsigned int len)
         /* increase the module use count */
         ip_vs_use_count_inc();
 
-        if (down_interruptible(&__ip_vs_mutex)) {
+        if (mutex_lock_interruptible(&__ip_vs_mutex)) {
                 ret = -ERESTARTSYS;
                 goto out_dec;
         }
@@ -2041,7 +2042,7 @@ do_ip_vs_set_ctl(struct sock *sk, int cmd, void __user *user, unsigned int len)
                 ip_vs_service_put(svc);
 
   out_unlock:
-        up(&__ip_vs_mutex);
+        mutex_unlock(&__ip_vs_mutex);
   out_dec:
         /* decrease the module use count */
         ip_vs_use_count_dec();
@@ -2211,7 +2212,7 @@ do_ip_vs_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
         if (copy_from_user(arg, user, get_arglen[GET_CMDID(cmd)]) != 0)
                 return -EFAULT;
 
-        if (down_interruptible(&__ip_vs_mutex))
+        if (mutex_lock_interruptible(&__ip_vs_mutex))
                 return -ERESTARTSYS;
 
         switch (cmd) {
@@ -2330,7 +2331,7 @@ do_ip_vs_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
         }
 
   out:
-        up(&__ip_vs_mutex);
+        mutex_unlock(&__ip_vs_mutex);
         return ret;
 }
 
diff --git a/net/ipv4/netfilter/ipt_hashlimit.c b/net/ipv4/netfilter/ipt_hashlimit.c
index dc1521c5aa81..ba5e23505e88 100644
--- a/net/ipv4/netfilter/ipt_hashlimit.c
+++ b/net/ipv4/netfilter/ipt_hashlimit.c
@@ -40,6 +40,7 @@
 
 /* FIXME: this is just for IP_NF_ASSERRT */
 #include <linux/netfilter_ipv4/ip_conntrack.h>
+#include <linux/mutex.h>
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Harald Welte <laforge@netfilter.org>");
@@ -92,7 +93,7 @@ struct ipt_hashlimit_htable {
 };
 
 static DEFINE_SPINLOCK(hashlimit_lock); /* protects htables list */
-static DECLARE_MUTEX(hlimit_mutex);     /* additional checkentry protection */
+static DEFINE_MUTEX(hlimit_mutex);      /* additional checkentry protection */
 static HLIST_HEAD(hashlimit_htables);
 static kmem_cache_t *hashlimit_cachep __read_mostly;
 
@@ -542,13 +543,13 @@ hashlimit_checkentry(const char *tablename,
          * call vmalloc, and that can sleep.  And we cannot just re-search
          * the list of htable's in htable_create(), since then we would
          * create duplicate proc files. -HW */
-        down(&hlimit_mutex);
+        mutex_lock(&hlimit_mutex);
         r->hinfo = htable_find_get(r->name);
         if (!r->hinfo && (htable_create(r) != 0)) {
-                up(&hlimit_mutex);
+                mutex_unlock(&hlimit_mutex);
                 return 0;
         }
-        up(&hlimit_mutex);
+        mutex_unlock(&hlimit_mutex);
 
         /* Ugly hack: For SMP, we only want to use one set */
         r->u.master = r;
diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c
index 43e72419c868..f329b72578f5 100644
--- a/net/netlink/genetlink.c
+++ b/net/netlink/genetlink.c
@@ -13,26 +13,27 @@
 #include <linux/socket.h>
 #include <linux/string.h>
 #include <linux/skbuff.h>
+#include <linux/mutex.h>
 #include <net/sock.h>
 #include <net/genetlink.h>
 
 struct sock *genl_sock = NULL;
 
-static DECLARE_MUTEX(genl_sem); /* serialization of message processing */
+static DEFINE_MUTEX(genl_mutex); /* serialization of message processing */
 
 static void genl_lock(void)
 {
-        down(&genl_sem);
+        mutex_lock(&genl_mutex);
 }
 
 static int genl_trylock(void)
 {
-        return down_trylock(&genl_sem);
+        return !mutex_trylock(&genl_mutex);
 }
 
 static void genl_unlock(void)
 {
-        up(&genl_sem);
+        mutex_unlock(&genl_mutex);
 
         if (genl_sock && genl_sock->sk_receive_queue.qlen)
                 genl_sock->sk_data_ready(genl_sock, 0);