Commit edc86d8a authored by Lai Jiangshan's avatar Lai Jiangshan Committed by Paul E. McKenney
Browse files

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: default avatarLai Jiangshan <laijs@cn.fujitsu.com>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Reviewed-by: default avatarJosh Triplett <josh@joshtriplett.org>
parent f6f80238
Loading
Loading
Loading
Loading
+2 −9
Original line number Diff line number Diff line
@@ -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;
				}
			}