Commit 096a7cf4 authored by Ying Han's avatar Ying Han Committed by Linus Torvalds

mm: rename is_mlocked_vma() to mlocked_vma_newpage()

Andrew pointed out that the is_mlocked_vma() is misnamed.  A function
with name like that would expect bool return and no side-effects.

Since it is called on the fault path for new page, rename it in this
patch.
Signed-off-by: default avatarYing Han <yinghan@google.com>
Reviewed-by: default avatarRik van Riel <riel@redhat.com>
Acked-by: default avatarKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Acked-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujtisu.com>
Reviewed-by: default avatarMinchan Kim <minchan@kernel.org>
[akpm@linux-foundation.org: s/mlock_vma_newpage/mlock_vma_newpage/, per Minchan]
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c3ac9a8a
...@@ -164,7 +164,8 @@ static inline void munlock_vma_pages_all(struct vm_area_struct *vma) ...@@ -164,7 +164,8 @@ static inline void munlock_vma_pages_all(struct vm_area_struct *vma)
* to determine if it's being mapped into a LOCKED vma. * to determine if it's being mapped into a LOCKED vma.
* If so, mark page as mlocked. * If so, mark page as mlocked.
*/ */
static inline int is_mlocked_vma(struct vm_area_struct *vma, struct page *page) static inline int mlocked_vma_newpage(struct vm_area_struct *vma,
struct page *page)
{ {
VM_BUG_ON(PageLRU(page)); VM_BUG_ON(PageLRU(page));
...@@ -222,7 +223,7 @@ extern unsigned long vma_address(struct page *page, ...@@ -222,7 +223,7 @@ extern unsigned long vma_address(struct page *page,
struct vm_area_struct *vma); struct vm_area_struct *vma);
#endif #endif
#else /* !CONFIG_MMU */ #else /* !CONFIG_MMU */
static inline int is_mlocked_vma(struct vm_area_struct *v, struct page *p) static inline int mlocked_vma_newpage(struct vm_area_struct *v, struct page *p)
{ {
return 0; return 0;
} }
......
...@@ -3321,7 +3321,7 @@ int page_evictable(struct page *page, struct vm_area_struct *vma) ...@@ -3321,7 +3321,7 @@ int page_evictable(struct page *page, struct vm_area_struct *vma)
if (mapping_unevictable(page_mapping(page))) if (mapping_unevictable(page_mapping(page)))
return 0; return 0;
if (PageMlocked(page) || (vma && is_mlocked_vma(vma, page))) if (PageMlocked(page) || (vma && mlocked_vma_newpage(vma, page)))
return 0; return 0;
return 1; return 1;
......
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