Commit 345ace9c authored by Lee Schermerhorn's avatar Lee Schermerhorn Committed by Linus Torvalds
Browse files

mempolicy: rename policy_types and cleanup initialization 



Rename 'policy_types[]' to 'policy_modes[]' to better match the array
contents.

Use designated intializer syntax for policy_modes[].

Signed-off-by: default avatarLee 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b4652e84

mm/mempolicy.c

+12 −6
Original line number Diff line number Diff line
@@ -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
@@ -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;

		}

	}
@@ -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) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE