lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mempolicy: rename policy_types and cleanup initialization

Browse Source 
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>
This commit is contained in:
Lee Schermerhorn
2010-05-24 14:32:04 -07:00
committed by Linus Torvalds
parent b4652e8429
commit 345ace9c79
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mm/mempolicy.c
View File

@@ -2121,9 +2121,15 @@ void numa_default_policy(void)
* "local" is pseudo-policy: MPOL_PREFERRED with MPOL_F_LOCAL flag * "local" is pseudo-policy: MPOL_PREFERRED with MPOL_F_LOCAL flag
* Used only for mpol_parse_str() and mpol_to_str() * Used only for mpol_parse_str() and mpol_to_str()
*/ */
#define MPOL_LOCAL (MPOL_INTERLEAVE + 1) #define MPOL_LOCAL MPOL_MAX
static const char * const policy_types[] = static const char * const policy_modes[] =
{ "default", "prefer", "bind", "interleave", "local" }; {
[MPOL_DEFAULT] = "default",
[MPOL_PREFERRED] = "prefer",
[MPOL_BIND] = "bind",
[MPOL_INTERLEAVE] = "interleave",
[MPOL_LOCAL] = "local"
};
#ifdef CONFIG_TMPFS #ifdef CONFIG_TMPFS
@@ -2169,7 +2175,7 @@ int mpol_parse_str(char *str, struct mempolicy **mpol, int no_context)
*flags++ = '\0'; /* terminate mode string */ *flags++ = '\0'; /* terminate mode string */
for (mode = 0; mode <= MPOL_LOCAL; mode++) { for (mode = 0; mode <= MPOL_LOCAL; mode++) {
if (!strcmp(str, policy_types[mode])) { if (!strcmp(str, policy_modes[mode])) {
break; break;
} }
} }
@@ -2324,11 +2330,11 @@ int mpol_to_str(char *buffer, int maxlen, struct mempolicy *pol, int no_context)
BUG(); BUG();
} }
l = strlen(policy_types[mode]); l = strlen(policy_modes[mode]);
if (buffer + maxlen < p + l + 1) if (buffer + maxlen < p + l + 1)
return -ENOSPC; return -ENOSPC;
strcpy(p, policy_types[mode]); strcpy(p, policy_modes[mode]);
p += l; p += l;
if (flags & MPOL_MODE_FLAGS) { if (flags & MPOL_MODE_FLAGS) {