Merge /spare/repo/linux-2.6/

[linux-2.6] / net / ipv4 / netfilter / ip_conntrack_amanda.c

diff --git a/net/ipv4/netfilter/ip_conntrack_amanda.c b/net/ipv4/netfilter/ip_conntrack_amanda.c
index 3dbddd062605a73fcb0d09a727aab0f521d18107..a78a320eee082802eebb99d0b468eda935160934 100644 (file)
--- a/net/ipv4/netfilter/ip_conntrack_amanda.c
+++ b/net/ipv4/netfilter/ip_conntrack_amanda.c
@@ -26,7 +26,6 @@
 #include <net/checksum.h>
 #include <net/udp.h>
 
-#include <linux/netfilter_ipv4/lockhelp.h>
 #include <linux/netfilter_ipv4/ip_conntrack_helper.h>
 #include <linux/netfilter_ipv4/ip_conntrack_amanda.h>
 
@@ -42,7 +41,7 @@ static char *conns[] = { "DATA ", "MESG ", "INDEX " };
 
 /* This is slow, but it's simple. --RR */
 static char amanda_buffer[65536];
-static DECLARE_LOCK(amanda_buffer_lock);
+static DEFINE_SPINLOCK(amanda_buffer_lock);
 
 unsigned int (*ip_nat_amanda_hook)(struct sk_buff **pskb,
                                   enum ip_conntrack_info ctinfo,
@@ -76,7 +75,7 @@ static int help(struct sk_buff **pskb,
                return NF_ACCEPT;
        }
 
-       LOCK_BH(&amanda_buffer_lock);
+       spin_lock_bh(&amanda_buffer_lock);
        skb_copy_bits(*pskb, dataoff, amanda_buffer, (*pskb)->len - dataoff);
        data = amanda_buffer;
        data_limit = amanda_buffer + (*pskb)->len - dataoff;
@@ -134,7 +133,7 @@ static int help(struct sk_buff **pskb,
        }
 
 out:
-       UNLOCK_BH(&amanda_buffer_lock);
+       spin_unlock_bh(&amanda_buffer_lock);
        return ret;
 }