hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mm/mempolicy.c: 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].

Signed-off-by: Zhihui Zhang <zzhsuny@gmail.com>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Zhihui Zhang 2014-12-18 16:17:09 -08:00 committed by Linus Torvalds
parent 44e8967d59
commit 859f7ef142
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mm/mempolicy.c
View File

@ -162,12 +162,6 @@ static const struct mempolicy_operations {
enum mpol_rebind_step step); enum mpol_rebind_step step);
} mpol_ops[MPOL_MAX]; } 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) static inline int mpol_store_user_nodemask(const struct mempolicy *pol)
{ {
return pol->flags & MPOL_MODE_FLAGS; 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) static int mpol_new_bind(struct mempolicy *pol, const nodemask_t *nodes)
{ {
if (!is_valid_nodemask(nodes)) if (nodes_empty(*nodes))
return -EINVAL; return -EINVAL;
pol->v.nodes = *nodes; pol->v.nodes = *nodes;
return 0; return 0;
@ -234,7 +228,7 @@ static int mpol_set_nodemask(struct mempolicy *pol,
nodes = NULL; /* explicit local allocation */ nodes = NULL; /* explicit local allocation */
else { else {
if (pol->flags & MPOL_F_RELATIVE_NODES) if (pol->flags & MPOL_F_RELATIVE_NODES)
mpol_relative_nodemask(&nsc->mask2, nodes,&nsc->mask1); mpol_relative_nodemask(&nsc->mask2, nodes, &nsc->mask1);
else else
nodes_and(nsc->mask2, *nodes, nsc->mask1); nodes_and(nsc->mask2, *nodes, nsc->mask1);