net,rcu: convert call_rcu(rps_map_release) to kfree_rcu()

The rcu callback rps_map_release() just calls a kfree(),
so we use kfree_rcu() instead of the call_rcu(rps_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>

diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index 5ceb257e860c18cbabe352f67cb8760d95bcba84..c410f2854c8955c350ba640812a558615df83eb2 100644 (file)
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -565,13 +565,6 @@ static ssize_t show_rps_map(struct netdev_rx_queue *queue,
        return len;
 }
 
-static void rps_map_release(struct rcu_head *rcu)
-{
-       struct rps_map *map = container_of(rcu, struct rps_map, rcu);
-
-       kfree(map);
-}
-
 static ssize_t store_rps_map(struct netdev_rx_queue *queue,
                      struct rx_queue_attribute *attribute,
                      const char *buf, size_t len)
@@ -619,7 +612,7 @@ static ssize_t store_rps_map(struct netdev_rx_queue *queue,
        spin_unlock(&rps_map_lock);
 
        if (old_map)
-               call_rcu(&old_map->rcu, rps_map_release);
+               kfree_rcu(old_map, rcu);
 
        free_cpumask_var(mask);
        return len;
@@ -728,7 +721,7 @@ static void rx_queue_release(struct kobject *kobj)
        map = rcu_dereference_raw(queue->rps_map);
        if (map) {
                RCU_INIT_POINTER(queue->rps_map, NULL);
-               call_rcu(&map->rcu, rps_map_release);
+               kfree_rcu(map, rcu);
        }
 
        flow_table = rcu_dereference_raw(queue->rps_flow_table);