Skip to contentSkip to conversation

netfilter: don't use INIT_RCU_HEAD()

PATCH Applied Alexey Dobriyan 3 participants 3 messages Feb 11, 2010 – Feb 12, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 netfilter: don't use INIT_RCU_HEAD()

call_rcu() will unconditionally reinitialize RCU head anyway.

---

 net/netfilter/nf_conntrack_expect.c |    1 -
 net/netfilter/nf_conntrack_extend.c |    1 -
 net/netfilter/nfnetlink_queue.c     |    1 -
 3 files changed, 3 deletions(-)
net/netfilter/nf_conntrack_expect.c +0 -1
@@ -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);
net/netfilter/nf_conntrack_extend.c +0 -1
@@ -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;
 
net/netfilter/nfnetlink_queue.c +0 -1
@@ -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;
Reviewed-by on v1 1/1
#1 lore raw
Quoted 1 line · Alexey Dobriyan

call_rcu() will unconditionally reinitialize RCU head anyway.

Quoted 42 lines

---

 net/netfilter/nf_conntrack_expect.c |    1 -
 net/netfilter/nf_conntrack_extend.c |    1 -
 net/netfilter/nfnetlink_queue.c     |    1 -
 3 files changed, 3 deletions(-)
net/netfilter/nf_conntrack_expect.c +0 -1
@@ -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);
net/netfilter/nf_conntrack_extend.c +0 -1
@@ -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;
 
net/netfilter/nfnetlink_queue.c +0 -2
@@ -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;
--

To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html