lkml.org 
[lkml]   [2013]   [Oct]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v11 04/15] memcg: move initialization to memcg creation
    Date
    From: Glauber Costa <glommer@openvz.org>

    Those structures are only used for memcgs that are effectively using
    kmemcg. However, in a later patch I intend to use scan that list
    inconditionally (list empty meaning no kmem caches present), which
    simplifies the code a lot.

    So move the initialization to early kmem creation.

    Signed-off-by: Glauber Costa <glommer@openvz.org>
    Cc: Dave Chinner <dchinner@redhat.com>
    Cc: Mel Gorman <mgorman@suse.de>
    Cc: Rik van Riel <riel@redhat.com>
    Cc: Johannes Weiner <hannes@cmpxchg.org>
    Cc: Michal Hocko <mhocko@suse.cz>
    Cc: Hugh Dickins <hughd@google.com>
    Cc: Kamezawa Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    ---
    mm/memcontrol.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/mm/memcontrol.c b/mm/memcontrol.c
    index 41c216a..5104d1f 100644
    --- a/mm/memcontrol.c
    +++ b/mm/memcontrol.c
    @@ -3120,8 +3120,6 @@ int memcg_update_cache_sizes(struct mem_cgroup *memcg)
    }

    memcg->kmemcg_id = num;
    - INIT_LIST_HEAD(&memcg->memcg_slab_caches);
    - mutex_init(&memcg->slab_caches_mutex);
    return 0;
    }

    @@ -5916,6 +5914,8 @@ static int memcg_init_kmem(struct mem_cgroup *memcg, struct cgroup_subsys *ss)
    {
    int ret;

    + INIT_LIST_HEAD(&memcg->memcg_slab_caches);
    + mutex_init(&memcg->slab_caches_mutex);
    memcg->kmemcg_id = -1;
    ret = memcg_propagate_kmem(memcg);
    if (ret)
    --
    1.7.10.4


    \
     
     \ /
      Last update: 2013-10-24 14:41    [W:2.273 / U:0.804 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site