merge do_mremap() into sys_mremap()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

merge do_mremap() into sys_mremap()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Al Viro
1 parent 657bec850f
Showing 1 changed file with 5 additions and 14 deletions Side-by-side Diff
mm/mremap.c
@@ -432,15 +432,17 @@
  * MREMAP_FIXED option added 5-Dec-1999 by Benjamin LaHaise
  * This option implies MREMAP_MAYMOVE.
  */
-unsigned long do_mremap(unsigned long addr,
-	unsigned long old_len, unsigned long new_len,
-	unsigned long flags, unsigned long new_addr)
+SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
+		unsigned long, new_len, unsigned long, flags,
+		unsigned long, new_addr)
 {
 	struct mm_struct *mm = current->mm;
 	struct vm_area_struct *vma;
 	unsigned long ret = -EINVAL;
 	unsigned long charged = 0;
  
+	down_write(&current->mm->mmap_sem);
+
 	if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE))
 		goto out;
  
@@ -538,17 +540,6 @@
 out:
 	if (ret & ~PAGE_MASK)
 		vm_unacct_memory(charged);
-	return ret;
-}
-
-SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
-		unsigned long, new_len, unsigned long, flags,
-		unsigned long, new_addr)
-{
-	unsigned long ret;
-
-	down_write(&current->mm->mmap_sem);
-	ret = do_mremap(addr, old_len, new_len, flags, new_addr);
 	up_write(&current->mm->mmap_sem);
 	return ret;
 }
...	...	@@ -432,15 +432,17 @@
432	432	* MREMAP_FIXED option added 5-Dec-1999 by Benjamin LaHaise
433	433	* This option implies MREMAP_MAYMOVE.
434	434	*/
435		-unsigned long do_mremap(unsigned long addr,
436		- unsigned long old_len, unsigned long new_len,
437		- unsigned long flags, unsigned long new_addr)
	435	+SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
	436	+ unsigned long, new_len, unsigned long, flags,
	437	+ unsigned long, new_addr)
438	438	{
439	439	struct mm_struct *mm = current->mm;
440	440	struct vm_area_struct *vma;
441	441	unsigned long ret = -EINVAL;
442	442	unsigned long charged = 0;
443	443
	444	+ down_write(&current->mm->mmap_sem);
	445	+
444	446	if (flags & ~(MREMAP_FIXED \| MREMAP_MAYMOVE))
445	447	goto out;
446	448
...	...	@@ -538,17 +540,6 @@
538	540	out:
539	541	if (ret & ~PAGE_MASK)
540	542	vm_unacct_memory(charged);
541		- return ret;
542		-}
543		-
544		-SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
545		- unsigned long, new_len, unsigned long, flags,
546		- unsigned long, new_addr)
547		-{
548		- unsigned long ret;
549		-
550		- down_write(&current->mm->mmap_sem);
551		- ret = do_mremap(addr, old_len, new_len, flags, new_addr);
552	543	up_write(&current->mm->mmap_sem);
553	544	return ret;
554	545	}