GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-04-01 03:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

do_mremap() untangling, part 3

Browse source 
Take the check for being able to expand vma in place into a separate
helper.

Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Acked-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2009-11-24 07:43:18 -05:00
parent ecc1a89937
commit 1a0ef85f84
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
mm/mremap.c
View file

@ -366,6 +366,17 @@ out:
return ret; return ret;
} }
static int vma_expandable(struct vm_area_struct *vma, unsigned long delta)
{
unsigned long max_addr = TASK_SIZE;
if (vma->vm_next)
max_addr = vma->vm_next->vm_start;
if (max_addr - vma->vm_end < delta)
return 0;
/* we need to do arch-specific checks here */
return 1;
}
/* /*
* Expand (or shrink) an existing mapping, potentially moving it at the * Expand (or shrink) an existing mapping, potentially moving it at the
* same time (controlled by the MREMAP_MAYMOVE flag and available VM space) * same time (controlled by the MREMAP_MAYMOVE flag and available VM space)
@ -430,11 +441,8 @@ unsigned long do_mremap(unsigned long addr,
/* old_len exactly to the end of the area.. /* old_len exactly to the end of the area..
*/ */
if (old_len == vma->vm_end - addr) { if (old_len == vma->vm_end - addr) {
unsigned long max_addr = TASK_SIZE;
if (vma->vm_next)
max_addr = vma->vm_next->vm_start;
/* can we just expand the current mapping? */ /* can we just expand the current mapping? */
if (max_addr - addr >= new_len) { if (vma_expandable(vma, new_len - old_len)) {
int pages = (new_len - old_len) >> PAGE_SHIFT; int pages = (new_len - old_len) >> PAGE_SHIFT;
vma_adjust(vma, vma->vm_start, vma_adjust(vma, vma->vm_start,