leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

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

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2012-05-30 20:08:42 -04:00
parent 98de59bfe4
commit e3fc629d7b
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/aio.c
View File

@ -134,9 +134,9 @@ static int aio_setup_ring(struct kioctx *ctx)
info->mmap_size = nr_pages * PAGE_SIZE; info->mmap_size = nr_pages * PAGE_SIZE;
dprintk("attempting mmap of %lu bytes\n", info->mmap_size); dprintk("attempting mmap of %lu bytes\n", info->mmap_size);
down_write(&ctx->mm->mmap_sem); down_write(&ctx->mm->mmap_sem);
info->mmap_base = do_mmap(NULL, 0, info->mmap_size, info->mmap_base = do_mmap_pgoff(NULL, 0, info->mmap_size,
PROT_READ|PROT_WRITE, MAP_ANONYMOUS|MAP_PRIVATE, PROT_READ|PROT_WRITE,
0); MAP_ANONYMOUS|MAP_PRIVATE, 0);
if (IS_ERR((void *)info->mmap_base)) { if (IS_ERR((void *)info->mmap_base)) {
up_write(&ctx->mm->mmap_sem); up_write(&ctx->mm->mmap_sem);
info->mmap_size = 0; info->mmap_size = 0;

2
include/linux/mm.h
View File

@ -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, extern unsigned long mmap_region(struct file *file, unsigned long addr,
unsigned long len, unsigned long flags, unsigned long len, unsigned long flags,
vm_flags_t vm_flags, unsigned long pgoff); 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,
unsigned long, unsigned long); unsigned long, unsigned long);
extern int do_munmap(struct mm_struct *, unsigned long, size_t); extern int do_munmap(struct mm_struct *, unsigned long, size_t);

2
ipc/shm.c
View File

@ -1054,7 +1054,7 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr)
goto invalid; 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; *raddr = user_addr;
err = 0; err = 0;
if (IS_ERR_VALUE(user_addr)) if (IS_ERR_VALUE(user_addr))

4
mm/mmap.c
View File

@ -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). * 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 len, unsigned long prot,
unsigned long flags, unsigned long pgoff) 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); 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 len, unsigned long prot,
unsigned long flag, unsigned long offset) unsigned long flag, unsigned long offset)
{ {

4
mm/nommu.c
View File

@ -1232,7 +1232,7 @@ enomem:
/* /*
* handle mapping creation for uClinux * 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 addr,
unsigned long len, unsigned long len,
unsigned long prot, unsigned long prot,
@ -1470,7 +1470,7 @@ error_getting_region:
return -ENOMEM; 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 len, unsigned long prot,
unsigned long flag, unsigned long offset) unsigned long flag, unsigned long offset)
{ {