Commit 6eb27e1f authored by Bob Liu's avatar Bob Liu Committed by Linus Torvalds

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: default avatarBob Liu <lliubbo@gmail.com>
Acked-by: default avatarDavid Rientjes <rientjes@google.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Lee Schermerhorn <lee.schermerhorn@hp.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6d556294
...@@ -1441,15 +1441,13 @@ static struct zonelist *policy_zonelist(gfp_t gfp, struct mempolicy *policy) ...@@ -1441,15 +1441,13 @@ static struct zonelist *policy_zonelist(gfp_t gfp, struct mempolicy *policy)
/* /*
* Normally, MPOL_BIND allocations are node-local within the * Normally, MPOL_BIND allocations are node-local within the
* allowed nodemask. However, if __GFP_THISNODE is set and the * allowed nodemask. However, if __GFP_THISNODE is set and the
* current node is part of the mask, we use the zonelist for * current node isn't part of the mask, we use the zonelist for
* the first node in the mask instead. * the first node in the mask instead.
*/ */
if (unlikely(gfp & __GFP_THISNODE) && if (unlikely(gfp & __GFP_THISNODE) &&
unlikely(!node_isset(nd, policy->v.nodes))) unlikely(!node_isset(nd, policy->v.nodes)))
nd = first_node(policy->v.nodes); nd = first_node(policy->v.nodes);
break; break;
case MPOL_INTERLEAVE: /* should not happen */
break;
default: default:
BUG(); BUG();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment