Commit dc982501 authored by Al Viro's avatar Al Viro
Browse files

kill do_mmap() completely 



just pull into vm_mmap()

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent e3fc629d

mm/mmap.c

+5 −11
Original line number Diff line number Diff line
@@ -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;

mm/nommu.c

+5 −11
Original line number Diff line number Diff line
@@ -1470,28 +1470,22 @@ unsigned long do_mmap_pgoff(struct file *file, 
	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;