diff options
author | Johannes Weiner <hannes@cmpxchg.org> | 2015-02-11 18:26:03 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-11 20:06:02 -0500 |
commit | 650c5e565492f9092552bfe4d65935196c7d9567 (patch) | |
tree | 5fce0f701502f4b75339d4c53b37301d3db65fdb /net | |
parent | 8d29e18a459dfc2adeafc1acb9c4185ee6713116 (diff) |
mm: page_counter: pull "-1" handling out of page_counter_memparse()
The unified hierarchy interface for memory cgroups will no longer use "-1"
to mean maximum possible resource value. In preparation for this, make
the string an argument and let the caller supply it.
Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: Michal Hocko <mhocko@suse.cz>
Cc: Vladimir Davydov <vdavydov@parallels.com>
Cc: Greg Thelen <gthelen@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv4/tcp_memcontrol.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_memcontrol.c b/net/ipv4/tcp_memcontrol.c index 272327134a1b..c2a75c6957a1 100644 --- a/net/ipv4/tcp_memcontrol.c +++ b/net/ipv4/tcp_memcontrol.c | |||
@@ -120,7 +120,7 @@ static ssize_t tcp_cgroup_write(struct kernfs_open_file *of, | |||
120 | switch (of_cft(of)->private) { | 120 | switch (of_cft(of)->private) { |
121 | case RES_LIMIT: | 121 | case RES_LIMIT: |
122 | /* see memcontrol.c */ | 122 | /* see memcontrol.c */ |
123 | ret = page_counter_memparse(buf, &nr_pages); | 123 | ret = page_counter_memparse(buf, "-1", &nr_pages); |
124 | if (ret) | 124 | if (ret) |
125 | break; | 125 | break; |
126 | mutex_lock(&tcp_limit_mutex); | 126 | mutex_lock(&tcp_limit_mutex); |