]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
mm/mempolicy.c: use match_string() helper to simplify the code
authorzhong jiang <zhongjiang@huawei.com>
Fri, 26 Oct 2018 22:06:57 +0000 (15:06 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 26 Oct 2018 23:26:33 +0000 (16:26 -0700)
match_string() returns the index of an array for a matching string, which
can be used intead of open coded implementation.

Link: http://lkml.kernel.org/r/1536988365-50310-1-git-send-email-zhongjiang@huawei.com
Signed-off-by: zhong jiang <zhongjiang@huawei.com>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Acked-by: Michal Hocko <mhocko@suse.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
mm/mempolicy.c

index 2e76a8f65e94d08766a1d51f110e91c4cb1c5f4f..cfd26d7e61a17f9c5fd260b85778058aa04b83e2 100644 (file)
@@ -2711,12 +2711,11 @@ static const char * const policy_modes[] =
 int mpol_parse_str(char *str, struct mempolicy **mpol)
 {
        struct mempolicy *new = NULL;
-       unsigned short mode;
        unsigned short mode_flags;
        nodemask_t nodes;
        char *nodelist = strchr(str, ':');
        char *flags = strchr(str, '=');
-       int err = 1;
+       int err = 1, mode;
 
        if (nodelist) {
                /* NUL-terminate mode or flags string */
@@ -2731,12 +2730,8 @@ int mpol_parse_str(char *str, struct mempolicy **mpol)
        if (flags)
                *flags++ = '\0';        /* terminate mode string */
 
-       for (mode = 0; mode < MPOL_MAX; mode++) {
-               if (!strcmp(str, policy_modes[mode])) {
-                       break;
-               }
-       }
-       if (mode >= MPOL_MAX)
+       mode = match_string(policy_modes, MPOL_MAX, str);
+       if (mode < 0)
                goto out;
 
        switch (mode) {