Subject: [to-be-updated] memcg-move-initialization-to-memcg-creation.patch removed from -mm tree To: glommer@xxxxxxxxxx,dchinner@xxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Thu, 06 Jun 2013 12:35:25 -0700 The patch titled Subject: memcg: move initialization to memcg creation has been removed from the -mm tree. Its filename was memcg-move-initialization-to-memcg-creation.patch This patch was dropped because an updated version will be merged ------------------------------------------------------ From: Glauber Costa <glommer@xxxxxxxxxx> Subject: memcg: move initialization to memcg creation 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. Cc: Glauber Costa <glommer@xxxxxxxxxx> Cc: Dave Chinner <dchinner@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/memcontrol.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN mm/memcontrol.c~memcg-move-initialization-to-memcg-creation mm/memcontrol.c --- a/mm/memcontrol.c~memcg-move-initialization-to-memcg-creation +++ a/mm/memcontrol.c @@ -3352,9 +3352,7 @@ int memcg_update_cache_sizes(struct mem_ memcg_update_array_size(num + 1); - INIT_LIST_HEAD(&memcg->memcg_slab_caches); INIT_WORK(&memcg->kmemcg_shrink_work, kmemcg_shrink_work_fn); - mutex_init(&memcg->slab_caches_mutex); return 0; out: @@ -6345,6 +6343,8 @@ static int memcg_init_kmem(struct mem_cg { 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) _ Patches currently in -mm which might be from glommer@xxxxxxxxxx are vmpressure-in-kernel-notifications.patch memcg-reap-dead-memcgs-upon-global-memory-pressure.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html