Skip to content

Commit

Permalink
mempolicy: rename policy_types and cleanup initialization
Browse files Browse the repository at this point in the history
Rename 'policy_types[]' to 'policy_modes[]' to better match the array
contents.

Use designated intializer syntax for policy_modes[].

Signed-off-by: Lee Schermerhorn <lee.schermerhorn@hp.com>
Cc: Hugh Dickins <hugh.dickins@tiscali.co.uk>
Cc: Ravikiran Thirumalai <kiran@scalex86.org>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Christoph Lameter <cl@linux-foundation.org>
Cc: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Lee Schermerhorn authored and Linus Torvalds committed May 25, 2010
1 parent b4652e8 commit 345ace9
Showing 1 changed file with 12 additions and 6 deletions.
18 changes: 12 additions & 6 deletions mm/mempolicy.c
Original file line number Diff line number Diff line change
Expand Up @@ -2121,9 +2121,15 @@ void numa_default_policy(void)
* "local" is pseudo-policy: MPOL_PREFERRED with MPOL_F_LOCAL flag
* Used only for mpol_parse_str() and mpol_to_str()
*/
#define MPOL_LOCAL (MPOL_INTERLEAVE + 1)
static const char * const policy_types[] =
{ "default", "prefer", "bind", "interleave", "local" };
#define MPOL_LOCAL MPOL_MAX
static const char * const policy_modes[] =
{
[MPOL_DEFAULT] = "default",
[MPOL_PREFERRED] = "prefer",
[MPOL_BIND] = "bind",
[MPOL_INTERLEAVE] = "interleave",
[MPOL_LOCAL] = "local"
};


#ifdef CONFIG_TMPFS
Expand Down Expand Up @@ -2169,7 +2175,7 @@ int mpol_parse_str(char *str, struct mempolicy **mpol, int no_context)
*flags++ = '\0'; /* terminate mode string */

for (mode = 0; mode <= MPOL_LOCAL; mode++) {
if (!strcmp(str, policy_types[mode])) {
if (!strcmp(str, policy_modes[mode])) {
break;
}
}
Expand Down Expand Up @@ -2324,11 +2330,11 @@ int mpol_to_str(char *buffer, int maxlen, struct mempolicy *pol, int no_context)
BUG();
}

l = strlen(policy_types[mode]);
l = strlen(policy_modes[mode]);
if (buffer + maxlen < p + l + 1)
return -ENOSPC;

strcpy(p, policy_types[mode]);
strcpy(p, policy_modes[mode]);
p += l;

if (flags & MPOL_MODE_FLAGS) {
Expand Down

0 comments on commit 345ace9

Please sign in to comment.