mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
mm: make do_mmap_pgoff return populate as a size in bytes, not as a bool
do_mmap_pgoff() rounds up the desired size to the next PAGE_SIZE multiple, however there was no equivalent code in mm_populate(), which caused issues. This could be fixed by introduced the same rounding in mm_populate(), however I think it's preferable to make do_mmap_pgoff() return populate as a size rather than as a boolean, so we don't have to duplicate the size rounding logic in mm_populate(). Signed-off-by: Michel Lespinasse <[email protected]> Acked-by: Rik van Riel <[email protected]> Tested-by: Andy Lutomirski <[email protected]> Cc: Greg Ungerer <[email protected]> Cc: David Howells <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
1869305009
commit
41badc15cb
6 changed files with 13 additions and 14 deletions
5
fs/aio.c
5
fs/aio.c
|
|
@ -101,9 +101,8 @@ static int aio_setup_ring(struct kioctx *ctx)
|
|||
struct aio_ring *ring;
|
||||
struct aio_ring_info *info = &ctx->ring_info;
|
||||
unsigned nr_events = ctx->max_reqs;
|
||||
unsigned long size;
|
||||
unsigned long size, populate;
|
||||
int nr_pages;
|
||||
bool populate;
|
||||
|
||||
/* Compensate for the ring buffer's head/tail overlap entry */
|
||||
nr_events += 2; /* 1 is required, 2 for good luck */
|
||||
|
|
@ -150,7 +149,7 @@ static int aio_setup_ring(struct kioctx *ctx)
|
|||
return -EAGAIN;
|
||||
}
|
||||
if (populate)
|
||||
mm_populate(info->mmap_base, info->mmap_size);
|
||||
mm_populate(info->mmap_base, populate);
|
||||
|
||||
ctx->user_id = info->mmap_base;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue