github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 22:52:35 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

tmpfs: cleanup mpol_parse_str()

Browse Source 
commit 926f2ae04f upstream.

mpol_parse_str() made lots 'err' variable related bug.  Because it is ugly
and reviewing unfriendly.

This patch simplifies it.

Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Ravikiran Thirumalai <kiran@scalex86.org>
Cc: Christoph Lameter <cl@linux-foundation.org>
Cc: Mel Gorman <mel@csn.ul.ie>
Acked-by: Lee Schermerhorn <lee.schermerhorn@hp.com>
Cc: Hugh Dickins <hugh.dickins@tiscali.co.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
KOSAKI Motohiro 2010-03-23 13:35:32 -07:00 committed by Greg Kroah-Hartman
parent e02271b82e
commit 85f820d585
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mm/mempolicy.c
View File

@ -2122,8 +2122,8 @@ int mpol_parse_str(char *str, struct mempolicy **mpol, int no_context)
char *rest = nodelist;
while (isdigit(*rest))
rest++;
if (!*rest)
err = 0;
if (*rest)
goto out;
}
break;
case MPOL_INTERLEAVE:
@ -2132,7 +2132,6 @@ int mpol_parse_str(char *str, struct mempolicy **mpol, int no_context)
*/
if (!nodelist)
nodes = node_states[N_HIGH_MEMORY];
err = 0;
break;
case MPOL_LOCAL:
/*
@ -2141,7 +2140,6 @@ int mpol_parse_str(char *str, struct mempolicy **mpol, int no_context)
if (nodelist)
goto out;
mode = MPOL_PREFERRED;
err = 0;
break;
case MPOL_DEFAULT:
/*
@ -2156,7 +2154,6 @@ int mpol_parse_str(char *str, struct mempolicy **mpol, int no_context)
*/
if (!nodelist)
goto out;
err = 0;
}
mode_flags = 0;
@ -2170,13 +2167,14 @@ int mpol_parse_str(char *str, struct mempolicy **mpol, int no_context)
else if (!strcmp(flags, "relative"))
mode_flags |= MPOL_F_RELATIVE_NODES;
else
err = 1;
goto out;
}
new = mpol_new(mode, mode_flags, &nodes);
if (IS_ERR(new))
err = 1;
else {
goto out;
{
int ret;
NODEMASK_SCRATCH(scratch);
if (scratch) {
@ -2187,13 +2185,15 @@ int mpol_parse_str(char *str, struct mempolicy **mpol, int no_context)
ret = -ENOMEM;
NODEMASK_SCRATCH_FREE(scratch);
if (ret) {
err = 1;
mpol_put(new);
} else if (no_context) {
/* save for contextualization */
new->w.user_nodemask = nodes;
goto out;
}
}
err = 0;
if (no_context) {
/* save for contextualization */
new->w.user_nodemask = nodes;
}
out:
/* Restore string for error message */