On 2/25/19 3:01 PM, Vlastimil Babka wrote:
> On 2/22/19 6:43 PM, Andrey Ryabinin wrote:
>> workingset_eviction() doesn't use and never did use the @mapping argument.
>> Remove it.
>>
>> Signed-off-by: Andrey Ryabinin <[email protected]>
>> Cc: Johannes Weiner <[email protected]>
>> Cc: Michal Hocko <[email protected]>
>> Cc: Vlastimil Babka <[email protected]>
>> Cc: Rik van Riel <[email protected]>
>> Cc: Mel Gorman <[email protected]>
>> ---
>> include/linux/swap.h | 2 +-
>> mm/vmscan.c | 2 +-
>> mm/workingset.c | 3 +--
>> 3 files changed, 3 insertions(+), 4 deletions(-)
>>
>> diff --git a/include/linux/swap.h b/include/linux/swap.h
>> index 649529be91f2..fc50e21b3b88 100644
>> --- a/include/linux/swap.h
>> +++ b/include/linux/swap.h
>> @@ -307,7 +307,7 @@ struct vma_swap_readahead {
>> };
>>
>> /* linux/mm/workingset.c */
>> -void *workingset_eviction(struct address_space *mapping, struct page *page);
>> +void *workingset_eviction(struct page *page);
>> void workingset_refault(struct page *page, void *shadow);
>> void workingset_activation(struct page *page);
>>
>> diff --git a/mm/vmscan.c b/mm/vmscan.c
>> index ac4806f0f332..a9852ed7b97f 100644
>> --- a/mm/vmscan.c
>> +++ b/mm/vmscan.c
>> @@ -952,7 +952,7 @@ static int __remove_mapping(struct address_space
>> *mapping, struct page *page,
>> */
>> if (reclaimed && page_is_file_cache(page) &&
>> !mapping_exiting(mapping) && !dax_mapping(mapping))
>> - shadow = workingset_eviction(mapping, page);
>> + shadow = workingset_eviction(page);
>> __delete_from_page_cache(page, shadow);
>> xa_unlock_irqrestore(&mapping->i_pages, flags);
>>
>> diff --git a/mm/workingset.c b/mm/workingset.c
>> index dcb994f2acc2..0906137760c5 100644
>> --- a/mm/workingset.c
>> +++ b/mm/workingset.c
>> @@ -215,13 +215,12 @@ static void unpack_shadow(void *shadow, int *memcgidp,
>> pg_data_t **pgdat,
>>
>> /**
>> * workingset_eviction - note the eviction of a page from memory
>> - * @mapping: address space the page was backing
>> * @page: the page being evicted
>> *
>> * Returns a shadow entry to be stored in @mapping->i_pages in place
>
> The line above still references @mapping, I guess kerneldoc build will
> complain?
>
Maybe. Will replace it with @page->mapping->i_pages
