[NETFILTER]: nfnetlink: use mutex instead of semaphore

[linux-2.6] / net / netfilter / nfnetlink.c

diff --git a/net/netfilter/nfnetlink.c b/net/netfilter/nfnetlink.c
index f42bb1366007ea716780a72a2b851f20a87d75ee..7865a47c981e8610fedaec1cc174fab36a88dff6 100644 (file)
--- a/net/netfilter/nfnetlink.c
+++ b/net/netfilter/nfnetlink.c
@@ -19,7 +19,6 @@
 #include <linux/socket.h>
 #include <linux/kernel.h>
 #include <linux/major.h>
-#include <linux/sched.h>
 #include <linux/timer.h>
 #include <linux/string.h>
 #include <linux/sockios.h>
@@ -29,6 +28,7 @@
 #include <asm/uaccess.h>
 #include <asm/system.h>
 #include <net/sock.h>
+#include <net/netlink.h>
 #include <linux/init.h>
 #include <linux/spinlock.h>
 
@@ -52,16 +52,28 @@ static char __initdata nfversion[] = "0.30";
 
 static struct sock *nfnl = NULL;
 static struct nfnetlink_subsystem *subsys_table[NFNL_SUBSYS_COUNT];
-DECLARE_MUTEX(nfnl_sem);
+static DEFINE_MUTEX(nfnl_mutex);
 
-void nfnl_lock(void)
+static void nfnl_lock(void)
 {
-       nfnl_shlock();
+       mutex_lock(&nfnl_mutex);
 }
 
-void nfnl_unlock(void)
+static int nfnl_trylock(void)
 {
-       nfnl_shunlock();
+       return !mutex_trylock(&nfnl_mutex);
+}
+
+static void __nfnl_unlock(void)
+{
+       mutex_unlock(&nfnl_mutex);
+}
+
+static void nfnl_unlock(void)
+{
+       mutex_unlock(&nfnl_mutex);
+       if (nfnl->sk_receive_queue.qlen)
+               nfnl->sk_data_ready(nfnl, 0);
 }
 
 int nfnetlink_subsys_register(struct nfnetlink_subsystem *n)
@@ -198,13 +210,12 @@ EXPORT_SYMBOL_GPL(nfnetlink_has_listeners);
 
 int nfnetlink_send(struct sk_buff *skb, u32 pid, unsigned group, int echo)
 {
-       gfp_t allocation = in_interrupt() ? GFP_ATOMIC : GFP_KERNEL;
        int err = 0;
 
        NETLINK_CB(skb).dst_group = group;
        if (echo)
                atomic_inc(&skb->users);
-       netlink_broadcast(nfnl, skb, pid, group, allocation);
+       netlink_broadcast(nfnl, skb, pid, group, gfp_any());
        if (echo)
                err = netlink_unicast(nfnl, skb, pid, MSG_DONTWAIT);
 
@@ -250,11 +261,11 @@ static int nfnetlink_rcv_msg(struct sk_buff *skb,
        ss = nfnetlink_get_subsys(type);
        if (!ss) {
 #ifdef CONFIG_KMOD
-               /* don't call nfnl_shunlock, since it would reenter
+               /* don't call nfnl_unlock, since it would reenter
                 * with further packet processing */
-               up(&nfnl_sem);
+               __nfnl_unlock();
                request_module("nfnetlink-subsys-%d", NFNL_SUBSYS_ID(type));
-               nfnl_shlock();
+               nfnl_lock();
                ss = nfnetlink_get_subsys(type);
                if (!ss)
 #endif
@@ -324,7 +335,7 @@ static void nfnetlink_rcv(struct sock *sk, int len)
        do {
                struct sk_buff *skb;
 
-               if (nfnl_shlock_nowait())
+               if (nfnl_trylock())
                        return;
 
                while ((skb = skb_dequeue(&sk->sk_receive_queue)) != NULL) {
@@ -339,9 +350,9 @@ static void nfnetlink_rcv(struct sock *sk, int len)
                        kfree_skb(skb);
                }
 
-               /* don't call nfnl_shunlock, since it would reenter
+               /* don't call nfnl_unlock, since it would reenter
                 * with further packet processing */
-               up(&nfnl_sem);
+               __nfnl_unlock();
        } while(nfnl && nfnl->sk_receive_queue.qlen);
 }