diff options
| author | Alexey Dobriyan <adobriyan@gmail.com> | 2010-02-12 06:25:36 +0100 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2010-02-12 06:25:36 +0100 |
| commit | ca1c2e2da9637c131436bf6d6ae41b58f5353afe (patch) | |
| tree | 0a0cc519a5427bc79fee50df75784a4afc830995 /net/netfilter | |
| parent | 857b409a48bdc33e824dff2d730e271b964e78bd (diff) | |
| download | linux-stable-ca1c2e2da9637c131436bf6d6ae41b58f5353afe.tar.gz linux-stable-ca1c2e2da9637c131436bf6d6ae41b58f5353afe.tar.bz2 linux-stable-ca1c2e2da9637c131436bf6d6ae41b58f5353afe.zip | |
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/netfilter')
| -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) new->master = me; atomic_set(&new->use, 1); - INIT_RCU_HEAD(&new->rcu); return new; } 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) if (!*ext) return NULL; - INIT_RCU_HEAD(&(*ext)->rcu); (*ext)->offset[id] = off; (*ext)->len = len; 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) inst->copy_mode = NFQNL_COPY_NONE; spin_lock_init(&inst->lock); INIT_LIST_HEAD(&inst->queue_list); - INIT_RCU_HEAD(&inst->rcu); if (!try_module_get(THIS_MODULE)) { err = -EAGAIN; |