git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
net
/
ipv4
/
netfilter
/
ip_nat_amanda.c
diff --git
a/net/ipv4/netfilter/ip_nat_amanda.c
b/net/ipv4/netfilter/ip_nat_amanda.c
index
706c807
..
85df1a9
100644
(file)
--- a/
net/ipv4/netfilter/ip_nat_amanda.c
+++ b/
net/ipv4/netfilter/ip_nat_amanda.c
@@
-68,19
+68,18
@@
static unsigned int help(struct sk_buff **pskb,
return ret;
}
return ret;
}
-static void __exit fini(void)
+static void __exit
ip_nat_amanda_
fini(void)
{
{
- ip_nat_amanda_hook = NULL;
- /* Make sure noone calls it, meanwhile. */
- synchronize_net();
+ rcu_assign_pointer(ip_nat_amanda_hook, NULL);
+ synchronize_rcu();
}
}
-static int __init init(void)
+static int __init i
p_nat_amanda_i
nit(void)
{
{
- BUG_ON(
ip_nat_amanda_hook
);
-
ip_nat_amanda_hook = help
;
+ BUG_ON(
rcu_dereference(ip_nat_amanda_hook)
);
+
rcu_assign_pointer(ip_nat_amanda_hook, help)
;
return 0;
}
return 0;
}
-module_init(init);
-module_exit(fini);
+module_init(i
p_nat_amanda_i
nit);
+module_exit(
ip_nat_amanda_
fini);