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>
This commit is contained in:
@ -140,7 +140,6 @@ static inline unsigned long do_mmap2(unsigned long addr, size_t len,
|
||||
unsigned long prot, unsigned long flags,
|
||||
unsigned long fd, unsigned long off, int shift)
|
||||
{
|
||||
struct file * file = NULL;
|
||||
unsigned long ret = -EINVAL;
|
||||
|
||||
if (!arch_validate_prot(prot))
|
||||
@ -151,20 +150,8 @@ static inline unsigned long do_mmap2(unsigned long addr, size_t len,
|
||||
goto out;
|
||||
off >>= shift;
|
||||
}
|
||||
|
||||
ret = -EBADF;
|
||||
if (!(flags & MAP_ANONYMOUS)) {
|
||||
if (!(file = fget(fd)))
|
||||
goto out;
|
||||
}
|
||||
|
||||
flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
|
||||
|
||||
down_write(¤t->mm->mmap_sem);
|
||||
ret = do_mmap_pgoff(file, addr, len, prot, flags, off);
|
||||
up_write(¤t->mm->mmap_sem);
|
||||
if (file)
|
||||
fput(file);
|
||||
ret = sys_mmap_pgoff(addr, len, prot, flags, fd, off);
|
||||
out:
|
||||
return ret;
|
||||
}
|
||||
|
Reference in New Issue
Block a user