lkml.org 
[lkml]   [2021]   [Mar]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v4 13/13] mem/mempolicy: unify mpol_new_preferred() and mpol_new_preferred_many()
Date
To reduce some code duplication.

Signed-off-by: Feng Tang <feng.tang@intel.com>
---
mm/mempolicy.c | 25 +++++++------------------
1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index 18aa7dc..ee99ecc 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -201,32 +201,21 @@ static int mpol_new_interleave(struct mempolicy *pol, const nodemask_t *nodes)
return 0;
}

-static int mpol_new_preferred_many(struct mempolicy *pol,
+/* cover both MPOL_PREFERRED and MPOL_PREFERRED_MANY */
+static int mpol_new_preferred(struct mempolicy *pol,
const nodemask_t *nodes)
{
if (!nodes)
pol->flags |= MPOL_F_LOCAL; /* local allocation */
else if (nodes_empty(*nodes))
return -EINVAL; /* no allowed nodes */
- else
- pol->nodes = *nodes;
- return 0;
-}
-
-static int mpol_new_preferred(struct mempolicy *pol, const nodemask_t *nodes)
-{
- if (nodes) {
+ else {
/* MPOL_PREFERRED can only take a single node: */
- nodemask_t tmp;
+ nodemask_t tmp = nodemask_of_node(first_node(*nodes));

- if (nodes_empty(*nodes))
- return -EINVAL;
-
- tmp = nodemask_of_node(first_node(*nodes));
- return mpol_new_preferred_many(pol, &tmp);
+ pol->nodes = (pol->mode == MPOL_PREFERRED) ? tmp : *nodes;
}
-
- return mpol_new_preferred_many(pol, NULL);
+ return 0;
}

static int mpol_new_bind(struct mempolicy *pol, const nodemask_t *nodes)
@@ -468,7 +457,7 @@ static const struct mempolicy_operations mpol_ops[MPOL_MAX] = {
},
/* [MPOL_LOCAL] - see mpol_new() */
[MPOL_PREFERRED_MANY] = {
- .create = mpol_new_preferred_many,
+ .create = mpol_new_preferred,
.rebind = mpol_rebind_preferred_many,
},
};
--
2.7.4
\
 
 \ /
  Last update: 2021-03-17 04:42    [W:0.175 / U:1.292 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site