Skip to content

Commit 3cadfa2

Browse files
andy-shevtorvalds
authored andcommitted
mm/vmpressure.c: convert to use match_string() helper
The new helper returns index of the matching string in an array. We are going to use it here. Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Andy Shevchenko <[email protected]> Acked-by: Michal Hocko <[email protected]> Reviewed-by: Andrew Morton <[email protected]> Cc: David Rientjes <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent d62ff36 commit 3cadfa2

File tree

1 file changed

+6
-26
lines changed

1 file changed

+6
-26
lines changed

mm/vmpressure.c

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -342,26 +342,6 @@ void vmpressure_prio(gfp_t gfp, struct mem_cgroup *memcg, int prio)
342342
vmpressure(gfp, memcg, true, vmpressure_win, 0);
343343
}
344344

345-
static enum vmpressure_levels str_to_level(const char *arg)
346-
{
347-
enum vmpressure_levels level;
348-
349-
for (level = 0; level < VMPRESSURE_NUM_LEVELS; level++)
350-
if (!strcmp(vmpressure_str_levels[level], arg))
351-
return level;
352-
return -1;
353-
}
354-
355-
static enum vmpressure_modes str_to_mode(const char *arg)
356-
{
357-
enum vmpressure_modes mode;
358-
359-
for (mode = 0; mode < VMPRESSURE_NUM_MODES; mode++)
360-
if (!strcmp(vmpressure_str_modes[mode], arg))
361-
return mode;
362-
return -1;
363-
}
364-
365345
#define MAX_VMPRESSURE_ARGS_LEN (strlen("critical") + strlen("hierarchy") + 2)
366346

367347
/**
@@ -398,18 +378,18 @@ int vmpressure_register_event(struct mem_cgroup *memcg,
398378

399379
/* Find required level */
400380
token = strsep(&spec, ",");
401-
level = str_to_level(token);
402-
if (level == -1) {
403-
ret = -EINVAL;
381+
level = match_string(vmpressure_str_levels, VMPRESSURE_NUM_LEVELS, token);
382+
if (level < 0) {
383+
ret = level;
404384
goto out;
405385
}
406386

407387
/* Find optional mode */
408388
token = strsep(&spec, ",");
409389
if (token) {
410-
mode = str_to_mode(token);
411-
if (mode == -1) {
412-
ret = -EINVAL;
390+
mode = match_string(vmpressure_str_modes, VMPRESSURE_NUM_MODES, token);
391+
if (mode < 0) {
392+
ret = mode;
413393
goto out;
414394
}
415395
}

0 commit comments

Comments
 (0)