Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65195686 authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

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



Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent d12cdc3c

net/ipv4/netfilter/ip_conntrack_core.c

+0 −6
Original line number Diff line number Diff line
@@ -40,9 +40,6 @@ 


/* ip_conntrack_lock protects the main hash table, protocol/helper/expected

   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_protocol.h>

#include <linux/netfilter_ipv4/ip_conntrack_helper.h>
@@ -201,7 +198,6 @@ ip_ct_invert_tuple(struct ip_conntrack_tuple *inverse, 
/* ip_conntrack_expect helper functions */

void ip_ct_unlink_expect(struct ip_conntrack_expect *exp)

{

	ASSERT_WRITE_LOCK(&ip_conntrack_lock);

	IP_NF_ASSERT(!timer_pending(&exp->timeout));

	list_del(&exp->list);

	CONNTRACK_STAT_INC(expect_delete);
@@ -294,7 +290,6 @@ static void 
clean_from_lists(struct ip_conntrack *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_REPLY].list);
@@ -373,7 +368,6 @@ __ip_conntrack_find(const struct ip_conntrack_tuple *tuple, 
	struct ip_conntrack_tuple_hash *h;

	unsigned int hash = hash_conntrack(tuple);



	ASSERT_READ_LOCK(&ip_conntrack_lock);

	list_for_each_entry(h, &ip_conntrack_hash[hash], list) {

		if (tuplehash_to_ctrack(h) != ignored_conntrack &&

		    ip_ct_tuple_equal(tuple, &h->tuple)) {

net/ipv4/netfilter/ip_conntrack_proto_gre.c

+0 −2
Original line number Diff line number Diff line
@@ -34,8 +34,6 @@ 
#include <linux/interrupt.h>



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_helper.h>

net/ipv4/netfilter/ip_conntrack_standalone.c

+0 −4
Original line number Diff line number Diff line
@@ -28,9 +28,6 @@ 
#include <net/ip.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_protocol.h>

#include <linux/netfilter_ipv4/ip_conntrack_core.h>
@@ -139,7 +136,6 @@ static int ct_seq_show(struct seq_file *s, void *v) 
	const struct ip_conntrack *conntrack = tuplehash_to_ctrack(hash);

	struct ip_conntrack_protocol *proto;



	ASSERT_READ_LOCK(&ip_conntrack_lock);

	IP_NF_ASSERT(conntrack);



	/* we only want to print DIR_ORIGINAL */

net/ipv4/netfilter/ipt_CLUSTERIP.c

+0 −3
Original line number Diff line number Diff line
@@ -40,8 +40,6 @@ 
#define DEBUGP

#endif



#define ASSERT_READ_LOCK(x)



MODULE_LICENSE("GPL");

MODULE_AUTHOR("Harald Welte <laforge@netfilter.org>");

MODULE_DESCRIPTION("iptables target for CLUSTERIP");
@@ -123,7 +121,6 @@ __clusterip_config_find(__be32 clusterip) 
{

	struct list_head *pos;



	ASSERT_READ_LOCK(&clusterip_lock);

	list_for_each(pos, &clusterip_configs) {

		struct clusterip_config *c = list_entry(pos, 

					struct clusterip_config, list);

net/netfilter/nf_conntrack_helper.c

+0 −3
Original line number Diff line number Diff line
@@ -21,9 +21,6 @@ 
#include <linux/kernel.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_l3proto.h>

#include <net/netfilter/nf_conntrack_l4proto.h>