1 files changed, 16 insertions, 9 deletions
diff --git a/kernel/res_counter.c b/kernel/res_counter.c
index ff55247e7049..4aa8a305aede 100644
--- a/kernel/res_counter.c
+++ b/kernel/res_counter.c
@@ -17,8 +17,8 @@
 void res_counter_init(struct res_counter *counter, struct res_counter *parent)
 {
        spin_lock_init(&counter->lock);
-        counter->limit = RESOURCE_MAX;
+        counter->limit = RES_COUNTER_MAX;
-        counter->soft_limit = RESOURCE_MAX;
+        counter->soft_limit = RES_COUNTER_MAX;
        counter->parent = parent;
 }
@@ -178,23 +178,30 @@ u64 res_counter_read_u64(struct res_counter *counter, int member)
 #endif
 int res_counter_memparse_write_strategy(const char *buf,
-                                        unsigned long long *res)
+                                        unsigned long long *resp)
 {
        char *end;
+        unsigned long long res;
-        /* return RESOURCE_MAX(unlimited) if "-1" is specified */
+        /* return RES_COUNTER_MAX(unlimited) if "-1" is specified */
        if (*buf == '-') {
-                *res = simple_strtoull(buf + 1, &end, 10);
+                res = simple_strtoull(buf + 1, &end, 10);
-                if (*res != 1 || *end != '\0')
+                if (res != 1 || *end != '\0')
                        return -EINVAL;
-                *res = RESOURCE_MAX;
+                *resp = RES_COUNTER_MAX;
                return 0;
        }
-        *res = memparse(buf, &end);
+        res = memparse(buf, &end);
        if (*end != '\0')
                return -EINVAL;
-        *res = PAGE_ALIGN(*res);
+        if (PAGE_ALIGN(res) >= res)
+                res = PAGE_ALIGN(res);
+        else
+                res = RES_COUNTER_MAX;
+        *resp = res;
        return 0;
 }