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

switch aio and shm to do_mmap_pgoff(), make do_mmap() static 



after all, 0 bytes and 0 pages is the same thing...

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

fs/aio.c

+3 −3
Original line number Diff line number Diff line
@@ -134,9 +134,9 @@ static int aio_setup_ring(struct kioctx *ctx) 
	info->mmap_size = nr_pages * PAGE_SIZE;

	dprintk("attempting mmap of %lu bytes\n", info->mmap_size);

	down_write(&ctx->mm->mmap_sem);

	info->mmap_base = do_mmap(NULL, 0, info->mmap_size, 

				  PROT_READ|PROT_WRITE, MAP_ANONYMOUS|MAP_PRIVATE,

				  0);

	info->mmap_base = do_mmap_pgoff(NULL, 0, info->mmap_size, 

					PROT_READ|PROT_WRITE,

					MAP_ANONYMOUS|MAP_PRIVATE, 0);

	if (IS_ERR((void *)info->mmap_base)) {

		up_write(&ctx->mm->mmap_sem);

		info->mmap_size = 0;

include/linux/mm.h

+1 −1
Original line number Diff line number Diff line
@@ -1394,7 +1394,7 @@ extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned lo 
extern unsigned long mmap_region(struct file *file, unsigned long addr,

	unsigned long len, unsigned long flags,

	vm_flags_t vm_flags, unsigned long pgoff);

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

extern unsigned long do_mmap_pgoff(struct file *, unsigned long,

        unsigned long, unsigned long,

        unsigned long, unsigned long);

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

ipc/shm.c

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

	}

		

	user_addr = do_mmap (file, addr, size, prot, flags, 0);

	user_addr = do_mmap_pgoff(file, addr, size, prot, flags, 0);

	*raddr = user_addr;

	err = 0;

	if (IS_ERR_VALUE(user_addr))

mm/mmap.c

+2 −2
Original line number Diff line number Diff line
@@ -971,7 +971,7 @@ static inline unsigned long round_hint_to_min(unsigned long hint) 
 * The caller must hold down_write(&current->mm->mmap_sem).

 */



static unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,

unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,

			unsigned long len, unsigned long prot,

			unsigned long flags, unsigned long pgoff)

{
@@ -1102,7 +1102,7 @@ static unsigned long do_mmap_pgoff(struct file *file, unsigned long addr, 
	return mmap_region(file, addr, len, flags, vm_flags, pgoff);

}



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

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

	unsigned long len, unsigned long prot,

	unsigned long flag, unsigned long offset)

{

mm/nommu.c

+2 −2
Original line number Diff line number Diff line
@@ -1232,7 +1232,7 @@ static int do_mmap_private(struct vm_area_struct *vma, 
/*

 * handle mapping creation for uClinux

 */

static unsigned long do_mmap_pgoff(struct file *file,

unsigned long do_mmap_pgoff(struct file *file,

			    unsigned long addr,

			    unsigned long len,

			    unsigned long prot,
@@ -1470,7 +1470,7 @@ static unsigned long do_mmap_pgoff(struct file *file, 
	return -ENOMEM;

}



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

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

	unsigned long len, unsigned long prot,

	unsigned long flag, unsigned long offset)

{