From: Christoph Hellwig <hch@lst.de>
To: netdev@oss.sgi.com, netfilter-devel@lists.netfilter.org
Subject: [PATCH] more DECLARE_MUTEX() in headers crap
Date: Sun, 20 Jun 2004 13:23:28 +0200 [thread overview]
Message-ID: <20040620112328.GB13691@lst.de> (raw)
okay, the gunk we had in arp_tables is in ip6_tables and ip6_tables,
too. In fact those three files see to be 80% copy & paste of each
other..
--- 1.8/include/linux/netfilter_ipv4/ip_tables.h 2004-06-19 20:55:10 +02:00
+++ edited/include/linux/netfilter_ipv4/ip_tables.h 2004-06-20 10:25:40 +02:00
@@ -284,8 +284,6 @@
struct ipt_entry entrytable[0];
};
-extern struct semaphore ipt_mutex;
-
/* Standard return verdict, or do jump. */
#define IPT_STANDARD_TARGET ""
/* Error verdict. */
@@ -338,7 +336,6 @@
* Main firewall chains definitions and global var's definitions.
*/
#ifdef __KERNEL__
-static DECLARE_MUTEX(ipt_mutex);
#include <linux/init.h>
extern void ipt_init(void) __init;
===== include/linux/netfilter_ipv6/ip6_tables.h 1.7 vs edited =====
--- 1.7/include/linux/netfilter_ipv6/ip6_tables.h 2004-06-19 20:55:10 +02:00
+++ edited/include/linux/netfilter_ipv6/ip6_tables.h 2004-06-20 10:26:32 +02:00
@@ -107,10 +107,6 @@
u_int64_t pcnt, bcnt; /* Packet and byte counters */
};
-#ifdef __KERNEL__
-static DECLARE_MUTEX(ip6t_mutex);
-#endif
-
/* Values for "flag" field in struct ip6t_ip6 (general ip6 structure). */
#define IP6T_F_PROTO 0x01 /* Set if rule cares about upper
protocols */
===== net/ipv4/netfilter/ip_tables.c 1.24 vs edited =====
--- 1.24/net/ipv4/netfilter/ip_tables.c 2004-06-07 05:15:04 +02:00
+++ edited/net/ipv4/netfilter/ip_tables.c 2004-06-20 12:29:17 +02:00
@@ -61,6 +61,8 @@
#endif
#define SMP_ALIGN(x) (((x) + SMP_CACHE_BYTES-1) & ~(SMP_CACHE_BYTES-1))
+static DECLARE_MUTEX(ipt_mutex);
+
/* Must have mutex */
#define ASSERT_READ_LOCK(x) IP_NF_ASSERT(down_trylock(&ipt_mutex) != 0)
#define ASSERT_WRITE_LOCK(x) IP_NF_ASSERT(down_trylock(&ipt_mutex) != 0)
===== net/ipv6/netfilter/ip6_tables.c 1.29 vs edited =====
--- 1.29/net/ipv6/netfilter/ip6_tables.c 2004-06-07 05:15:04 +02:00
+++ edited/net/ipv6/netfilter/ip6_tables.c 2004-06-20 12:29:29 +02:00
@@ -66,6 +66,7 @@
#endif
#define SMP_ALIGN(x) (((x) + SMP_CACHE_BYTES-1) & ~(SMP_CACHE_BYTES-1))
+static DECLARE_MUTEX(ip6t_mutex);
/* Must have mutex */
#define ASSERT_READ_LOCK(x) IP_NF_ASSERT(down_trylock(&ip6t_mutex) != 0)
next reply other threads:[~2004-06-20 11:23 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-06-20 11:23 Christoph Hellwig [this message]
2004-07-05 10:53 ` [PATCH] more DECLARE_MUTEX() in headers crap Christoph Hellwig
2004-07-21 20:48 ` Harald Welte
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20040620112328.GB13691@lst.de \
--to=hch@lst.de \
--cc=netdev@oss.sgi.com \
--cc=netfilter-devel@lists.netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).