Skip to content

Commit

Permalink
rmap: resurrect page_address_in_vma anon_vma check
Browse files Browse the repository at this point in the history
With root anon-vma it's trivial to keep doing the usual check as in
old-anon-vma code.

Signed-off-by: Andrea Arcangeli <aarcange@redhat.com>
Signed-off-by: Rik van Riel <riel@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
aagit authored and torvalds committed Aug 10, 2010
1 parent 288468c commit 21d0d44
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions mm/rmap.c
Expand Up @@ -364,9 +364,10 @@ vma_address(struct page *page, struct vm_area_struct *vma)
*/
unsigned long page_address_in_vma(struct page *page, struct vm_area_struct *vma)
{
if (PageAnon(page))
;
else if (page->mapping && !(vma->vm_flags & VM_NONLINEAR)) {
if (PageAnon(page)) {
if (vma->anon_vma->root != page_anon_vma(page)->root)
return -EFAULT;
} else if (page->mapping && !(vma->vm_flags & VM_NONLINEAR)) {
if (!vma->vm_file ||
vma->vm_file->f_mapping != page->mapping)
return -EFAULT;
Expand Down

0 comments on commit 21d0d44

Please sign in to comment.