From e0e0ec017ac4bff85eaa6db2c218923279f8c896 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Tue, 24 Nov 2009 08:43:52 -0500
Subject: [PATCH] --- yaml --- r: 174847 b: refs/heads/master c:
 097eed103862f9c6a97f2e415e21d1134017b135 h: refs/heads/master i:   174845:
 d6b7b0b1eb8825047c58b9380a40dd65b6093785   174843:
 88f786b591a87c4bf2392906289538c7305065f2   174839:
 896bd9a4fef00ad0604dc75fc6f659fbb62d5cb1   174831:
 4a9a7b88786d48bb2ea5937d4281bf71a27b5de6   174815:
 b4c75814974b1ff7127469ed7e4a115645e2c8af   174783:
 0b21ed383aa593349ab1ea155631e54ef985b39d   174719:
 54ce1bcd6db071e97c8b1bf2ecc53f24806f7904   174591:
 176efaab326116c803489f233a2308741bb06e38 v: v3

---
 [refs]            |  2 +-
 trunk/mm/mremap.c | 19 +++++++++++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ede981f4f068..93577874c975 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f106af4e90eadd76cfc0b5325f659619e08fb762
+refs/heads/master: 097eed103862f9c6a97f2e415e21d1134017b135
diff --git a/trunk/mm/mremap.c b/trunk/mm/mremap.c
index 9d0753983dcb..84efffb2d2c4 100644
--- a/trunk/mm/mremap.c
+++ b/trunk/mm/mremap.c
@@ -325,6 +325,7 @@ static unsigned long mremap_to(unsigned long addr,
 	struct vm_area_struct *vma;
 	unsigned long ret = -EINVAL;
 	unsigned long charged = 0;
+	unsigned long map_flags;
 
 	if (new_addr & ~PAGE_MASK)
 		goto out;
@@ -362,9 +363,23 @@ static unsigned long mremap_to(unsigned long addr,
 		goto out;
 	}
 
-	ret = move_vma(vma, addr, old_len, new_len, new_addr);
+	map_flags = MAP_FIXED;
+	if (vma->vm_flags & VM_MAYSHARE)
+		map_flags |= MAP_SHARED;
+	ret = arch_mmap_check(new_addr, new_len, map_flags);
+	if (ret)
+		goto out1;
+	ret = get_unmapped_area(vma->vm_file, new_addr, new_len, vma->vm_pgoff +
+				((addr - vma->vm_start) >> PAGE_SHIFT),
+				map_flags);
 	if (ret & ~PAGE_MASK)
-		vm_unacct_memory(charged);
+		goto out1;
+
+	ret = move_vma(vma, addr, old_len, new_len, new_addr);
+	if (!(ret & ~PAGE_MASK))
+		goto out;
+out1:
+	vm_unacct_memory(charged);
 
 out:
 	return ret;