Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-17 02:36:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

memcg, kmem: rename cache_from_memcg to cache_from_memcg_idx

Browse Source 
We can't see the relationship with memcg from the parameters,
so the name with memcg_idx would be more reasonable.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Reviewed-by: Pekka Enberg <penberg@kernel.org>
Acked-by: David Rientjes <rientjes@google.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Glauber Costa <glommer@parallels.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Qiang Huang 2013-11-12 15:08:23 -08:00 committed by Linus Torvalds
parent f35c3a8eed
commit 2ade4de871
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mm/slab.c
View File

@ -3982,7 +3982,7 @@ static int do_tune_cpucache(struct kmem_cache *cachep, int limit,
VM_BUG_ON(!mutex_is_locked(&slab_mutex)); VM_BUG_ON(!mutex_is_locked(&slab_mutex));
for_each_memcg_cache_index(i) { for_each_memcg_cache_index(i) {
c = cache_from_memcg(cachep, i); c = cache_from_memcg_idx(cachep, i);
if (c) if (c)
/* return value determined by the parent cache only */ /* return value determined by the parent cache only */
__do_tune_cpucache(c, limit, batchcount, shared, gfp); __do_tune_cpucache(c, limit, batchcount, shared, gfp);

6
mm/slab.h
View File

@ -160,7 +160,8 @@ static inline const char *cache_name(struct kmem_cache *s)
return s->name; return s->name;
} }
static inline struct kmem_cache *cache_from_memcg(struct kmem_cache *s, int idx) static inline struct kmem_cache *
cache_from_memcg_idx(struct kmem_cache *s, int idx)
{ {
if (!s->memcg_params) if (!s->memcg_params)
return NULL; return NULL;
@ -204,7 +205,8 @@ static inline const char *cache_name(struct kmem_cache *s)
return s->name; return s->name;
} }
static inline struct kmem_cache *cache_from_memcg(struct kmem_cache *s, int idx) static inline struct kmem_cache *
cache_from_memcg_idx(struct kmem_cache *s, int idx)
{ {
return NULL; return NULL;
} }

2
mm/slab_common.c
View File

@ -571,7 +571,7 @@ memcg_accumulate_slabinfo(struct kmem_cache *s, struct slabinfo *info)
return; return;
for_each_memcg_cache_index(i) { for_each_memcg_cache_index(i) {
c = cache_from_memcg(s, i); c = cache_from_memcg_idx(s, i);
if (!c) if (!c)
continue; continue;

2
mm/slub.c
View File

@ -4983,7 +4983,7 @@ static ssize_t slab_attr_store(struct kobject *kobj,
* through the descendants with best-effort propagation. * through the descendants with best-effort propagation.
*/ */
for_each_memcg_cache_index(i) { for_each_memcg_cache_index(i) {
struct kmem_cache *c = cache_from_memcg(s, i); struct kmem_cache *c = cache_from_memcg_idx(s, i);
if (c) if (c)
attribute->store(c, buf, len); attribute->store(c, buf, len);
} }