Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

mm/mempolicy.c

+1 −3
Original line number Diff line number Diff line
@@ -1441,15 +1441,13 @@ static struct zonelist *policy_zonelist(gfp_t gfp, struct mempolicy *policy) 
		/*

		 * Normally, MPOL_BIND allocations are node-local within 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.

		 */

		if (unlikely(gfp & __GFP_THISNODE) &&

				unlikely(!node_isset(nd, policy->v.nodes)))

			nd = first_node(policy->v.nodes);

		break;

	case MPOL_INTERLEAVE: /* should not happen */

		break;

	default:

		BUG();

	}