Skip to content

L
linux-davinci
Commit 65195686 authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files
Options

[NETFILTER]: remove remaining ASSERT_{READ,WRITE}_LOCK 

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent d12cdc3c
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 18 deletions
net/ipv4/netfilter/ip_conntrack_core.c
View file @ 65195686
...@@ -40,9 +40,6 @@ ...@@ -40,9 +40,6 @@
/* ip_conntrack_lock protects the main hash table, protocol/helper/expected /* ip_conntrack_lock protects the main hash table, protocol/helper/expected
registrations, conntrack timers*/ registrations, conntrack timers*/
#define ASSERT_READ_LOCK(x)
#define ASSERT_WRITE_LOCK(x)
#include <linux/netfilter_ipv4/ip_conntrack.h> #include <linux/netfilter_ipv4/ip_conntrack.h>
#include <linux/netfilter_ipv4/ip_conntrack_protocol.h> #include <linux/netfilter_ipv4/ip_conntrack_protocol.h>
#include <linux/netfilter_ipv4/ip_conntrack_helper.h> #include <linux/netfilter_ipv4/ip_conntrack_helper.h>
...@@ -201,7 +198,6 @@ ip_ct_invert_tuple(struct ip_conntrack_tuple *inverse, ...@@ -201,7 +198,6 @@ ip_ct_invert_tuple(struct ip_conntrack_tuple *inverse,
/* ip_conntrack_expect helper functions */ /* ip_conntrack_expect helper functions */
void ip_ct_unlink_expect(struct ip_conntrack_expect *exp) void ip_ct_unlink_expect(struct ip_conntrack_expect *exp)
{ {
ASSERT_WRITE_LOCK(&ip_conntrack_lock);
IP_NF_ASSERT(!timer_pending(&exp->timeout)); IP_NF_ASSERT(!timer_pending(&exp->timeout));
list_del(&exp->list); list_del(&exp->list);
CONNTRACK_STAT_INC(expect_delete); CONNTRACK_STAT_INC(expect_delete);
...@@ -294,7 +290,6 @@ static void ...@@ -294,7 +290,6 @@ static void
clean_from_lists(struct ip_conntrack *ct) clean_from_lists(struct ip_conntrack *ct)
{ {
DEBUGP("clean_from_lists(%p)\n", ct); DEBUGP("clean_from_lists(%p)\n", ct);
ASSERT_WRITE_LOCK(&ip_conntrack_lock);
list_del(&ct->tuplehash[IP_CT_DIR_ORIGINAL].list); list_del(&ct->tuplehash[IP_CT_DIR_ORIGINAL].list);
list_del(&ct->tuplehash[IP_CT_DIR_REPLY].list); list_del(&ct->tuplehash[IP_CT_DIR_REPLY].list);
...@@ -373,7 +368,6 @@ __ip_conntrack_find(const struct ip_conntrack_tuple *tuple, ...@@ -373,7 +368,6 @@ __ip_conntrack_find(const struct ip_conntrack_tuple *tuple,
struct ip_conntrack_tuple_hash *h; struct ip_conntrack_tuple_hash *h;
unsigned int hash = hash_conntrack(tuple); unsigned int hash = hash_conntrack(tuple);
ASSERT_READ_LOCK(&ip_conntrack_lock);
list_for_each_entry(h, &ip_conntrack_hash[hash], list) { list_for_each_entry(h, &ip_conntrack_hash[hash], list) {
if (tuplehash_to_ctrack(h) != ignored_conntrack && if (tuplehash_to_ctrack(h) != ignored_conntrack &&
ip_ct_tuple_equal(tuple, &h->tuple)) { ip_ct_tuple_equal(tuple, &h->tuple)) {
......
net/ipv4/netfilter/ip_conntrack_proto_gre.c
View file @ 65195686
...@@ -34,8 +34,6 @@ ...@@ -34,8 +34,6 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
static DEFINE_RWLOCK(ip_ct_gre_lock); static DEFINE_RWLOCK(ip_ct_gre_lock);
#define ASSERT_READ_LOCK(x)
#define ASSERT_WRITE_LOCK(x)
#include <linux/netfilter_ipv4/ip_conntrack_protocol.h> #include <linux/netfilter_ipv4/ip_conntrack_protocol.h>
#include <linux/netfilter_ipv4/ip_conntrack_helper.h> #include <linux/netfilter_ipv4/ip_conntrack_helper.h>
......
net/ipv4/netfilter/ip_conntrack_standalone.c
View file @ 65195686
...@@ -28,9 +28,6 @@ ...@@ -28,9 +28,6 @@
#include <net/ip.h> #include <net/ip.h>
#include <net/route.h> #include <net/route.h>
#define ASSERT_READ_LOCK(x)
#define ASSERT_WRITE_LOCK(x)
#include <linux/netfilter_ipv4/ip_conntrack.h> #include <linux/netfilter_ipv4/ip_conntrack.h>
#include <linux/netfilter_ipv4/ip_conntrack_protocol.h> #include <linux/netfilter_ipv4/ip_conntrack_protocol.h>
#include <linux/netfilter_ipv4/ip_conntrack_core.h> #include <linux/netfilter_ipv4/ip_conntrack_core.h>
...@@ -139,7 +136,6 @@ static int ct_seq_show(struct seq_file *s, void *v) ...@@ -139,7 +136,6 @@ static int ct_seq_show(struct seq_file *s, void *v)
const struct ip_conntrack *conntrack = tuplehash_to_ctrack(hash); const struct ip_conntrack *conntrack = tuplehash_to_ctrack(hash);
struct ip_conntrack_protocol *proto; struct ip_conntrack_protocol *proto;
ASSERT_READ_LOCK(&ip_conntrack_lock);
IP_NF_ASSERT(conntrack); IP_NF_ASSERT(conntrack);
/* we only want to print DIR_ORIGINAL */ /* we only want to print DIR_ORIGINAL */
......
net/ipv4/netfilter/ipt_CLUSTERIP.c
View file @ 65195686
...@@ -40,8 +40,6 @@ ...@@ -40,8 +40,6 @@
#define DEBUGP #define DEBUGP
#endif #endif
#define ASSERT_READ_LOCK(x)
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_AUTHOR("Harald Welte <laforge@netfilter.org>"); MODULE_AUTHOR("Harald Welte <laforge@netfilter.org>");
MODULE_DESCRIPTION("iptables target for CLUSTERIP"); MODULE_DESCRIPTION("iptables target for CLUSTERIP");
...@@ -123,7 +121,6 @@ __clusterip_config_find(__be32 clusterip) ...@@ -123,7 +121,6 @@ __clusterip_config_find(__be32 clusterip)
{ {
struct list_head *pos; struct list_head *pos;
ASSERT_READ_LOCK(&clusterip_lock);
list_for_each(pos, &clusterip_configs) { list_for_each(pos, &clusterip_configs) {
struct clusterip_config *c = list_entry(pos, struct clusterip_config *c = list_entry(pos,
struct clusterip_config, list); struct clusterip_config, list);
......
net/netfilter/nf_conntrack_helper.c
View file @ 65195686
...@@ -21,9 +21,6 @@ ...@@ -21,9 +21,6 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#define ASSERT_READ_LOCK(x)
#define ASSERT_WRITE_LOCK(x)
#include <net/netfilter/nf_conntrack.h> #include <net/netfilter/nf_conntrack.h>
#include <net/netfilter/nf_conntrack_l3proto.h> #include <net/netfilter/nf_conntrack_l3proto.h>
#include <net/netfilter/nf_conntrack_l4proto.h> #include <net/netfilter/nf_conntrack_l4proto.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment