aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLee Schermerhorn <lee.schermerhorn@hp.com>2010-05-24 17:32:03 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-25 11:06:57 -0400
commitb4652e8429100ba5c3ddb49499faa1188c98c246 (patch)
tree55fa4fcdb8e8cf067b1474cc7068163e152f3075
parente17f74af351cce9a1bade7b33af179497fdf95cf (diff)
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: 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>
-rw-r--r--mm/mempolicy.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index 0e1b293e4054..b4f1265df2d8 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -2148,12 +2148,11 @@ static const char * const policy_types[] =
2148int mpol_parse_str(char *str, struct mempolicy **mpol, int no_context) 2148int mpol_parse_str(char *str, struct mempolicy **mpol, int no_context)
2149{ 2149{
2150 struct mempolicy *new = NULL; 2150 struct mempolicy *new = NULL;
2151 unsigned short uninitialized_var(mode); 2151 unsigned short mode;
2152 unsigned short uninitialized_var(mode_flags); 2152 unsigned short uninitialized_var(mode_flags);
2153 nodemask_t nodes; 2153 nodemask_t nodes;
2154 char *nodelist = strchr(str, ':'); 2154 char *nodelist = strchr(str, ':');
2155 char *flags = strchr(str, '='); 2155 char *flags = strchr(str, '=');
2156 int i;
2157 int err = 1; 2156 int err = 1;
2158 2157
2159 if (nodelist) { 2158 if (nodelist) {
@@ -2169,13 +2168,12 @@ int mpol_parse_str(char *str, struct mempolicy **mpol, int no_context)
2169 if (flags) 2168 if (flags)
2170 *flags++ = '\0'; /* terminate mode string */ 2169 *flags++ = '\0'; /* terminate mode string */
2171 2170
2172 for (i = 0; i <= MPOL_LOCAL; i++) { 2171 for (mode = 0; mode <= MPOL_LOCAL; mode++) {
2173 if (!strcmp(str, policy_types[i])) { 2172 if (!strcmp(str, policy_types[mode])) {
2174 mode = i;
2175 break; 2173 break;
2176 } 2174 }
2177 } 2175 }
2178 if (i > MPOL_LOCAL) 2176 if (mode > MPOL_LOCAL)
2179 goto out; 2177 goto out;
2180 2178
2181 switch (mode) { 2179 switch (mode) {