---

yaml --- r: 108185 b: refs/heads/master c: 7cd5a02 h: refs/heads/master i: 108183: 8f29ca3 v: v3
git-mirror · Aug 11, 2008 · 7bd6303 · 7bd6303
1 parent f673a60
commit 7bd6303
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 454ed842d55740160334efc9ad56cfef54ed37bc
+refs/heads/master: 7cd5a02f54f4c9d16cf7fdffa2122bc73bb09b43
diff --git a/trunk/mm/mmap.c b/trunk/mm/mmap.c
@@ -2358,11 +2358,17 @@ int mm_take_all_locks(struct mm_struct *mm)
 	for (vma = mm->mmap; vma; vma = vma->vm_next) {
 		if (signal_pending(current))
 			goto out_unlock;
-		if (vma->anon_vma)
-			vm_lock_anon_vma(mm, vma->anon_vma);
 		if (vma->vm_file && vma->vm_file->f_mapping)
 			vm_lock_mapping(mm, vma->vm_file->f_mapping);
 	}
+
+	for (vma = mm->mmap; vma; vma = vma->vm_next) {
+		if (signal_pending(current))
+			goto out_unlock;
+		if (vma->anon_vma)
+			vm_lock_anon_vma(mm, vma->anon_vma);
+	}
+
 	ret = 0;
 
 out_unlock: