mm: memcg: allow lowering memory.swap.max below the current usage

[linux-2.6-block.git] / mm / vmpressure.c

diff --git a/mm/vmpressure.c b/mm/vmpressure.c
index 85350ce2d25d736101063e13d90660f0639067b6..4854584ec436ef06601e3f4146666a9ef6e426dd 100644 (file)
--- a/mm/vmpressure.c
+++ b/mm/vmpressure.c
@@ -342,26 +342,6 @@ void vmpressure_prio(gfp_t gfp, struct mem_cgroup *memcg, int prio)
        vmpressure(gfp, memcg, true, vmpressure_win, 0);
 }
 
-static enum vmpressure_levels str_to_level(const char *arg)
-{
-       enum vmpressure_levels level;
-
-       for (level = 0; level < VMPRESSURE_NUM_LEVELS; level++)
-               if (!strcmp(vmpressure_str_levels[level], arg))
-                       return level;
-       return -1;
-}
-
-static enum vmpressure_modes str_to_mode(const char *arg)
-{
-       enum vmpressure_modes mode;
-
-       for (mode = 0; mode < VMPRESSURE_NUM_MODES; mode++)
-               if (!strcmp(vmpressure_str_modes[mode], arg))
-                       return mode;
-       return -1;
-}
-
 #define MAX_VMPRESSURE_ARGS_LEN        (strlen("critical") + strlen("hierarchy") + 2)
 
 /**
@@ -390,27 +370,26 @@ int vmpressure_register_event(struct mem_cgroup *memcg,
        char *token;
        int ret = 0;
 
-       spec_orig = spec = kzalloc(MAX_VMPRESSURE_ARGS_LEN + 1, GFP_KERNEL);
+       spec_orig = spec = kstrndup(args, MAX_VMPRESSURE_ARGS_LEN, GFP_KERNEL);
        if (!spec) {
                ret = -ENOMEM;
                goto out;
        }
-       strncpy(spec, args, MAX_VMPRESSURE_ARGS_LEN);
 
        /* Find required level */
        token = strsep(&spec, ",");
-       level = str_to_level(token);
-       if (level == -1) {
-               ret = -EINVAL;
+       level = match_string(vmpressure_str_levels, VMPRESSURE_NUM_LEVELS, token);
+       if (level < 0) {
+               ret = level;
                goto out;
        }
 
        /* Find optional mode */
        token = strsep(&spec, ",");
        if (token) {
-               mode = str_to_mode(token);
-               if (mode == -1) {
-                       ret = -EINVAL;
+               mode = match_string(vmpressure_str_modes, VMPRESSURE_NUM_MODES, token);
+               if (mode < 0) {
+                       ret = mode;
                        goto out;
                }
        }