remove unnecessary is_valid_nodemask()
Subsystems (2)
PATCH 1/1 remove unnecessary is_valid_nodemask()
When nodes is true, nsc->mask2 has already been filtered by nsc->mask1, which has already factored in node_states[N_MEMORY].
--- mm/mempolicy.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
mm/mempolicy.c +2 -8
@@ -162,12 +162,6 @@ static const struct mempolicy_operations { enum mpol_rebind_step step); } mpol_ops[MPOL_MAX ]; -/* Check that the nodemask contains at least one populated zone */ -static int is_valid_nodemask (const nodemask_t *nodemask) -{ -return nodes_intersects (*nodemask, node_states[N_MEMORY ]); -} -static inline int mpol_store_user_nodemask (const struct mempolicy *pol) {return pol->flags &MPOL_MODE_FLAGS ;
@@ -202,7 +196,7 @@ static int mpol_new_preferred(struct mempolicy *pol, const nodemask_t *nodes)static int mpol_new_bind (struct mempolicy *pol,const nodemask_t *nodes) { -if (!is_valid_nodemask (nodes)) +if (nodes_empty (*nodes))return -EINVAL ; pol->v.nodes = *nodes;return 0 ;
@@ -234,7 +228,7 @@ static int mpol_set_nodemask(struct mempolicy *pol, nodes =NULL ;/* explicit local allocation */ else {if (pol->flags &MPOL_F_RELATIVE_NODES ) -mpol_relative_nodemask (&nsc->mask2, nodes,&nsc->mask1); +mpol_relative_nodemask (&nsc->mask2, nodes, &nsc->mask1);else nodes_and (nsc->mask2, *nodes, nsc->mask1);
Signature · 1 line
1.9.1
Andrew Morton
maintainerQuoted 3 lines · On Sat, 15 Nov 2014 21:49:57 -0500 Zhihui Zhang <[email protected]> wrote:
When nodes is true,
nsc->mask2has already been filtered bynsc->mask1, which has already factored in node_states[N_MEMORY].
Please be more specific. Where does that filtering occur?
The filtering occurs in mpol_set_nodemask(), it reads like this:
if (pol->flags & MPOL_F_RELATIVE_NODES)
mpol_relative_nodemask(&nsc->mask2, nodes,&nsc->mask1);
else
nodes_and(nsc->mask2, *nodes, nsc->mask1);so mask2 is based on mask1. mask2 is only used when nodes is not NULL later. so we don't care the
case of (pol->mode == MPOL_PREFERRED && nodes_empty(*nodes)).
-Zhihui
Quoted 8 lines · Andrew Morton
Quoted 3 lines · On Sat, 15 Nov 2014 21:49:57 -0500 Zhihui Zhang <[email protected]> wrote:
When nodes is true,
nsc->mask2has already been filtered bynsc->mask1, which has already factored in node_states[N_MEMORY].Please be more specific. Where does that filtering occur?