mm/workingset: remove unused @mapping argument in workingset_eviction()

workingset_eviction() doesn't use and never did use the @mapping
argument.  Remove it.

Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Andrey Ryabinin <[email protected]>
Acked-by: Johannes Weiner <[email protected]>
Acked-by: Rik van Riel <[email protected]>
Acked-by: Vlastimil Babka <[email protected]>
Acked-by: Mel Gorman <[email protected]>
Cc: Michal Hocko <[email protected]>
Cc: William Kucharski <[email protected]>
Cc: John Hubbard <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/include/linux/swap.h b/include/linux/swap.h
index 649529be91f2114af9ed955e217d29a1ec6d9e8c..fc50e21b3b88e64a450477f6d595eabb18732522 100644 (file)
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -307,7 +307,7 @@ struct vma_swap_readahead {
 };
 
 /* linux/mm/workingset.c */
 };
 
 /* 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);
 
 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 e1f7ccdc0a904bec102796968c4449150b9dab8f..dda6b80d045fd92df00ee819c10168a27f05a6e0 100644 (file)
--- 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))
                 */
                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);
 
                __delete_from_page_cache(page, shadow);
                xa_unlock_irqrestore(&mapping->i_pages, flags);
 

diff --git a/mm/workingset.c b/mm/workingset.c
index dcb994f2acc2e600f39e2338d16f7bd839aefd2d..0bedf67502d54525fb7ac9626dbceb84572c26ca 100644 (file)
--- 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
 
 /**
  * workingset_eviction - note the eviction of a page from memory

- * @mapping: address space the page was backing

  * @page: the page being evicted
  *
  * @page: the page being evicted
  *

- * Returns a shadow entry to be stored in @mapping->i_pages in place
+ * Returns a shadow entry to be stored in @page->mapping->i_pages in place

  * of the evicted @page so that a later refault can be detected.
  */
  * 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);
 {
        struct pglist_data *pgdat = page_pgdat(page);
        struct mem_cgroup *memcg = page_memcg(page);