diff options
author | Sha Zhengju <handai.szj@taobao.com> | 2013-09-12 18:13:46 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-12 18:38:02 -0400 |
commit | 34ff8dc08956098563989d8599840b130be81252 (patch) | |
tree | 39c964226586a57b0b1e97d9eb1f34b1dc99519e | |
parent | 3812c8c8f3953921ef18544110dafc3505c1ac62 (diff) |
memcg: correct RESOURCE_MAX to ULLONG_MAX
Current RESOURCE_MAX is ULONG_MAX, but the value we used to set resource
limit is unsigned long long, so we can set bigger value than that which is
strange. The XXX_MAX should be reasonable max value, bigger than that
should be overflow.
Notice that this change will affect user output of default *.limit_in_bytes:
before change:
$ cat /cgroup/memory/memory.limit_in_bytes
9223372036854775807
after change:
$ cat /cgroup/memory/memory.limit_in_bytes
18446744073709551615
But it doesn't alter the API in term of input - we can still use "echo -1
> *.limit_in_bytes" to reset the numbers to "unlimited".
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>
-rw-r--r-- | include/linux/res_counter.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/res_counter.h b/include/linux/res_counter.h index 96a509b6be04..586bc7cb1dcf 100644 --- a/include/linux/res_counter.h +++ b/include/linux/res_counter.h | |||
@@ -54,7 +54,7 @@ struct res_counter { | |||
54 | struct res_counter *parent; | 54 | struct res_counter *parent; |
55 | }; | 55 | }; |
56 | 56 | ||
57 | #define RESOURCE_MAX (unsigned long long)LLONG_MAX | 57 | #define RESOURCE_MAX ULLONG_MAX |
58 | 58 | ||
59 | /** | 59 | /** |
60 | * Helpers to interact with userspace | 60 | * Helpers to interact with userspace |