Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca1c2e2d authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Patrick McHardy
Browse files

netfilter: don't use INIT_RCU_HEAD() 



call_rcu() will unconditionally reinitialize RCU head anyway.

Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Reviewed-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent 857b409a

net/netfilter/nf_conntrack_expect.c

+0 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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;