Prev: [76/89] sparc: TIF_ABI_PENDING bit removal
Next: [156/156] pata_via: fix VT6410/6415/6330 detection issue
From: Greg KH on 30 Mar 2010 19:20
2.6.31-stable review patch. If anyone has any objections, please let us know.

------------------

From: KOSAKI Motohiro <kosaki.motohiro(a)jp.fujitsu.com>

commit 926f2ae04f183098cf9a30521776fb2759c8afeb 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(a)jp.fujitsu.com>
Cc: Ravikiran Thirumalai <kiran(a)scalex86.org>
Cc: Christoph Lameter <cl(a)linux-foundation.org>
Cc: Mel Gorman <mel(a)csn.ul.ie>
Acked-by: Lee Schermerhorn <lee.schermerhorn(a)hp.com>
Cc: Hugh Dickins <hugh.dickins(a)tiscali.co.uk>
Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de>

---
mm/mempolicy.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)

--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -2122,8 +2122,8 @@ int mpol_parse_str(char *str, struct mem
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 mem
*/
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 mem
if (nodelist)
goto out;
mode = MPOL_PREFERRED;
- err = 0;
break;
case MPOL_DEFAULT:
/*
@@ -2156,7 +2154,6 @@ int mpol_parse_str(char *str, struct mem
*/
if (!nodelist)
goto out;
- err = 0;
}

mode_flags = 0;
@@ -2170,13 +2167,14 @@ int mpol_parse_str(char *str, struct mem
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 mem
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 */


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [76/89] sparc: TIF_ABI_PENDING bit removal
Next: [156/156] pata_via: fix VT6410/6415/6330 detection issue