| Message ID | 20190222174337.26390-1-aryabinin@virtuozzo.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/5] mm/workingset: remove unused @mapping argument in workingset_eviction() | expand |
On Fri, Feb 22, 2019 at 08:43:33PM +0300, Andrey Ryabinin wrote: > workingset_eviction() doesn't use and never did use the @mapping argument. > Remove it. > > Signed-off-by: Andrey Ryabinin <aryabinin@virtuozzo.com> > Cc: Johannes Weiner <hannes@cmpxchg.org> > Cc: Michal Hocko <mhocko@kernel.org> > Cc: Vlastimil Babka <vbabka@suse.cz> > Cc: Rik van Riel <riel@surriel.com> > Cc: Mel Gorman <mgorman@techsingularity.net> Acked-by: Johannes Weiner <hannes@cmpxchg.org>
On Fri, 2019-02-22 at 20:43 +0300, Andrey Ryabinin wrote: > workingset_eviction() doesn't use and never did use the @mapping > argument. > Remove it. > > Signed-off-by: Andrey Ryabinin <aryabinin@virtuozzo.com> > Cc: Johannes Weiner <hannes@cmpxchg.org> > Cc: Michal Hocko <mhocko@kernel.org> > Cc: Vlastimil Babka <vbabka@suse.cz> > Cc: Rik van Riel <riel@surriel.com> > Cc: Mel Gorman <mgorman@techsingularity.net> Acked-by: Rik van Riel <riel@surriel.com>
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 <aryabinin@virtuozzo.com> > Cc: Johannes Weiner <hannes@cmpxchg.org> > Cc: Michal Hocko <mhocko@kernel.org> > Cc: Vlastimil Babka <vbabka@suse.cz> > Cc: Rik van Riel <riel@surriel.com> > Cc: Mel Gorman <mgorman@techsingularity.net> > --- > 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? > * of the evicted @page so that a later refault can be detected. > */ > -void *workingset_eviction(struct address_space *mapping, struct page *page) > +void *workingset_eviction(struct page *page) > { > struct pglist_data *pgdat = page_pgdat(page); > struct mem_cgroup *memcg = page_memcg(page); >
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 <aryabinin@virtuozzo.com> >> Cc: Johannes Weiner <hannes@cmpxchg.org> >> Cc: Michal Hocko <mhocko@kernel.org> >> Cc: Vlastimil Babka <vbabka@suse.cz> >> Cc: Rik van Riel <riel@surriel.com> >> Cc: Mel Gorman <mgorman@techsingularity.net> >> --- >> 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
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 * of the evicted @page so that a later refault can be detected. */ -void *workingset_eviction(struct address_space *mapping, struct page *page) +void *workingset_eviction(struct page *page) { struct pglist_data *pgdat = page_pgdat(page); struct mem_cgroup *memcg = page_memcg(page);
workingset_eviction() doesn't use and never did use the @mapping argument. Remove it. Signed-off-by: Andrey Ryabinin <aryabinin@virtuozzo.com> Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: Michal Hocko <mhocko@kernel.org> Cc: Vlastimil Babka <vbabka@suse.cz> Cc: Rik van Riel <riel@surriel.com> Cc: Mel Gorman <mgorman@techsingularity.net> --- include/linux/swap.h | 2 +- mm/vmscan.c | 2 +- mm/workingset.c | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-)