summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-05-30 20:11:57 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2012-06-01 10:37:17 -0400
commitdc982501d9643ab0c117e7d87562857ce234652d (patch)
tree6783ecec372875f18f8050f97fbb86f72b8bb890 /mm
parente3fc629d7bb70848fbf479688a66d4e76dff46ac (diff)
downloadop-kernel-dev-dc982501d9643ab0c117e7d87562857ce234652d.zip
op-kernel-dev-dc982501d9643ab0c117e7d87562857ce234652d.tar.gz
kill do_mmap() completely
just pull into vm_mmap() Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'mm')
-rw-r--r--mm/mmap.c16
-rw-r--r--mm/nommu.c16
2 files changed, 10 insertions, 22 deletions
diff --git a/mm/mmap.c b/mm/mmap.c
index f778654..538c905 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -1102,28 +1102,22 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
return mmap_region(file, addr, len, flags, vm_flags, pgoff);
}
-static unsigned long do_mmap(struct file *file, unsigned long addr,
+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;
- return do_mmap_pgoff(file, addr, len, prot, flag, offset >> PAGE_SHIFT);
-}
-
-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;
ret = security_mmap_file(file, prot, flag);
if (!ret) {
down_write(&mm->mmap_sem);
- ret = do_mmap(file, addr, len, prot, flag, offset);
+ ret = do_mmap_pgoff(file, addr, len, prot, flag, offset >> PAGE_SHIFT);
up_write(&mm->mmap_sem);
}
return ret;
diff --git a/mm/nommu.c b/mm/nommu.c
index a1792ed..e6123a5 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -1470,28 +1470,22 @@ error_getting_region:
return -ENOMEM;
}
-static unsigned long do_mmap(struct file *file, unsigned long addr,
+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;
- return do_mmap_pgoff(file, addr, len, prot, flag, offset >> PAGE_SHIFT);
-}
-
-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;
ret = security_mmap_file(file, prot, flag);
if (!ret) {
down_write(&mm->mmap_sem);
- ret = do_mmap(file, addr, len, prot, flag, offset);
+ ret = do_mmap_pgoff(file, addr, len, prot, flag, offset >> PAGE_SHIFT);
up_write(&mm->mmap_sem);
}
return ret;
OpenPOWER on IntegriCloud