It was convenient to have the generic function handle it, as all callsites agreed. Subsequent patches will add new user interfaces that do not want to support the "-1" special string.
Signed-off-by: Johannes Weiner <[email protected]> --- mm/hugetlb_cgroup.c | 10 +++++++--- mm/memcontrol.c | 20 ++++++++++++++------ mm/page_counter.c | 6 ------ net/ipv4/tcp_memcontrol.c | 10 +++++++--- 4 files changed, 28 insertions(+), 18 deletions(-) diff --git a/mm/hugetlb_cgroup.c b/mm/hugetlb_cgroup.c index 037e1c00a5b7..ee3fc80adba1 100644 --- a/mm/hugetlb_cgroup.c +++ b/mm/hugetlb_cgroup.c @@ -279,9 +279,13 @@ static ssize_t hugetlb_cgroup_write(struct kernfs_open_file *of, return -EINVAL; buf = strstrip(buf); - ret = page_counter_memparse(buf, &nr_pages); - if (ret) - return ret; + if (!strcmp(buf, "-1")) { + nr_pages = PAGE_COUNTER_MAX; + } else { + ret = page_counter_memparse(buf, &nr_pages); + if (ret) + return ret; + } idx = MEMFILE_IDX(of_cft(of)->private); diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 202e3862d564..20486da85750 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -3400,9 +3400,13 @@ static ssize_t mem_cgroup_write(struct kernfs_open_file *of, int ret; buf = strstrip(buf); - ret = page_counter_memparse(buf, &nr_pages); - if (ret) - return ret; + if (!strcmp(buf, "-1")) { + nr_pages = PAGE_COUNTER_MAX; + } else { + ret = page_counter_memparse(buf, &nr_pages); + if (ret) + return ret; + } switch (MEMFILE_ATTR(of_cft(of)->private)) { case RES_LIMIT: @@ -3768,9 +3772,13 @@ static int __mem_cgroup_usage_register_event(struct mem_cgroup *memcg, unsigned long usage; int i, size, ret; - ret = page_counter_memparse(args, &threshold); - if (ret) - return ret; + if (!strcmp(args, "-1")) { + threshold = PAGE_COUNTER_MAX; + } else { + ret = page_counter_memparse(args, &threshold); + if (ret) + return ret; + } mutex_lock(&memcg->thresholds_lock); diff --git a/mm/page_counter.c b/mm/page_counter.c index a009574fbba9..0d4f9daf68bd 100644 --- a/mm/page_counter.c +++ b/mm/page_counter.c @@ -173,15 +173,9 @@ int page_counter_limit(struct page_counter *counter, unsigned long limit) */ int page_counter_memparse(const char *buf, unsigned long *nr_pages) { - char unlimited[] = "-1"; char *end; u64 bytes; - if (!strncmp(buf, unlimited, sizeof(unlimited))) { - *nr_pages = PAGE_COUNTER_MAX; - return 0; - } - bytes = memparse(buf, &end); if (*end != '\0') return -EINVAL; diff --git a/net/ipv4/tcp_memcontrol.c b/net/ipv4/tcp_memcontrol.c index 272327134a1b..a9d9fcb4dc25 100644 --- a/net/ipv4/tcp_memcontrol.c +++ b/net/ipv4/tcp_memcontrol.c @@ -120,9 +120,13 @@ static ssize_t tcp_cgroup_write(struct kernfs_open_file *of, switch (of_cft(of)->private) { case RES_LIMIT: /* see memcontrol.c */ - ret = page_counter_memparse(buf, &nr_pages); - if (ret) - break; + if (!strcmp(buf, "-1")) { + nr_pages = PAGE_COUNTER_MAX; + } else { + ret = page_counter_memparse(buf, &nr_pages); + if (ret) + break; + } mutex_lock(&tcp_limit_mutex); ret = tcp_update_limit(memcg, nr_pages); mutex_unlock(&tcp_limit_mutex); -- 2.2.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
