PATCH 02/15 Mempolicy: rename mpol_copy to mpol_dup
Against: 2.6.25-rc8-mm1
This patch renames mpol_copy() to mpol_dup() because, well,
that's what it does. Like, e.g., strdup() for strings,
mpol_dup() takes a pointer to an existing mempolicy,
allocates a new one and copies the contents.
In a later patch, I want to use the name mpol_copy() to copy
the contents from one mempolicy to another like, e.g., strcpy()
does for strings.
Signed-off-by: Lee Schermerhorn <lee.schermerhorn@xxxxxx>
include/linux/mempolicy.h | 14 +++++++-------
kernel/cpuset.c | 4 ++--
kernel/fork.c | 4 ++--
mm/mempolicy.c | 6 +++---
mm/mmap.c | 4 ++--
5 files changed, 16 insertions(+), 16 deletions(-)
Index: linux-2.6.25-rc8-mm1/include/linux/mempolicy.h
===================================================================
--- linux-2.6.25-rc8-mm1.orig/include/linux/mempolicy.h 2008-04-02 17:32:09.000000000 -0400
+++ linux-2.6.25-rc8-mm1/include/linux/mempolicy.h 2008-04-02 17:32:24.000000000 -0400
@@ -73,10 +73,10 @@ struct mm_struct;
* Mempolicy objects are reference counted. A mempolicy will be freed when
* mpol_put() decrements the reference count to zero.
*
- * Copying policy objects:
- * mpol_copy() allocates a new mempolicy and copies the specified mempolicy
+ * Duplicating policy objects:
+ * mpol_dup() allocates a new mempolicy and copies the specified mempolicy
* to the new storage. The reference count of the new object is initialized
- * to 1, representing the caller of mpol_copy().
+ * to 1, representing the caller of mpol_dup().
*/
struct mempolicy {
atomic_t refcnt;
@@ -105,11 +105,11 @@ static inline void mpol_put(struct mempo
__mpol_put(pol);
}
-extern struct mempolicy *__mpol_copy(struct mempolicy *pol);
-static inline struct mempolicy *mpol_copy(struct mempolicy *pol)
+extern struct mempolicy *__mpol_dup(struct mempolicy *pol);
+static inline struct mempolicy *mpol_dup(struct mempolicy *pol)
{
if (pol)
- pol = __mpol_copy(pol);
+ pol = __mpol_dup(pol);
return pol;
}
@@ -198,7 +198,7 @@ static inline void mpol_get(struct mempo
{
}
-static inline struct mempolicy *mpol_copy(struct mempolicy *old)
+static inline struct mempolicy *mpol_dup(struct mempolicy *old)
{
return NULL;
}
Index: linux-2.6.25-rc8-mm1/kernel/cpuset.c
===================================================================
--- linux-2.6.25-rc8-mm1.orig/kernel/cpuset.c 2008-04-02 17:09:54.000000000 -0400
+++ linux-2.6.25-rc8-mm1/kernel/cpuset.c 2008-04-02 17:32:24.000000000 -0400
@@ -924,7 +924,7 @@ static int update_nodemask(struct cpuset
cs->mems_generation = cpuset_mems_generation++;
mutex_unlock(&callback_mutex);
- cpuset_being_rebound = cs; /* causes mpol_copy() rebind */
+ cpuset_being_rebound = cs; /* causes mpol_dup() rebind */
fudge = 10; /* spare mmarray[] slots */
fudge += cpus_weight(cs->cpus_allowed); /* imagine one fork-bomb/cpu */
@@ -975,7 +975,7 @@ static int update_nodemask(struct cpuset
* rebind the vma mempolicies of each mm in mmarray[] to their
* new cpuset, and release that mm. The mpol_rebind_mm()
* call takes mmap_sem, which we couldn't take while holding
- * tasklist_lock. Forks can happen again now - the mpol_copy()
+ * tasklist_lock. Forks can happen again now - the mpol_dup()
* cpuset_being_rebound check will catch such forks, and rebind
* their vma mempolicies too. Because we still hold the global
* cgroup_mutex, we know that no other rebind effort will
Index: linux-2.6.25-rc8-mm1/kernel/fork.c
===================================================================
--- linux-2.6.25-rc8-mm1.orig/kernel/fork.c 2008-04-02 17:32:09.000000000 -0400
+++ linux-2.6.25-rc8-mm1/kernel/fork.c 2008-04-02 17:32:24.000000000 -0400
@@ -256,7 +256,7 @@ static int dup_mmap(struct mm_struct *mm
if (!tmp)
goto fail_nomem;
*tmp = *mpnt;
- pol = mpol_copy(vma_policy(mpnt));
+ pol = mpol_dup(vma_policy(mpnt));
retval = PTR_ERR(pol);
if (IS_ERR(pol))
goto fail_nomem_policy;
@@ -1130,7 +1130,7 @@ static struct task_struct *copy_process(
p->audit_context = NULL;
cgroup_fork(p);
#ifdef CONFIG_NUMA
- p->mempolicy = mpol_copy(p->mempolicy);
+ p->mempolicy = mpol_dup(p->mempolicy);
if (IS_ERR(p->mempolicy)) {
retval = PTR_ERR(p->mempolicy);
p->mempolicy = NULL;
Index: linux-2.6.25-rc8-mm1/mm/mempolicy.c
===================================================================
--- linux-2.6.25-rc8-mm1.orig/mm/mempolicy.c 2008-04-02 17:32:09.000000000 -0400
+++ linux-2.6.25-rc8-mm1/mm/mempolicy.c 2008-04-02 17:32:24.000000000 -0400
@@ -1567,15 +1567,15 @@ struct page *alloc_pages_current(gfp_t g
EXPORT_SYMBOL(alloc_pages_current);
/*
- * If mpol_copy() sees current->cpuset == cpuset_being_rebound, then it
+ * If mpol_dup() sees current->cpuset == cpuset_being_rebound, then it
* rebinds the mempolicy its copying by calling mpol_rebind_policy()
* with the mems_allowed returned by cpuset_mems_allowed(). This
* keeps mempolicies cpuset relative after its cpuset moves. See
* further kernel/cpuset.c update_nodemask().
*/
-/* Slow path of a mempolicy copy */
-struct mempolicy *__mpol_copy(struct mempolicy *old)
+/* Slow path of a mempolicy duplicate */
+struct mempolicy *__mpol_dup(struct mempolicy *old)
{
struct mempolicy *new = kmem_cache_alloc(policy_cache, GFP_KERNEL);
Index: linux-2.6.25-rc8-mm1/mm/mmap.c
===================================================================
--- linux-2.6.25-rc8-mm1.orig/mm/mmap.c 2008-04-02 17:32:09.000000000 -0400
+++ linux-2.6.25-rc8-mm1/mm/mmap.c 2008-04-02 17:32:24.000000000 -0400
@@ -1820,7 +1820,7 @@ int split_vma(struct mm_struct * mm, str
new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
}
- pol = mpol_copy(vma_policy(vma));
+ pol = mpol_dup(vma_policy(vma));
if (IS_ERR(pol)) {
kmem_cache_free(vm_area_cachep, new);
return PTR_ERR(pol);
@@ -2139,7 +2139,7 @@ struct vm_area_struct *copy_vma(struct v
new_vma = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
if (new_vma) {
*new_vma = *vma;
- pol = mpol_copy(vma_policy(vma));
+ pol = mpol_dup(vma_policy(vma));
if (IS_ERR(pol)) {
kmem_cache_free(vm_area_cachep, new_vma);
return NULL;
--
To unsubscribe from this list: send the line "unsubscribe linux-numa" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
