Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

mempolicy: lose unnecessary loop variable in mpol_parse_str() 



We don't really need the extra variable 'i' in mpol_parse_str().  The only
use is as the the loop variable.  Then, it's assigned to 'mode'.  Just use
mode, and loose the 'uninitialized_var()' macro.

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 e17f74af

mm/mempolicy.c

+4 −6
Original line number Diff line number Diff line
@@ -2148,12 +2148,11 @@ static const char * const policy_types[] = 
int mpol_parse_str(char *str, struct mempolicy **mpol, int no_context)

{

	struct mempolicy *new = NULL;

	unsigned short uninitialized_var(mode);

	unsigned short mode;

	unsigned short uninitialized_var(mode_flags);

	nodemask_t nodes;

	char *nodelist = strchr(str, ':');

	char *flags = strchr(str, '=');

	int i;

	int err = 1;



	if (nodelist) {
@@ -2169,13 +2168,12 @@ int mpol_parse_str(char *str, struct mempolicy **mpol, int no_context) 
	if (flags)

		*flags++ = '\0';	/* terminate mode string */



	for (i = 0; i <= MPOL_LOCAL; i++) {

		if (!strcmp(str, policy_types[i])) {

			mode = i;

	for (mode = 0; mode <= MPOL_LOCAL; mode++) {

		if (!strcmp(str, policy_types[mode])) {

			break;

		}

	}

	if (i > MPOL_LOCAL)

	if (mode > MPOL_LOCAL)

		goto out;



	switch (mode) {