diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2010-02-12 00:25:36 -0500 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2010-02-12 00:25:36 -0500 |
commit | ca1c2e2da9637c131436bf6d6ae41b58f5353afe (patch) | |
tree | 0a0cc519a5427bc79fee50df75784a4afc830995 /net | |
parent | 857b409a48bdc33e824dff2d730e271b964e78bd (diff) |
netfilter: don't use INIT_RCU_HEAD()
call_rcu() will unconditionally reinitialize RCU head anyway.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Reviewed-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/netfilter/nf_conntrack_expect.c | 1 | ||||
-rw-r--r-- | net/netfilter/nf_conntrack_extend.c | 1 | ||||
-rw-r--r-- | net/netfilter/nfnetlink_queue.c | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/net/netfilter/nf_conntrack_expect.c b/net/netfilter/nf_conntrack_expect.c index 33b85f834c06..6182fb1b55de 100644 --- a/net/netfilter/nf_conntrack_expect.c +++ b/net/netfilter/nf_conntrack_expect.c | |||
@@ -232,7 +232,6 @@ struct nf_conntrack_expect *nf_ct_expect_alloc(struct nf_conn *me) | |||
232 | 232 | ||
233 | new->master = me; | 233 | new->master = me; |
234 | atomic_set(&new->use, 1); | 234 | atomic_set(&new->use, 1); |
235 | INIT_RCU_HEAD(&new->rcu); | ||
236 | return new; | 235 | return new; |
237 | } | 236 | } |
238 | EXPORT_SYMBOL_GPL(nf_ct_expect_alloc); | 237 | EXPORT_SYMBOL_GPL(nf_ct_expect_alloc); |
diff --git a/net/netfilter/nf_conntrack_extend.c b/net/netfilter/nf_conntrack_extend.c index fef95be334bd..fdc8fb4ae10f 100644 --- a/net/netfilter/nf_conntrack_extend.c +++ b/net/netfilter/nf_conntrack_extend.c | |||
@@ -59,7 +59,6 @@ nf_ct_ext_create(struct nf_ct_ext **ext, enum nf_ct_ext_id id, gfp_t gfp) | |||
59 | if (!*ext) | 59 | if (!*ext) |
60 | return NULL; | 60 | return NULL; |
61 | 61 | ||
62 | INIT_RCU_HEAD(&(*ext)->rcu); | ||
63 | (*ext)->offset[id] = off; | 62 | (*ext)->offset[id] = off; |
64 | (*ext)->len = len; | 63 | (*ext)->len = len; |
65 | 64 | ||
diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c index 90cf36decea3..7ba4abc405c9 100644 --- a/net/netfilter/nfnetlink_queue.c +++ b/net/netfilter/nfnetlink_queue.c | |||
@@ -112,7 +112,6 @@ instance_create(u_int16_t queue_num, int pid) | |||
112 | inst->copy_mode = NFQNL_COPY_NONE; | 112 | inst->copy_mode = NFQNL_COPY_NONE; |
113 | spin_lock_init(&inst->lock); | 113 | spin_lock_init(&inst->lock); |
114 | INIT_LIST_HEAD(&inst->queue_list); | 114 | INIT_LIST_HEAD(&inst->queue_list); |
115 | INIT_RCU_HEAD(&inst->rcu); | ||
116 | 115 | ||
117 | if (!try_module_get(THIS_MODULE)) { | 116 | if (!try_module_get(THIS_MODULE)) { |
118 | err = -EAGAIN; | 117 | err = -EAGAIN; |