mempolicy: rename mpol_copy to mpol_dup
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@hp.com> Cc: Christoph Lameter <clameter@sgi.com> Cc: David Rientjes <rientjes@google.com> Cc: Mel Gorman <mel@csn.ul.ie> Cc: Andi Kleen <ak@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
committed by
Linus Torvalds
parent
f0be3d32b0
commit
846a16bf0f
+2
-2
@@ -941,7 +941,7 @@ static int update_nodemask(struct cpuset *cs, char *buf)
|
||||
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 */
|
||||
@@ -992,7 +992,7 @@ static int update_nodemask(struct cpuset *cs, char *buf)
|
||||
* 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
|
||||
|
||||
+2
-2
@@ -279,7 +279,7 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
|
||||
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;
|
||||
@@ -1116,7 +1116,7 @@ static struct task_struct *copy_process(unsigned long clone_flags,
|
||||
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;
|
||||
|
||||
Reference in New Issue
Block a user