diff options
-rw-r--r-- | kernel/res_counter.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/kernel/res_counter.c b/kernel/res_counter.c index 085d3ae478fe..4aa8a305aede 100644 --- a/kernel/res_counter.c +++ b/kernel/res_counter.c | |||
@@ -178,27 +178,30 @@ u64 res_counter_read_u64(struct res_counter *counter, int member) | |||
178 | #endif | 178 | #endif |
179 | 179 | ||
180 | int res_counter_memparse_write_strategy(const char *buf, | 180 | int res_counter_memparse_write_strategy(const char *buf, |
181 | unsigned long long *res) | 181 | unsigned long long *resp) |
182 | { | 182 | { |
183 | char *end; | 183 | char *end; |
184 | unsigned long long res; | ||
184 | 185 | ||
185 | /* return RES_COUNTER_MAX(unlimited) if "-1" is specified */ | 186 | /* return RES_COUNTER_MAX(unlimited) if "-1" is specified */ |
186 | if (*buf == '-') { | 187 | if (*buf == '-') { |
187 | *res = simple_strtoull(buf + 1, &end, 10); | 188 | res = simple_strtoull(buf + 1, &end, 10); |
188 | if (*res != 1 || *end != '\0') | 189 | if (res != 1 || *end != '\0') |
189 | return -EINVAL; | 190 | return -EINVAL; |
190 | *res = RES_COUNTER_MAX; | 191 | *resp = RES_COUNTER_MAX; |
191 | return 0; | 192 | return 0; |
192 | } | 193 | } |
193 | 194 | ||
194 | *res = memparse(buf, &end); | 195 | res = memparse(buf, &end); |
195 | if (*end != '\0') | 196 | if (*end != '\0') |
196 | return -EINVAL; | 197 | return -EINVAL; |
197 | 198 | ||
198 | if (PAGE_ALIGN(*res) >= *res) | 199 | if (PAGE_ALIGN(res) >= res) |
199 | *res = PAGE_ALIGN(*res); | 200 | res = PAGE_ALIGN(res); |
200 | else | 201 | else |
201 | *res = RES_COUNTER_MAX; | 202 | res = RES_COUNTER_MAX; |
203 | |||
204 | *resp = res; | ||
202 | 205 | ||
203 | return 0; | 206 | return 0; |
204 | } | 207 | } |