diff options
author | Vladimir Davydov <vdavydov@parallels.com> | 2014-08-06 19:07:33 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-06 21:01:21 -0400 |
commit | aee52cae00ba0d426a827b761920a476a08eca9e (patch) | |
tree | a729419a79cc680741830016bda5bdf471b60cbb /mm | |
parent | 9ef0a0ffa28edbf5c7cfa6be73b4ecb9896a3875 (diff) |
slub: remove kmemcg id from create_unique_id
This function is never called for memcg caches, because they are
unmergeable, so remove the dead code.
Signed-off-by: Vladimir Davydov <vdavydov@parallels.com>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Christoph Lameter <cl@linux.com>
Reviewed-by: Pekka Enberg <penberg@kernel.org>
Cc: David Rientjes <rientjes@google.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r-- | mm/slub.c | 6 |
1 files changed, 0 insertions, 6 deletions
@@ -5128,12 +5128,6 @@ static char *create_unique_id(struct kmem_cache *s) | |||
5128 | *p++ = '-'; | 5128 | *p++ = '-'; |
5129 | p += sprintf(p, "%07d", s->size); | 5129 | p += sprintf(p, "%07d", s->size); |
5130 | 5130 | ||
5131 | #ifdef CONFIG_MEMCG_KMEM | ||
5132 | if (!is_root_cache(s)) | ||
5133 | p += sprintf(p, "-%08d", | ||
5134 | memcg_cache_id(s->memcg_params->memcg)); | ||
5135 | #endif | ||
5136 | |||
5137 | BUG_ON(p > name + ID_STR_LENGTH - 1); | 5131 | BUG_ON(p > name + ID_STR_LENGTH - 1); |
5138 | return name; | 5132 | return name; |
5139 | } | 5133 | } |