diff options
author | Sha Zhengju <handai.szj@taobao.com> | 2013-09-12 18:13:47 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-12 18:38:02 -0400 |
commit | 6de5a8bfcae6e3b427d642eff078d8305b324b52 (patch) | |
tree | 333d73c79bdec97184c4a60e45453a167730fd7b /kernel/res_counter.c | |
parent | 34ff8dc08956098563989d8599840b130be81252 (diff) |
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>
Diffstat (limited to 'kernel/res_counter.c')
-rw-r--r-- | kernel/res_counter.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/res_counter.c b/kernel/res_counter.c index ff55247e7049..3f0417f97e76 100644 --- a/kernel/res_counter.c +++ b/kernel/res_counter.c | |||
@@ -17,8 +17,8 @@ | |||
17 | void res_counter_init(struct res_counter *counter, struct res_counter *parent) | 17 | void res_counter_init(struct res_counter *counter, struct res_counter *parent) |
18 | { | 18 | { |
19 | spin_lock_init(&counter->lock); | 19 | spin_lock_init(&counter->lock); |
20 | counter->limit = RESOURCE_MAX; | 20 | counter->limit = RES_COUNTER_MAX; |
21 | counter->soft_limit = RESOURCE_MAX; | 21 | counter->soft_limit = RES_COUNTER_MAX; |
22 | counter->parent = parent; | 22 | counter->parent = parent; |
23 | } | 23 | } |
24 | 24 | ||
@@ -182,12 +182,12 @@ int res_counter_memparse_write_strategy(const char *buf, | |||
182 | { | 182 | { |
183 | char *end; | 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 | if (*buf == '-') { | 186 | if (*buf == '-') { |
187 | *res = simple_strtoull(buf + 1, &end, 10); | 187 | *res = simple_strtoull(buf + 1, &end, 10); |
188 | if (*res != 1 || *end != '\0') | 188 | if (*res != 1 || *end != '\0') |
189 | return -EINVAL; | 189 | return -EINVAL; |
190 | *res = RESOURCE_MAX; | 190 | *res = RES_COUNTER_MAX; |
191 | return 0; | 191 | return 0; |
192 | } | 192 | } |
193 | 193 | ||