lkml.org 
[lkml]   [2012]   [Nov]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3/7] netprio_cgroup: shorten variable names in extend_netdev_table()
    Date
    The function is about to go through a rewrite.  In preparation,
    shorten the variable names so that we don't repeat "priomap" so often.

    This patch is cosmetic.

    Signed-off-by: Tejun Heo <tj@kernel.org>
    Acked-by: Neil Horman <nhorman@tuxdriver.com>
    ---
    net/core/netprio_cgroup.c | 23 +++++++++++------------
    1 file changed, 11 insertions(+), 12 deletions(-)

    diff --git a/net/core/netprio_cgroup.c b/net/core/netprio_cgroup.c
    index 66d98da..92cc54c 100644
    --- a/net/core/netprio_cgroup.c
    +++ b/net/core/netprio_cgroup.c
    @@ -71,26 +71,25 @@ static int extend_netdev_table(struct net_device *dev, u32 new_len)
    {
    size_t new_size = sizeof(struct netprio_map) +
    ((sizeof(u32) * new_len));
    - struct netprio_map *new_priomap = kzalloc(new_size, GFP_KERNEL);
    - struct netprio_map *old_priomap;
    + struct netprio_map *new = kzalloc(new_size, GFP_KERNEL);
    + struct netprio_map *old;

    - old_priomap = rtnl_dereference(dev->priomap);
    + old = rtnl_dereference(dev->priomap);

    - if (!new_priomap) {
    + if (!new) {
    pr_warn("Unable to alloc new priomap!\n");
    return -ENOMEM;
    }

    - if (old_priomap)
    - memcpy(new_priomap->priomap, old_priomap->priomap,
    - old_priomap->priomap_len *
    - sizeof(old_priomap->priomap[0]));
    + if (old)
    + memcpy(new->priomap, old->priomap,
    + old->priomap_len * sizeof(old->priomap[0]));

    - new_priomap->priomap_len = new_len;
    + new->priomap_len = new_len;

    - rcu_assign_pointer(dev->priomap, new_priomap);
    - if (old_priomap)
    - kfree_rcu(old_priomap, rcu);
    + rcu_assign_pointer(dev->priomap, new);
    + if (old)
    + kfree_rcu(old, rcu);
    return 0;
    }

    --
    1.7.11.7


    \
     
     \ /
      Last update: 2012-11-20 12:21    [W:4.058 / U:0.312 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site