[PATCH] mmap: fix loop when adjusting vma

[Hillf Danton]

If we have more work to do after one vma is removed, we have to reload @end in
case it is clobbered, then try again.

Thanks

Signed-off-by: Hillf Danton <dhillf@xxxxxxxxx>
---

--- a/mm/mmap.c	Fri Nov 11 20:35:46 2011
+++ b/mm/mmap.c	Fri Nov 11 20:41:32 2011
@@ -490,6 +490,7 @@ __vma_unlink(struct mm_struct *mm, struc
 int vma_adjust(struct vm_area_struct *vma, unsigned long start,
 	unsigned long end, pgoff_t pgoff, struct vm_area_struct *insert)
 {
+	unsigned long saved_end = end;
 	struct mm_struct *mm = vma->vm_mm;
 	struct vm_area_struct *next = vma->vm_next;
 	struct vm_area_struct *importer = NULL;
@@ -634,7 +635,14 @@ again:			remove_next = 1 + (end > next->
 		 */
 		if (remove_next == 2) {
 			next = vma->vm_next;
-			goto again;
+			if (next) {
+				/*
+				 * we have more work, reload @end in case
+				 * it is clobbered.
+				 */
+				end = saved_end;
+				goto again;
+			}
 		}
 	}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/