mirror of
https://github.com/torvalds/linux.git
synced 2024-11-17 17:41:44 +00:00
net,rcu: convert call_rcu(net_generic_release) to kfree_rcu()
The rcu callback net_generic_release() just calls a kfree(), so we use kfree_rcu() instead of the call_rcu(net_generic_release). Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com> Acked-by: David S. Miller <davem@davemloft.net> Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Reviewed-by: Josh Triplett <josh@joshtriplett.org>
This commit is contained in:
parent
6b26223281
commit
04d4dfed8e
@ -27,14 +27,6 @@ EXPORT_SYMBOL(init_net);
|
||||
|
||||
#define INITIAL_NET_GEN_PTRS 13 /* +1 for len +2 for rcu_head */
|
||||
|
||||
static void net_generic_release(struct rcu_head *rcu)
|
||||
{
|
||||
struct net_generic *ng;
|
||||
|
||||
ng = container_of(rcu, struct net_generic, rcu);
|
||||
kfree(ng);
|
||||
}
|
||||
|
||||
static int net_assign_generic(struct net *net, int id, void *data)
|
||||
{
|
||||
struct net_generic *ng, *old_ng;
|
||||
@ -68,7 +60,7 @@ static int net_assign_generic(struct net *net, int id, void *data)
|
||||
memcpy(&ng->ptr, &old_ng->ptr, old_ng->len * sizeof(void*));
|
||||
|
||||
rcu_assign_pointer(net->gen, ng);
|
||||
call_rcu(&old_ng->rcu, net_generic_release);
|
||||
kfree_rcu(old_ng, rcu);
|
||||
assign:
|
||||
ng->ptr[id - 1] = data;
|
||||
return 0;
|
||||
|
Loading…
Reference in New Issue
Block a user