aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorBob Liu <lliubbo@gmail.com>2010-05-24 17:32:00 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-25 11:06:57 -0400
commit6eb27e1fdf5781719a3d2e90e6c89fa012135c62 (patch)
tree23be89303ad69f5728f69665dfadf2b4dc45628c /mm
parent6d556294d5b27fb12f18be7495af45b6156a409e (diff)
mempolicy: remove case MPOL_INTERLEAVE from policy_zonelist()
In policy_zonelist() mode MPOL_INTERLEAVE shouldn't happen, so fall through to BUG() instead of break to return. I also fixed the comment. Signed-off-by: Bob Liu <lliubbo@gmail.com> Acked-by: David Rientjes <rientjes@google.com> Cc: Andi Kleen <andi@firstfloor.org> Cc: Lee Schermerhorn <lee.schermerhorn@hp.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/mempolicy.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index ad500f3b12bf..d97355b744ab 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -1441,15 +1441,13 @@ static struct zonelist *policy_zonelist(gfp_t gfp, struct mempolicy *policy)
1441 /* 1441 /*
1442 * Normally, MPOL_BIND allocations are node-local within the 1442 * Normally, MPOL_BIND allocations are node-local within the
1443 * allowed nodemask. However, if __GFP_THISNODE is set and the 1443 * allowed nodemask. However, if __GFP_THISNODE is set and the
1444 * current node is part of the mask, we use the zonelist for 1444 * current node isn't part of the mask, we use the zonelist for
1445 * the first node in the mask instead. 1445 * the first node in the mask instead.
1446 */ 1446 */
1447 if (unlikely(gfp & __GFP_THISNODE) && 1447 if (unlikely(gfp & __GFP_THISNODE) &&
1448 unlikely(!node_isset(nd, policy->v.nodes))) 1448 unlikely(!node_isset(nd, policy->v.nodes)))
1449 nd = first_node(policy->v.nodes); 1449 nd = first_node(policy->v.nodes);
1450 break; 1450 break;
1451 case MPOL_INTERLEAVE: /* should not happen */
1452 break;
1453 default: 1451 default:
1454 BUG(); 1452 BUG();
1455 } 1453 }