aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-05-30 20:08:42 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2012-06-01 10:37:17 -0400
commite3fc629d7bb70848fbf479688a66d4e76dff46ac (patch)
tree96b6d5ffdb1c643fb28807a635e6ca4e24964034 /fs
parent98de59bfe4b2ff6344d9ad8e5296f80de5dcc5b6 (diff)
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: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
-rw-r--r--fs/aio.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/aio.c b/fs/aio.c
index e7f2fad7b4ce..07154d99cc67 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -134,9 +134,9 @@ static int aio_setup_ring(struct kioctx *ctx)
134 info->mmap_size = nr_pages * PAGE_SIZE; 134 info->mmap_size = nr_pages * PAGE_SIZE;
135 dprintk("attempting mmap of %lu bytes\n", info->mmap_size); 135 dprintk("attempting mmap of %lu bytes\n", info->mmap_size);
136 down_write(&ctx->mm->mmap_sem); 136 down_write(&ctx->mm->mmap_sem);
137 info->mmap_base = do_mmap(NULL, 0, info->mmap_size, 137 info->mmap_base = do_mmap_pgoff(NULL, 0, info->mmap_size,
138 PROT_READ|PROT_WRITE, MAP_ANONYMOUS|MAP_PRIVATE, 138 PROT_READ|PROT_WRITE,
139 0); 139 MAP_ANONYMOUS|MAP_PRIVATE, 0);
140 if (IS_ERR((void *)info->mmap_base)) { 140 if (IS_ERR((void *)info->mmap_base)) {
141 up_write(&ctx->mm->mmap_sem); 141 up_write(&ctx->mm->mmap_sem);
142 info->mmap_size = 0; 142 info->mmap_size = 0;