Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd3e42fc authored by Hugh Dickins's avatar Hugh Dickins Committed by Linus Torvalds
Browse files

[PATCH] mm: dup_mmap use oldmm more 



Use the parent's oldmm throughout dup_mmap, instead of perversely going back
to current->mm.  (Can you hear the sigh of relief from those mpnts?  Usually I
squash them, but not today.)

Signed-off-by: default avatarHugh Dickins <hugh@veritas.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ae859762

kernel/fork.c

+6 −6
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ static inline int dup_mmap(struct mm_struct * mm, struct mm_struct * oldmm) 
	struct mempolicy *pol;



	down_write(&oldmm->mmap_sem);

	flush_cache_mm(current->mm);

	flush_cache_mm(oldmm);

	mm->locked_vm = 0;

	mm->mmap = NULL;

	mm->mmap_cache = NULL;
@@ -204,7 +204,7 @@ static inline int dup_mmap(struct mm_struct * mm, struct mm_struct * oldmm) 
	rb_parent = NULL;

	pprev = &mm->mmap;



	for (mpnt = current->mm->mmap ; mpnt ; mpnt = mpnt->vm_next) {

	for (mpnt = oldmm->mmap; mpnt; mpnt = mpnt->vm_next) {

		struct file *file;



		if (mpnt->vm_flags & VM_DONTCOPY) {
@@ -265,7 +265,7 @@ static inline int dup_mmap(struct mm_struct * mm, struct mm_struct * oldmm) 
		rb_parent = &tmp->vm_rb;



		mm->map_count++;

		retval = copy_page_range(mm, current->mm, tmp);

		retval = copy_page_range(mm, oldmm, tmp);

		spin_unlock(&mm->page_table_lock);



		if (tmp->vm_ops && tmp->vm_ops->open)
@@ -277,7 +277,7 @@ static inline int dup_mmap(struct mm_struct * mm, struct mm_struct * oldmm) 
	retval = 0;



out:

	flush_tlb_mm(current->mm);

	flush_tlb_mm(oldmm);

	up_write(&oldmm->mmap_sem);

	return retval;

fail_nomem_policy: