Commit 45e55300 authored by Peter Collingbourne's avatar Peter Collingbourne Committed by Linus Torvalds
Browse files

mm: remove unnecessary wrapper function do_mmap_pgoff() 



The current split between do_mmap() and do_mmap_pgoff() was introduced in
commit 1fcfd8db ("mm, mpx: add "vm_flags_t vm_flags" arg to
do_mmap_pgoff()") to support MPX.

The wrapper function do_mmap_pgoff() always passed 0 as the value of the
vm_flags argument to do_mmap().  However, MPX support has subsequently
been removed from the kernel and there were no more direct callers of
do_mmap(); all calls were going via do_mmap_pgoff().

Simplify the code by removing do_mmap_pgoff() and changing all callers to
directly call do_mmap(), which now no longer takes a vm_flags argument.

Signed-off-by: default avatarPeter Collingbourne <pcc@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Reviewed-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Link: http://lkml.kernel.org/r/20200727194109.1371462-1-pcc@google.com


Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d70cec89

fs/aio.c

+3 −3
Original line number Diff line number Diff line
@@ -525,7 +525,7 @@ static int aio_setup_ring(struct kioctx *ctx, unsigned int nr_events) 
		return -EINTR;

	}



	ctx->mmap_base = do_mmap_pgoff(ctx->aio_ring_file, 0, ctx->mmap_size,

	ctx->mmap_base = do_mmap(ctx->aio_ring_file, 0, ctx->mmap_size,

				 PROT_READ | PROT_WRITE,

				 MAP_SHARED, 0, &unused, NULL);

	mmap_write_unlock(mm);

fs/hugetlbfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ static int hugetlbfs_file_mmap(struct file *file, struct vm_area_struct *vma) 
	 * already been checked by prepare_hugepage_range.  If you add

	 * any error returns here, do so after setting VM_HUGETLB, so

	 * is_vm_hugetlb_page tests below unmap_region go the right

	 * way when do_mmap_pgoff unwinds (may be important on powerpc

	 * way when do_mmap unwinds (may be important on powerpc

	 * and ia64).

	 */

	vma->vm_flags |= VM_HUGETLB | VM_DONTEXPAND;

include/linux/fs.h

+1 −1
Original line number Diff line number Diff line
@@ -528,7 +528,7 @@ static inline int mapping_mapped(struct address_space *mapping) 


/*

 * Might pages of this file have been modified in userspace?

 * Note that i_mmap_writable counts all VM_SHARED vmas: do_mmap_pgoff

 * Note that i_mmap_writable counts all VM_SHARED vmas: do_mmap

 * marks vma as VM_SHARED if it is shared, and the file was opened for

 * writing i.e. vma may be mprotected writable even if now readonly.

 *

include/linux/mm.h

+1 −11
Original line number Diff line number Diff line
@@ -2546,23 +2546,13 @@ extern unsigned long mmap_region(struct file *file, unsigned long addr, 
	struct list_head *uf);

extern unsigned long do_mmap(struct file *file, unsigned long addr,

	unsigned long len, unsigned long prot, unsigned long flags,

	vm_flags_t vm_flags, unsigned long pgoff, unsigned long *populate,

	struct list_head *uf);

	unsigned long pgoff, unsigned long *populate, struct list_head *uf);

extern int __do_munmap(struct mm_struct *, unsigned long, size_t,

		       struct list_head *uf, bool downgrade);

extern int do_munmap(struct mm_struct *, unsigned long, size_t,

		     struct list_head *uf);

extern int do_madvise(unsigned long start, size_t len_in, int behavior);



static inline unsigned long

do_mmap_pgoff(struct file *file, unsigned long addr,

	unsigned long len, unsigned long prot, unsigned long flags,

	unsigned long pgoff, unsigned long *populate,

	struct list_head *uf)

{

	return do_mmap(file, addr, len, prot, flags, 0, pgoff, populate, uf);

}



#ifdef CONFIG_MMU

extern int __mm_populate(unsigned long addr, unsigned long len,

			 int ignore_errors);

ipc/shm.c

+1 −1
Original line number Diff line number Diff line
@@ -1558,7 +1558,7 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, 
			goto invalid;

	}



	addr = do_mmap_pgoff(file, addr, size, prot, flags, 0, &populate, NULL);

	addr = do_mmap(file, addr, size, prot, flags, 0, &populate, NULL);

	*raddr = addr;

	err = 0;

	if (IS_ERR_VALUE(addr))