new helper: vm_mmap_pgoff()

take it to mm/util.c, convert vm_mmap() to use of that one and
take it to mm/util.c as well, convert both sys_mmap_pgoff() to
use of vm_mmap_pgoff()

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

1 files changed, 1 insertions, 29 deletions

diff --git a/mm/mmap.c b/mm/mmap.c
index 538c905d6d9b..98ef8a6c2cd8 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -1102,28 +1102,6 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
         return mmap_region(file, addr, len, flags, vm_flags, pgoff);
 }
 
-unsigned long vm_mmap(struct file *file, unsigned long addr,
-        unsigned long len, unsigned long prot,
-        unsigned long flag, unsigned long offset)
-{
-        unsigned long ret;
-        struct mm_struct *mm = current->mm;
-
-        if (unlikely(offset + PAGE_ALIGN(len) < offset))
-                return -EINVAL;
-        if (unlikely(offset & ~PAGE_MASK))
-                return -EINVAL;
-
-        ret = security_mmap_file(file, prot, flag);
-        if (!ret) {
-                down_write(&mm->mmap_sem);
-                ret = do_mmap_pgoff(file, addr, len, prot, flag, offset >> PAGE_SHIFT);
-                up_write(&mm->mmap_sem);
-        }
-        return ret;
-}
-EXPORT_SYMBOL(vm_mmap);
-
 SYSCALL_DEFINE6(mmap_pgoff, unsigned long, addr, unsigned long, len,
                 unsigned long, prot, unsigned long, flags,
                 unsigned long, fd, unsigned long, pgoff)
@@ -1155,13 +1133,7 @@ SYSCALL_DEFINE6(mmap_pgoff, unsigned long, addr, unsigned long, len,
 
         flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
 
-        retval = security_mmap_file(file, prot, flags);
-        if (!retval) {
-                down_write(&current->mm->mmap_sem);
-                retval = do_mmap_pgoff(file, addr, len, prot, flags, pgoff);
-                up_write(&current->mm->mmap_sem);
-        }
-
+        retval = vm_mmap_pgoff(file, addr, len, prot, flags, pgoff);
         if (file)
                 fput(file);
 out: