From: Anders Fugmann <afu@fugmann.dhs.org>
To: Bart De Schuymer <bdschuym@pandora.be>
Cc: Harald Welte <laforge@gnumonks.org>, netfilter-devel@lists.netfilter.org
Subject: Re: remove usage of __MOD_XXX_USAGE_COUNT and derivatives
Date: Mon, 13 Jan 2003 17:58:22 +0100 [thread overview]
Message-ID: <3E22F02E.8060800@fugmann.dhs.org> (raw)
In-Reply-To: <200301122314.17191.bdschuym@pandora.be>
[-- Attachment #1: Type: text/plain, Size: 496 bytes --]
Take two on conversion from MOD_INC/DEC_USAGE_COUNT.
This version removes all MOD_INC_USAGE_COUNT and MOD_DEC_USAGE_COUNT, as
this is done automatically by the kernel itself.
Whenever a module count is incremented and error can arise if the module
is currently beeing loaded or unloaded. I treat this error by returning
-EAGAIN, to signal that the operation should be retried.
Attached it the patch against 2.5.56. It's only for IPv4, and will await
comment on this before convering IPv6.
[-- Attachment #2: netfilter-2.5.diff --]
[-- Type: text/plain, Size: 21157 bytes --]
diff -u linux-2.5.56/net/ipv4/netfilter/arp_tables.c linux-2.5.56-new/net/ipv4/netfilter/arp_tables.c
--- linux-2.5.56/net/ipv4/netfilter/arp_tables.c 2003-01-09 05:04:22.000000000 +0100
+++ linux-2.5.56-new/net/ipv4/netfilter/arp_tables.c 2003-01-13 17:36:27.000000000 +0100
@@ -539,8 +539,8 @@
duprintf("check_entry: `%s' not found\n", t->u.user.name);
goto out;
}
- if (target->me)
- __MOD_INC_USE_COUNT(target->me);
+ if (!try_module_get(target->me))
+ return -EAGAIN;
t->u.kernel.target = target;
up(&arpt_mutex);
@@ -554,8 +555,7 @@
t->u.target_size
- sizeof(*t),
e->comefrom)) {
- if (t->u.kernel.target->me)
- __MOD_DEC_USE_COUNT(t->u.kernel.target->me);
+ module_put(t->u.kernel.target->me);
duprintf("arp_tables: check failed for `%s'.\n",
t->u.kernel.target->name);
ret = -EINVAL;
@@ -622,8 +622,7 @@
if (t->u.kernel.target->destroy)
t->u.kernel.target->destroy(t->data,
t->u.target_size - sizeof(*t));
- if (t->u.kernel.target->me)
- __MOD_DEC_USE_COUNT(t->u.kernel.target->me);
+ module_put(t->u.kernel.target->me);
return 0;
}
@@ -910,20 +909,29 @@
ret = -EINVAL;
goto free_newinfo_counters_untrans_unlock;
}
+ /* Increment before we know is there will be more or less
+ rules, as we cannot guarrantee the this operation will
+ be successful. */
+ if (!try_module_get(t->me)) {
+ ret = -EAGAIN;
+ goto free_newinfo_counters_untrans_unlock;
+ }
oldinfo = replace_table(t, tmp.num_counters, newinfo, &ret);
if (!oldinfo)
- goto free_newinfo_counters_untrans_unlock;
+ goto free_newinfo_counters_untrans_unlock_module;
/* Update module usage count based on number of rules */
duprintf("do_replace: oldnum=%u, initnum=%u, newnum=%u\n",
oldinfo->number, oldinfo->initial_entries, newinfo->number);
- if (t->me && (oldinfo->number <= oldinfo->initial_entries) &&
- (newinfo->number > oldinfo->initial_entries))
- __MOD_INC_USE_COUNT(t->me);
- else if (t->me && (oldinfo->number > oldinfo->initial_entries) &&
- (newinfo->number <= oldinfo->initial_entries))
- __MOD_DEC_USE_COUNT(t->me);
+
+ /* Now decrement count by two if nessesary. */
+ if ((oldinfo->number > oldinfo->initial_entries) ||
+ (newinfo->number <= oldinfo->initial_entries))
+ module_put(t->me);
+ if ((oldinfo->number > oldinfo->initial_entries) &&
+ (newinfo->number <= oldinfo->initial_entries))
+ module_put(t->me);
/* Get the old counters. */
get_counters(oldinfo, counters);
@@ -937,6 +945,8 @@
up(&arpt_mutex);
return 0;
+ free_newinfo_counters_untrans_unlock_module:
+ module_put(t->me);
free_newinfo_counters_untrans_unlock:
up(&arpt_mutex);
free_newinfo_counters_untrans:
@@ -1110,17 +1120,14 @@
{
int ret;
- MOD_INC_USE_COUNT;
ret = down_interruptible(&arpt_mutex);
if (ret != 0) {
- MOD_DEC_USE_COUNT;
return ret;
}
if (!list_named_insert(&arpt_target, target)) {
duprintf("arpt_register_target: `%s' already in list!\n",
target->name);
ret = -EINVAL;
- MOD_DEC_USE_COUNT;
}
up(&arpt_mutex);
return ret;
@@ -1131,7 +1138,6 @@
down(&arpt_mutex);
LIST_DELETE(&arpt_target, target);
up(&arpt_mutex);
- MOD_DEC_USE_COUNT;
}
int arpt_register_table(struct arpt_table *table)
@@ -1141,12 +1147,10 @@
static struct arpt_table_info bootstrap
= { 0, 0, 0, { 0 }, { 0 }, { } };
- MOD_INC_USE_COUNT;
newinfo = vmalloc(sizeof(struct arpt_table_info)
+ SMP_ALIGN(table->table->size) * NR_CPUS);
if (!newinfo) {
ret = -ENOMEM;
- MOD_DEC_USE_COUNT;
return ret;
}
memcpy(newinfo->entries, table->table->entries, table->table->size);
@@ -1159,14 +1163,12 @@
duprintf("arpt_register_table: translate table gives %d\n", ret);
if (ret != 0) {
vfree(newinfo);
- MOD_DEC_USE_COUNT;
return ret;
}
ret = down_interruptible(&arpt_mutex);
if (ret != 0) {
vfree(newinfo);
- MOD_DEC_USE_COUNT;
return ret;
}
@@ -1196,7 +1198,6 @@
free_unlock:
vfree(newinfo);
- MOD_DEC_USE_COUNT;
goto unlock;
}
@@ -1210,7 +1211,6 @@
ARPT_ENTRY_ITERATE(table->private->entries, table->private->size,
cleanup_entry, NULL);
vfree(table->private);
- MOD_DEC_USE_COUNT;
}
/* The built-in targets: standard (NULL) and error. */
diff -u linux-2.5.56/net/ipv4/netfilter/ip_conntrack_core.c linux-2.5.56-new/net/ipv4/netfilter/ip_conntrack_core.c
--- linux-2.5.56/net/ipv4/netfilter/ip_conntrack_core.c 2003-01-13 12:18:35.000000000 +0100
+++ linux-2.5.56-new/net/ipv4/netfilter/ip_conntrack_core.c 2003-01-13 16:52:48.000000000 +0100
@@ -11,6 +11,8 @@
* 16 Jul 2002: Harald Welte <laforge@gnumonks.org>
* - add usage/reference counts to ip_conntrack_expect
* - export ip_conntrack[_expect]_{find_get,put} functions
+ * 13 Jan 2003 Anders Fugmann <afu@fugmann.dhs.org>
+ * - convert MOD_INC/DEV_USAGE_COUNT to 2.5 API.
* */
#ifdef MODULE
@@ -1131,8 +1133,6 @@
int ip_conntrack_helper_register(struct ip_conntrack_helper *me)
{
- MOD_INC_USE_COUNT;
-
WRITE_LOCK(&ip_conntrack_lock);
list_prepend(&helpers, me);
WRITE_UNLOCK(&ip_conntrack_lock);
@@ -1169,8 +1169,6 @@
/* Someone could be still looking at the helper in a bh. */
br_write_lock_bh(BR_NETPROTO_LOCK);
br_write_unlock_bh(BR_NETPROTO_LOCK);
-
- MOD_DEC_USE_COUNT;
}
/* Refresh conntrack for this many jiffies. */
diff -u linux-2.5.56/net/ipv4/netfilter/ip_conntrack_standalone.c linux-2.5.56-new/net/ipv4/netfilter/ip_conntrack_standalone.c
--- linux-2.5.56/net/ipv4/netfilter/ip_conntrack_standalone.c 2003-01-09 05:04:13.000000000 +0100
+++ linux-2.5.56-new/net/ipv4/netfilter/ip_conntrack_standalone.c 2003-01-13 17:01:01.000000000 +0100
@@ -310,7 +310,6 @@
}
list_prepend(&protocol_list, proto);
- MOD_INC_USE_COUNT;
out:
WRITE_UNLOCK(&ip_conntrack_lock);
@@ -333,7 +332,6 @@
/* Remove all contrack entries for this protocol */
ip_ct_selective_cleanup(kill_proto, &proto->proto);
- MOD_DEC_USE_COUNT;
}
static int __init init(void)
Only in linux-2.5.56-new/net/ipv4/netfilter/: ip_conntrack_standalone.c~
Binary files linux-2.5.56/net/ipv4/netfilter/ip_conntrack_standalone.o and linux-2.5.56-new/net/ipv4/netfilter/ip_conntrack_standalone.o differ
diff -u linux-2.5.56/net/ipv4/netfilter/ip_nat_helper.c linux-2.5.56-new/net/ipv4/netfilter/ip_nat_helper.c
--- linux-2.5.56/net/ipv4/netfilter/ip_nat_helper.c 2003-01-13 12:18:35.000000000 +0100
+++ linux-2.5.56-new/net/ipv4/netfilter/ip_nat_helper.c 2003-01-13 17:39:13.000000000 +0100
@@ -11,6 +11,8 @@
* 16 Aug 2002 Brian J. Murrell <netfilter@interlinx.bc.ca>:
* - make ip_nat_resize_packet more generic (TCP and UDP)
* - add ip_nat_mangle_udp_packet
+ * 13 Jan 2003 Anders Fugmann <afu@fugmann.dhs.org>
+ * - convert MOD_INC/DEV_USAGE_COUNT to 2.5 API.
*/
#include <linux/version.h>
#include <linux/config.h>
@@ -481,7 +483,10 @@
if ((ct_helper = ip_ct_find_helper(&me->tuple))
&& ct_helper->me) {
- __MOD_INC_USE_COUNT(ct_helper->me);
+ /* Double check, but we need to know if the module
+ is available */
+ if (! try_module_get(ct_helper->me))
+ return -EAGAIN;
} else {
/* We are a NAT helper for protocol X. If we need
* respective conntrack helper for protoccol X, compute
@@ -501,7 +506,8 @@
if (!request_module(name)
&& (ct_helper = ip_ct_find_helper(&me->tuple))
&& ct_helper->me) {
- __MOD_INC_USE_COUNT(ct_helper->me);
+ if (!try_module_get(ct_helper->me))
+ return -EAGAIN;
} else {
printk("unable to load module %s\n", name);
return -EBUSY;
@@ -519,7 +525,6 @@
ret = -EBUSY;
else {
list_prepend(&helpers, me);
- MOD_INC_USE_COUNT;
}
WRITE_UNLOCK(&ip_nat_lock);
@@ -563,9 +568,6 @@
worse. --RR */
ip_ct_selective_cleanup(kill_helper, me);
- if (found)
- MOD_DEC_USE_COUNT;
-
/* If we are no standalone NAT helper, we need to decrement usage count
* on our conntrack helper */
if (me->me && !(me->flags & IP_NAT_HELPER_F_STANDALONE)) {
@@ -573,7 +575,7 @@
if ((ct_helper = ip_ct_find_helper(&me->tuple))
&& ct_helper->me) {
- __MOD_DEC_USE_COUNT(ct_helper->me);
+ module_put(ct_helper->me);
}
#ifdef CONFIG_MODULES
else
Binary files linux-2.5.56/net/ipv4/netfilter/ip_nat_helper.o and linux-2.5.56-new/net/ipv4/netfilter/ip_nat_helper.o differ
diff -u linux-2.5.56/net/ipv4/netfilter/ip_nat_standalone.c linux-2.5.56-new/net/ipv4/netfilter/ip_nat_standalone.c
--- linux-2.5.56/net/ipv4/netfilter/ip_nat_standalone.c 2003-01-13 12:18:35.000000000 +0100
+++ linux-2.5.56-new/net/ipv4/netfilter/ip_nat_standalone.c 2003-01-13 17:37:41.000000000 +0100
@@ -10,6 +10,8 @@
* 23 Apr 2001: Harald Welte <laforge@gnumonks.org>
* - new API and handling of conntrack/nat helpers
* - now capable of multiple expectations for one master
+ * 13 Jan 2003 Anders Fugmann <afu@fugmann.dhs.org>
+ * - convert MOD_INC/DEV_USAGE_COUNT to 2.5 API.
* */
#include <linux/config.h>
@@ -255,7 +257,6 @@
}
list_prepend(&protos, proto);
- MOD_INC_USE_COUNT;
out:
WRITE_UNLOCK(&ip_nat_lock);
@@ -272,8 +273,6 @@
/* Someone could be still looking at the proto in a bh. */
br_write_lock_bh(BR_NETPROTO_LOCK);
br_write_unlock_bh(BR_NETPROTO_LOCK);
-
- MOD_DEC_USE_COUNT;
}
static int init_or_cleanup(int init)
@@ -314,13 +313,16 @@
goto cleanup_localoutops;
}
#endif
- if (ip_conntrack_module)
- __MOD_INC_USE_COUNT(ip_conntrack_module);
+ if (! try_module_get(ip_conntrack_module)) {
+ ret = -EAGAIN;
+ goto cleanup_module;
+ }
return ret;
cleanup:
- if (ip_conntrack_module)
- __MOD_DEC_USE_COUNT(ip_conntrack_module);
+ module_put(ip_conntrack_module);
+ cleanup_module:
+
#ifdef CONFIG_IP_NF_NAT_LOCAL
nf_unregister_hook(&ip_nat_local_in_ops);
cleanup_localoutops:
diff -u linux-2.5.56/net/ipv4/netfilter/ip_tables.c linux-2.5.56-new/net/ipv4/netfilter/ip_tables.c
--- linux-2.5.56/net/ipv4/netfilter/ip_tables.c 2003-01-09 05:03:58.000000000 +0100
+++ linux-2.5.56-new/net/ipv4/netfilter/ip_tables.c 2003-01-13 17:34:15.000000000 +0100
@@ -7,6 +7,8 @@
* 19 Jan 2002 Harald Welte <laforge@gnumonks.org>
* - increase module usage count as soon as we have rules inside
* a table
+ * 13 Jan 2003 Anders Fugmann <afu@fugmann.dhs.org>
+ * - convert MOD_INC/DEV_USAGE_COUNT to 2.5 API.
*/
#include <linux/config.h>
#include <linux/cache.h>
@@ -599,8 +601,7 @@
m->u.kernel.match->destroy(m->data,
m->u.match_size - sizeof(*m));
- if (m->u.kernel.match->me)
- __MOD_DEC_USE_COUNT(m->u.kernel.match->me);
+ module_put(m->u.kernel.match->me);
return 0;
}
@@ -650,8 +651,9 @@
duprintf("check_match: `%s' not found\n", m->u.user.name);
return ret;
}
- if (match->me)
- __MOD_INC_USE_COUNT(match->me);
+ if (!try_module_get(match->me))
+ return -EAGAIN;
+
m->u.kernel.match = match;
up(&ipt_mutex);
@@ -659,8 +661,7 @@
&& !m->u.kernel.match->checkentry(name, ip, m->data,
m->u.match_size - sizeof(*m),
hookmask)) {
- if (m->u.kernel.match->me)
- __MOD_DEC_USE_COUNT(m->u.kernel.match->me);
+ module_put(m->u.kernel.match->me);
duprintf("ip_tables: check failed for `%s'.\n",
m->u.kernel.match->name);
return -EINVAL;
@@ -697,8 +698,8 @@
duprintf("check_entry: `%s' not found\n", t->u.user.name);
goto cleanup_matches;
}
- if (target->me)
- __MOD_INC_USE_COUNT(target->me);
+ if (!try_module_get(target->me))
+ return -EAGAIN;
t->u.kernel.target = target;
up(&ipt_mutex);
@@ -712,8 +713,7 @@
t->u.target_size
- sizeof(*t),
e->comefrom)) {
- if (t->u.kernel.target->me)
- __MOD_DEC_USE_COUNT(t->u.kernel.target->me);
+ module_put(t->u.kernel.target->me);
duprintf("ip_tables: check failed for `%s'.\n",
t->u.kernel.target->name);
ret = -EINVAL;
@@ -785,8 +785,7 @@
if (t->u.kernel.target->destroy)
t->u.kernel.target->destroy(t->data,
t->u.target_size - sizeof(*t));
- if (t->u.kernel.target->me)
- __MOD_DEC_USE_COUNT(t->u.kernel.target->me);
+ module_put(t->u.kernel.target->me);
return 0;
}
@@ -1106,22 +1105,31 @@
tmp.valid_hooks, t->valid_hooks);
ret = -EINVAL;
goto free_newinfo_counters_untrans_unlock;
+ }
+ /* Increment before we know is there will be more or less
+ rules, as we cannot guarrantee the this operation will
+ be successful. */
+ if (!try_module_get(t->me)) {
+ ret = -EAGAIN;
+ goto free_newinfo_counters_untrans_unlock;
}
oldinfo = replace_table(t, tmp.num_counters, newinfo, &ret);
if (!oldinfo)
- goto free_newinfo_counters_untrans_unlock;
+ goto free_newinfo_counters_untrans_unlock_module;
/* Update module usage count based on number of rules */
duprintf("do_replace: oldnum=%u, initnum=%u, newnum=%u\n",
oldinfo->number, oldinfo->initial_entries, newinfo->number);
- if (t->me && (oldinfo->number <= oldinfo->initial_entries) &&
- (newinfo->number > oldinfo->initial_entries))
- __MOD_INC_USE_COUNT(t->me);
- else if (t->me && (oldinfo->number > oldinfo->initial_entries) &&
- (newinfo->number <= oldinfo->initial_entries))
- __MOD_DEC_USE_COUNT(t->me);
+ /* Now decrement count by two if nessesary. */
+ if ((oldinfo->number > oldinfo->initial_entries) ||
+ (newinfo->number <= oldinfo->initial_entries))
+ module_put(t->me);
+ if ((oldinfo->number > oldinfo->initial_entries) &&
+ (newinfo->number <= oldinfo->initial_entries))
+ module_put(t->me);
+
/* Get the old counters. */
get_counters(oldinfo, counters);
/* Decrease module usage counts and free resource */
@@ -1133,7 +1141,9 @@
vfree(counters);
up(&ipt_mutex);
return 0;
-
+
+ free_newinfo_counters_untrans_unlock_module:
+ module_put(t->me);
free_newinfo_counters_untrans_unlock:
up(&ipt_mutex);
free_newinfo_counters_untrans:
@@ -1319,17 +1329,14 @@
{
int ret;
- MOD_INC_USE_COUNT;
ret = down_interruptible(&ipt_mutex);
if (ret != 0) {
- MOD_DEC_USE_COUNT;
return ret;
}
if (!list_named_insert(&ipt_target, target)) {
duprintf("ipt_register_target: `%s' already in list!\n",
target->name);
ret = -EINVAL;
- MOD_DEC_USE_COUNT;
}
up(&ipt_mutex);
return ret;
@@ -1341,7 +1348,6 @@
down(&ipt_mutex);
LIST_DELETE(&ipt_target, target);
up(&ipt_mutex);
- MOD_DEC_USE_COUNT;
}
int
@@ -1349,16 +1355,13 @@
{
int ret;
- MOD_INC_USE_COUNT;
ret = down_interruptible(&ipt_mutex);
if (ret != 0) {
- MOD_DEC_USE_COUNT;
return ret;
}
if (!list_named_insert(&ipt_match, match)) {
duprintf("ipt_register_match: `%s' already in list!\n",
match->name);
- MOD_DEC_USE_COUNT;
ret = -EINVAL;
}
up(&ipt_mutex);
@@ -1372,7 +1375,6 @@
down(&ipt_mutex);
LIST_DELETE(&ipt_match, match);
up(&ipt_mutex);
- MOD_DEC_USE_COUNT;
}
int ipt_register_table(struct ipt_table *table)
@@ -1382,12 +1384,10 @@
static struct ipt_table_info bootstrap
= { 0, 0, 0, { 0 }, { 0 }, { } };
- MOD_INC_USE_COUNT;
newinfo = vmalloc(sizeof(struct ipt_table_info)
+ SMP_ALIGN(table->table->size) * NR_CPUS);
if (!newinfo) {
ret = -ENOMEM;
- MOD_DEC_USE_COUNT;
return ret;
}
memcpy(newinfo->entries, table->table->entries, table->table->size);
@@ -1399,14 +1399,12 @@
table->table->underflow);
if (ret != 0) {
vfree(newinfo);
- MOD_DEC_USE_COUNT;
return ret;
}
ret = down_interruptible(&ipt_mutex);
if (ret != 0) {
vfree(newinfo);
- MOD_DEC_USE_COUNT;
return ret;
}
@@ -1436,7 +1434,6 @@
free_unlock:
vfree(newinfo);
- MOD_DEC_USE_COUNT;
goto unlock;
}
@@ -1450,7 +1447,6 @@
IPT_ENTRY_ITERATE(table->private->entries, table->private->size,
cleanup_entry, NULL);
vfree(table->private);
- MOD_DEC_USE_COUNT;
}
/* Returns 1 if the port is matched by the range, 0 otherwise */
diff -u linux-2.5.56/net/ipv4/netfilter/ipchains_core.c linux-2.5.56-new/net/ipv4/netfilter/ipchains_core.c
--- linux-2.5.56/net/ipv4/netfilter/ipchains_core.c 2003-01-09 05:04:24.000000000 +0100
+++ linux-2.5.56-new/net/ipv4/netfilter/ipchains_core.c 2003-01-13 16:26:43.000000000 +0100
@@ -44,6 +44,8 @@
* 23-Jul-1999: Fixed small fragment security exposure opened on 15-May-1998.
* John McDonald <jm@dataprotect.com>
* Thomas Lopatic <tl@dataprotect.com>
+ * 13-Jan-2003: Removed all MOD_INC/DEV_USAGE_COUNT.
+ * Anders Fugmann <afu@fugmann.dhs.org>
*/
/*
@@ -839,7 +841,6 @@
i->branch->refcount--;
kfree(i);
i = tmp;
- MOD_DEC_USE_COUNT;
}
return 0;
}
@@ -886,7 +887,6 @@
if (rule->branch) rule->branch->refcount++;
append_successful:
- MOD_INC_USE_COUNT;
return 0;
}
@@ -917,7 +917,6 @@
f->next = frwl;
insert_successful:
- MOD_INC_USE_COUNT;
return 0;
}
@@ -952,7 +951,6 @@
kfree(tmp);
}
- MOD_DEC_USE_COUNT;
return 0;
}
@@ -1059,7 +1057,6 @@
else
chainptr->chain = ftmp->next;
kfree(ftmp);
- MOD_DEC_USE_COUNT;
break;
}
@@ -1101,7 +1098,6 @@
tmp->next = tmp2->next;
kfree(tmp2);
- MOD_DEC_USE_COUNT;
return 0;
}
@@ -1154,7 +1150,6 @@
* user defined chain *
* and therefore can be
* deleted */
- MOD_INC_USE_COUNT;
return 0;
}
diff -u linux-2.5.56/net/ipv4/netfilter/ipfwadm_core.c linux-2.5.56-new/net/ipv4/netfilter/ipfwadm_core.c
--- linux-2.5.56/net/ipv4/netfilter/ipfwadm_core.c 2003-01-09 05:04:12.000000000 +0100
+++ linux-2.5.56-new/net/ipv4/netfilter/ipfwadm_core.c 2003-01-13 16:28:07.000000000 +0100
@@ -55,6 +55,8 @@
* Jos Vos <jos@xos.nl> 18/5/1996.
* Added trap out of bad frames.
* Alan Cox <alan@cymru.net> 17/11/1996
+ * Removed all module count manipulations
+ * Anders Fugmann <afu@fugmann.dhs.org> 1/10/2003
*
*
* Masquerading functionality
@@ -705,7 +707,6 @@
ftmp = *chainptr;
*chainptr = ftmp->fw_next;
kfree(ftmp);
- MOD_DEC_USE_COUNT;
}
WRITE_UNLOCK(&ip_fw_lock);
}
@@ -746,7 +747,6 @@
ftmp->fw_next = *chainptr;
*chainptr=ftmp;
WRITE_UNLOCK(&ip_fw_lock);
- MOD_INC_USE_COUNT;
return(0);
}
@@ -794,7 +794,6 @@
else
*chainptr=ftmp;
WRITE_UNLOCK(&ip_fw_lock);
- MOD_INC_USE_COUNT;
return(0);
}
@@ -867,7 +866,6 @@
}
WRITE_UNLOCK(&ip_fw_lock);
if (was_found) {
- MOD_DEC_USE_COUNT;
return 0;
} else
return(EINVAL);
diff -u linux-2.5.56/net/ipv4/netfilter/ipt_conntrack.c linux-2.5.56-new/net/ipv4/netfilter/ipt_conntrack.c
--- linux-2.5.56/net/ipv4/netfilter/ipt_conntrack.c 2003-01-09 05:04:25.000000000 +0100
+++ linux-2.5.56-new/net/ipv4/netfilter/ipt_conntrack.c 2003-01-13 16:31:31.000000000 +0100
@@ -106,16 +106,16 @@
static int __init init(void)
{
/* NULL if ip_conntrack not a module */
- if (ip_conntrack_module)
- __MOD_INC_USE_COUNT(ip_conntrack_module);
+ if (!try_module_get(ip_conntrack_module))
+ return -EAGAIN;
+
return ipt_register_match(&conntrack_match);
}
static void __exit fini(void)
{
ipt_unregister_match(&conntrack_match);
- if (ip_conntrack_module)
- __MOD_DEC_USE_COUNT(ip_conntrack_module);
+ module_put(ip_conntrack_module);
}
module_init(init);
Binary files linux-2.5.56/net/ipv4/netfilter/ipt_conntrack.ko and linux-2.5.56-new/net/ipv4/netfilter/ipt_conntrack.ko differ
Binary files linux-2.5.56/net/ipv4/netfilter/ipt_conntrack.o and linux-2.5.56-new/net/ipv4/netfilter/ipt_conntrack.o differ
diff -u linux-2.5.56/net/ipv4/netfilter/ipt_helper.c linux-2.5.56-new/net/ipv4/netfilter/ipt_helper.c
--- linux-2.5.56/net/ipv4/netfilter/ipt_helper.c 2003-01-09 05:04:20.000000000 +0100
+++ linux-2.5.56-new/net/ipv4/netfilter/ipt_helper.c 2003-01-13 16:33:13.000000000 +0100
@@ -6,6 +6,8 @@
*
* 19 Mar 2002 Harald Welte <laforge@gnumonks.org>:
* - Port to newnat infrastructure
+ * 13 Jan 2003 Anders Fugmann <afu@fugmann.dhs.org>
+ * - convert MOD_INC/DEV_USAGE_COUNT to 2.5 API.
*/
#include <linux/module.h>
#include <linux/skbuff.h>
@@ -95,16 +97,15 @@
static int __init init(void)
{
/* NULL if ip_conntrack not a module */
- if (ip_conntrack_module)
- __MOD_INC_USE_COUNT(ip_conntrack_module);
+ if (! try_module_get(ip_conntrack_module))
+ return -EAGAIN;
return ipt_register_match(&helper_match);
}
static void __exit fini(void)
{
ipt_unregister_match(&helper_match);
- if (ip_conntrack_module)
- __MOD_DEC_USE_COUNT(ip_conntrack_module);
+ module_put(ip_conntrack_module);
}
module_init(init);
diff -u linux-2.5.56/net/ipv4/netfilter/ipt_state.c linux-2.5.56-new/net/ipv4/netfilter/ipt_state.c
--- linux-2.5.56/net/ipv4/netfilter/ipt_state.c 2003-01-09 05:04:27.000000000 +0100
+++ linux-2.5.56-new/net/ipv4/netfilter/ipt_state.c 2003-01-13 16:33:49.000000000 +0100
@@ -47,16 +47,15 @@
static int __init init(void)
{
/* NULL if ip_conntrack not a module */
- if (ip_conntrack_module)
- __MOD_INC_USE_COUNT(ip_conntrack_module);
+ if (! try_module_get(ip_conntrack_module))
+ return -EAGAIN;
return ipt_register_match(&state_match);
}
static void __exit fini(void)
{
ipt_unregister_match(&state_match);
- if (ip_conntrack_module)
- __MOD_DEC_USE_COUNT(ip_conntrack_module);
+ module_put(ip_conntrack_module);
}
module_init(init);
next prev parent reply other threads:[~2003-01-13 16:58 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-01-09 21:52 remove usage of __MOD_XXX_USAGE_COUNT and derivatives Anders Fugmann
2003-01-10 13:13 ` Harald Welte
2003-01-10 13:49 ` Anders Fugmann
2003-01-10 13:49 ` Harald Welte
2003-01-10 15:21 ` Anders Fugmann
2003-01-12 16:36 ` Harald Welte
2003-01-12 22:14 ` Bart De Schuymer
2003-01-13 16:58 ` Anders Fugmann [this message]
2003-01-13 22:56 ` Bart De Schuymer
2003-01-13 22:21 ` Anders Fugmann
2003-01-13 23:53 ` Bart De Schuymer
[not found] ` <3E234A92.50606@fugmann.dhs.org>
2003-01-14 1:14 ` Bart De Schuymer
2003-01-11 16:13 ` Bart De Schuymer
2003-01-11 18:36 ` Anders Fugmann
2003-02-16 19:43 ` Anders Fugmann
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=3E22F02E.8060800@fugmann.dhs.org \
--to=afu@fugmann.dhs.org \
--cc=bdschuym@pandora.be \
--cc=laforge@gnumonks.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.