mm: Turn putback_lru_page() into folio_putback_lru()

Add a putback_lru_page() wrapper.  Removes a couple of compound_head()
calls.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>

diff --git a/mm/folio-compat.c b/mm/folio-compat.c
index a4a7725..46fa179 100644 (file)
--- a/mm/folio-compat.c
+++ b/mm/folio-compat.c
@@ -159,3 +159,8 @@ int isolate_lru_page(struct page *page)
                return -EBUSY;
        return folio_isolate_lru((struct folio *)page);
 }
+
+void putback_lru_page(struct page *page)
+{
+       folio_putback_lru(page_folio(page));
+}

diff --git a/mm/internal.h b/mm/internal.h
index 69e88fb..ade30a1 100644 (file)
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -154,7 +154,8 @@ extern unsigned long highest_memmap_pfn;
  */
 int isolate_lru_page(struct page *page);
 int folio_isolate_lru(struct folio *folio);
-extern void putback_lru_page(struct page *page);
+void putback_lru_page(struct page *page);
+void folio_putback_lru(struct folio *folio);
 extern void reclaim_throttle(pg_data_t *pgdat, enum vmscan_throttle_state reason);
 
 /*

diff --git a/mm/vmscan.c b/mm/vmscan.c
index 4f54c6d..5c108d5 100644 (file)
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -1357,18 +1357,18 @@ int remove_mapping(struct address_space *mapping, struct page *page)
 }
 
 /**
- * putback_lru_page - put previously isolated page onto appropriate LRU list
- * @page: page to be put back to appropriate lru list
+ * folio_putback_lru - Put previously isolated folio onto appropriate LRU list.
+ * @folio: Folio to be returned to an LRU list.
  *
- * Add previously isolated @page to appropriate LRU list.
- * Page may still be unevictable for other reasons.
+ * Add previously isolated @folio to appropriate LRU list.
+ * The folio may still be unevictable for other reasons.
  *
- * lru_lock must not be held, interrupts must be enabled.
+ * Context: lru_lock must not be held, interrupts must be enabled.
  */
-void putback_lru_page(struct page *page)
+void folio_putback_lru(struct folio *folio)
 {
-       lru_cache_add(page);
-       put_page(page);         /* drop ref from isolate */
+       folio_add_lru(folio);
+       folio_put(folio);               /* drop ref from isolate */
 }
 
 enum page_references {