Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

memcg: rename RESOURCE_MAX to RES_COUNTER_MAX

RESOURCE_MAX is far too general name, change it to RES_COUNTER_MAX.

Signed-off-by: Sha Zhengju <handai.szj@taobao.com>
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Acked-by: Michal Hocko <mhocko@suse.cz>
Cc: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
Cc: Jeff Liu <jeff.liu@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Sha Zhengju and committed by
Linus Torvalds
6de5a8bf 34ff8dc0

+12 -12
+1 -1
include/linux/res_counter.h
··· 54 54 struct res_counter *parent; 55 55 }; 56 56 57 - #define RESOURCE_MAX ULLONG_MAX 57 + #define RES_COUNTER_MAX ULLONG_MAX 58 58 59 59 /** 60 60 * Helpers to interact with userspace
+4 -4
kernel/res_counter.c
··· 17 17 void res_counter_init(struct res_counter *counter, struct res_counter *parent) 18 18 { 19 19 spin_lock_init(&counter->lock); 20 - counter->limit = RESOURCE_MAX; 21 - counter->soft_limit = RESOURCE_MAX; 20 + counter->limit = RES_COUNTER_MAX; 21 + counter->soft_limit = RES_COUNTER_MAX; 22 22 counter->parent = parent; 23 23 } 24 24 ··· 182 182 { 183 183 char *end; 184 184 185 - /* return RESOURCE_MAX(unlimited) if "-1" is specified */ 185 + /* return RES_COUNTER_MAX(unlimited) if "-1" is specified */ 186 186 if (*buf == '-') { 187 187 *res = simple_strtoull(buf + 1, &end, 10); 188 188 if (*res != 1 || *end != '\0') 189 189 return -EINVAL; 190 - *res = RESOURCE_MAX; 190 + *res = RES_COUNTER_MAX; 191 191 return 0; 192 192 } 193 193
+2 -2
mm/memcontrol.c
··· 4967 4967 */ 4968 4968 mutex_lock(&memcg_create_mutex); 4969 4969 mutex_lock(&set_limit_mutex); 4970 - if (!memcg->kmem_account_flags && val != RESOURCE_MAX) { 4970 + if (!memcg->kmem_account_flags && val != RES_COUNTER_MAX) { 4971 4971 if (cgroup_task_count(css->cgroup) || memcg_has_children(memcg)) { 4972 4972 ret = -EBUSY; 4973 4973 goto out; ··· 4977 4977 4978 4978 ret = memcg_update_cache_sizes(memcg); 4979 4979 if (ret) { 4980 - res_counter_set_limit(&memcg->kmem, RESOURCE_MAX); 4980 + res_counter_set_limit(&memcg->kmem, RES_COUNTER_MAX); 4981 4981 goto out; 4982 4982 } 4983 4983 static_key_slow_inc(&memcg_kmem_enabled_key);
+5 -5
net/ipv4/tcp_memcontrol.c
··· 87 87 if (!cg_proto) 88 88 return -EINVAL; 89 89 90 - if (val > RESOURCE_MAX) 91 - val = RESOURCE_MAX; 90 + if (val > RES_COUNTER_MAX) 91 + val = RES_COUNTER_MAX; 92 92 93 93 tcp = tcp_from_cgproto(cg_proto); 94 94 ··· 101 101 tcp->tcp_prot_mem[i] = min_t(long, val >> PAGE_SHIFT, 102 102 net->ipv4.sysctl_tcp_mem[i]); 103 103 104 - if (val == RESOURCE_MAX) 104 + if (val == RES_COUNTER_MAX) 105 105 clear_bit(MEMCG_SOCK_ACTIVE, &cg_proto->flags); 106 - else if (val != RESOURCE_MAX) { 106 + else if (val != RES_COUNTER_MAX) { 107 107 /* 108 108 * The active bit needs to be written after the static_key 109 109 * update. This is what guarantees that the socket activation ··· 187 187 188 188 switch (cft->private) { 189 189 case RES_LIMIT: 190 - val = tcp_read_stat(memcg, RES_LIMIT, RESOURCE_MAX); 190 + val = tcp_read_stat(memcg, RES_LIMIT, RES_COUNTER_MAX); 191 191 break; 192 192 case RES_USAGE: 193 193 val = tcp_read_usage(memcg);