Unify sys_mmap*

New helper - sys_mmap_pgoff(); switch syscalls to using it.

Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

1 files changed, 6 insertions, 13 deletions

diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
index 9a3334ae282e..62619f25132f 100644
--- a/arch/alpha/kernel/osf_sys.c
+++ b/arch/alpha/kernel/osf_sys.c
@@ -178,25 +178,18 @@ SYSCALL_DEFINE6(osf_mmap, unsigned long, addr, unsigned long, len,
                 unsigned long, prot, unsigned long, flags, unsigned long, fd,
                 unsigned long, off)
 {
-        struct file *file = NULL;
-        unsigned long ret = -EBADF;
+        unsigned long ret = -EINVAL;
 
 #if 0
         if (flags & (_MAP_HASSEMAPHORE | _MAP_INHERIT | _MAP_UNALIGNED))
                 printk("%s: unimplemented OSF mmap flags %04lx\n", 
                         current->comm, flags);
 #endif
-        if (!(flags & MAP_ANONYMOUS)) {
-                file = fget(fd);
-                if (!file)
-                        goto out;
-        }
-        flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
-        down_write(&current->mm->mmap_sem);
-        ret = do_mmap(file, addr, len, prot, flags, off);
-        up_write(&current->mm->mmap_sem);
-        if (file)
-                fput(file);
+        if ((off + PAGE_ALIGN(len)) < off)
+                goto out;
+        if (off & ~PAGE_MASK)
+                goto out;
+        ret = sys_mmap_pgoff(addr, len, prot, flags, fd, off >> PAGE_SHIFT);
  out:
         return ret;
 }