forked from luck/tmp_suning_uos_patched
memcg, kmem: rename cache_from_memcg to cache_from_memcg_idx
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:
parent
f35c3a8eed
commit
2ade4de871
|
@ -3982,7 +3982,7 @@ static int do_tune_cpucache(struct kmem_cache *cachep, int limit,
|
|||
|
||||
VM_BUG_ON(!mutex_is_locked(&slab_mutex));
|
||||
for_each_memcg_cache_index(i) {
|
||||
c = cache_from_memcg(cachep, i);
|
||||
c = cache_from_memcg_idx(cachep, i);
|
||||
if (c)
|
||||
/* return value determined by the parent cache only */
|
||||
__do_tune_cpucache(c, limit, batchcount, shared, gfp);
|
||||
|
|
|
@ -160,7 +160,8 @@ static inline const char *cache_name(struct kmem_cache *s)
|
|||
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)
|
||||
return NULL;
|
||||
|
@ -204,7 +205,8 @@ static inline const char *cache_name(struct kmem_cache *s)
|
|||
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;
|
||||
}
|
||||
|
|
|
@ -571,7 +571,7 @@ memcg_accumulate_slabinfo(struct kmem_cache *s, struct slabinfo *info)
|
|||
return;
|
||||
|
||||
for_each_memcg_cache_index(i) {
|
||||
c = cache_from_memcg(s, i);
|
||||
c = cache_from_memcg_idx(s, i);
|
||||
if (!c)
|
||||
continue;
|
||||
|
||||
|
|
|
@ -4983,7 +4983,7 @@ static ssize_t slab_attr_store(struct kobject *kobj,
|
|||
* through the descendants with best-effort propagation.
|
||||
*/
|
||||
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)
|
||||
attribute->store(c, buf, len);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user