From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932182AbaGULrf (ORCPT ); Mon, 21 Jul 2014 07:47:35 -0400 Received: from mx2.parallels.com ([199.115.105.18]:57591 "EHLO mx2.parallels.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932148AbaGULrc (ORCPT ); Mon, 21 Jul 2014 07:47:32 -0400 From: Vladimir Davydov To: CC: , , , , Subject: [PATCH -mm 1/6] slub: remove kmemcg id from create_unique_id Date: Mon, 21 Jul 2014 15:47:11 +0400 Message-ID: X-Mailer: git-send-email 1.7.10.4 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This function is never called for memcg caches, because they are unmergeable, so remove the dead code. Signed-off-by: Vladimir Davydov --- mm/slub.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/mm/slub.c b/mm/slub.c index 2b068c3638aa..a1cdbad02f0c 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -5130,12 +5130,6 @@ static char *create_unique_id(struct kmem_cache *s) *p++ = '-'; p += sprintf(p, "%07d", s->size); -#ifdef CONFIG_MEMCG_KMEM - if (!is_root_cache(s)) - p += sprintf(p, "-%08d", - memcg_cache_id(s->memcg_params->memcg)); -#endif - BUG_ON(p > name + ID_STR_LENGTH - 1); return name; } -- 1.7.10.4