lkml.org 
[lkml]   [2011]   [May]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH tip/core/rcu 58/86] net,rcu: convert call_rcu(xps_map_release) to kfree_rcu()
    Date
    From: Lai Jiangshan <laijs@cn.fujitsu.com>

    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>
    ---
    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 c410f28..48ffc21 100644
    --- a/net/core/net-sysfs.c
    +++ b/net/core/net-sysfs.c
    @@ -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;
    }
    }
    --
    1.7.3.2


    \
     
     \ /
      Last update: 2011-05-01 15:33    [W:0.022 / U:0.384 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site