On Wed, Apr 25, 2012 at 10:17 PM, Minchan Kim <minchan@xxxxxxxxxx> wrote:
> On 04/26/2012 02:45 AM, Ying Han wrote:
>
>> 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: Ying Han <yinghan@xxxxxxxxxx>
>
>
>
> Reviewed-by: Minchan Kim <minchan@xxxxxxxxxx>
>
> Nitpick:
>
> mlocked_vma_newpage is better?
> It seems I am a paranoic about naming. :-)
> Feel free to ignore if you don't want.
Thanks, at least I see it is inconsistant to the title.
I will post another one
--Ying
>
>
>
>> ---
>> mm/internal.h | 5 +++--
>> mm/vmscan.c | 2 +-
>> 2 files changed, 4 insertions(+), 3 deletions(-)
>>
>> diff --git a/mm/internal.h b/mm/internal.h
>> index 2189af4..a935af3 100644
>> --- a/mm/internal.h
>> +++ b/mm/internal.h
>> @@ -131,7 +131,8 @@ static inline void munlock_vma_pages_all(struct vm_area_struct *vma)
>> * to determine if it's being mapped into a LOCKED vma.
>> * If so, mark page as mlocked.
>> */
>> -static inline int is_mlocked_vma(struct vm_area_struct *vma, struct page *page)
>> +static inline int mlock_vma_newpage(struct vm_area_struct *vma,
>> + struct page *page)
>> {
>> VM_BUG_ON(PageLRU(page));
>>
>> @@ -189,7 +190,7 @@ extern unsigned long vma_address(struct page *page,
>> struct vm_area_struct *vma);
>> #endif
>> #else /* !CONFIG_MMU */
>> -static inline int is_mlocked_vma(struct vm_area_struct *v, struct page *p)
>> +static inline int mlock_vma_newpage(struct vm_area_struct *v, struct page *p)
>> {
>> return 0;
>> }
>> diff --git a/mm/vmscan.c b/mm/vmscan.c
>> index 1a51868..686c63e 100644
>> --- a/mm/vmscan.c
>> +++ b/mm/vmscan.c
>> @@ -3531,7 +3531,7 @@ int page_evictable(struct page *page, struct vm_area_struct *vma)
>> if (mapping_unevictable(page_mapping(page)))
>> return 0;
>>
>> - if (PageMlocked(page) || (vma && is_mlocked_vma(vma, page)))
>> + if (PageMlocked(page) || (vma && mlock_vma_newpage(vma, page)))
>> return 0;
>>
>> return 1;
>
>
>
> --
> Kind regards,
> Minchan Kim
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxx. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href