Skip to content

Commit

Permalink
mempolicy: lose unnecessary loop variable in mpol_parse_str()
Browse files Browse the repository at this point in the history
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: 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 e17f74a commit b4652e8
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions mm/mempolicy.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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) {
Expand Down

0 comments on commit b4652e8

Please sign in to comment.