Commit 4944e76d authored by Paolo 'Blaisorblade' Giarrusso's avatar Paolo 'Blaisorblade' Giarrusso Committed by Linus Torvalds

[PATCH] mm: remove implied vm_ops check

If !vma->vm-ops we already BUG above, so retesting it is useless.  The
compiler cannot optimize this because BUG is a macro and is not thus marked
noreturn; that should possibly be fixed.
Signed-off-by: default avatarPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent d44ed4f8
...@@ -1955,7 +1955,7 @@ static int do_file_page(struct mm_struct * mm, struct vm_area_struct * vma, ...@@ -1955,7 +1955,7 @@ static int do_file_page(struct mm_struct * mm, struct vm_area_struct * vma,
* Fall back to the linear mapping if the fs does not support * Fall back to the linear mapping if the fs does not support
* ->populate: * ->populate:
*/ */
if (!vma->vm_ops || !vma->vm_ops->populate || if (!vma->vm_ops->populate ||
(write_access && !(vma->vm_flags & VM_SHARED))) { (write_access && !(vma->vm_flags & VM_SHARED))) {
pte_clear(mm, address, pte); pte_clear(mm, address, pte);
return do_no_page(mm, vma, address, write_access, pte, pmd); return do_no_page(mm, vma, address, write_access, pte, pmd);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment