mirror of
https://github.com/torvalds/linux
synced 2024-11-05 18:23:50 +00:00
net,rcu: convert call_rcu(xps_map_release) to kfree_rcu()
The rcu callback xps_map_release() just calls a kfree(), so we use kfree_rcu() instead of the call_rcu(xps_map_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
f6f80238fa
commit
edc86d8a1c
1 changed files with 2 additions and 9 deletions
|
@ -891,13 +891,6 @@ static ssize_t show_xps_map(struct netdev_queue *queue,
|
|||
return len;
|
||||
}
|
||||
|
||||
static void xps_map_release(struct rcu_head *rcu)
|
||||
{
|
||||
struct xps_map *map = container_of(rcu, struct xps_map, rcu);
|
||||
|
||||
kfree(map);
|
||||
}
|
||||
|
||||
static void xps_dev_maps_release(struct rcu_head *rcu)
|
||||
{
|
||||
struct xps_dev_maps *dev_maps =
|
||||
|
@ -1002,7 +995,7 @@ static ssize_t store_xps_map(struct netdev_queue *queue,
|
|||
map = dev_maps ?
|
||||
xmap_dereference(dev_maps->cpu_map[cpu]) : NULL;
|
||||
if (map && xmap_dereference(new_dev_maps->cpu_map[cpu]) != map)
|
||||
call_rcu(&map->rcu, xps_map_release);
|
||||
kfree_rcu(map, rcu);
|
||||
if (new_dev_maps->cpu_map[cpu])
|
||||
nonempty = 1;
|
||||
}
|
||||
|
@ -1077,7 +1070,7 @@ static void netdev_queue_release(struct kobject *kobj)
|
|||
else {
|
||||
RCU_INIT_POINTER(dev_maps->cpu_map[i],
|
||||
NULL);
|
||||
call_rcu(&map->rcu, xps_map_release);
|
||||
kfree_rcu(map, rcu);
|
||||
map = NULL;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue