diff options
| author | Lai Jiangshan <laijs@cn.fujitsu.com> | 2011-03-18 12:01:31 +0800 |
|---|---|---|
| committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2011-05-07 22:51:02 -0700 |
| commit | f6f80238fab1ad19c44b4a12501528d50fc7fcd6 (patch) | |
| tree | d40f2fb303dea12d632648e00d279712a8f57533 /net | |
| parent | e3cbf28fa61456bd2f0ba39846ffd905257eb4b0 (diff) | |
| download | kernel_goldelico_gta04-f6f80238fab1ad19c44b4a12501528d50fc7fcd6.zip kernel_goldelico_gta04-f6f80238fab1ad19c44b4a12501528d50fc7fcd6.tar.gz kernel_goldelico_gta04-f6f80238fab1ad19c44b4a12501528d50fc7fcd6.tar.bz2 | |
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/net-sysfs.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c index 5ceb257..c410f28 100644 --- 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); |