mm/swap: convert __put_page() to __folio_put()

Saves 11 bytes of text by removing a check of PageTail.

Link: https://lkml.kernel.org/r/20220617175020.717127-16-willy@infradead.org
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 5aa73e1114138739db4c11269fb2f957dc0a6b9f..29a124010cf7aaf7569174fdcb57e69d3281596c 100644 (file)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -887,7 +887,7 @@ static inline struct folio *virt_to_folio(const void *x)
        return page_folio(page);
 }
 
-void __put_page(struct page *page);
+void __folio_put(struct folio *folio);
 
 void put_pages_list(struct list_head *pages);
 
@@ -1229,7 +1229,7 @@ static inline __must_check bool try_get_page(struct page *page)
 static inline void folio_put(struct folio *folio)
 {
        if (folio_put_testzero(folio))
-               __put_page(&folio->page);
+               __folio_put(folio);
 }
 
 /**
@@ -1249,7 +1249,7 @@ static inline void folio_put(struct folio *folio)
 static inline void folio_put_refs(struct folio *folio, int refs)
 {
        if (folio_ref_sub_and_test(folio, refs))
-               __put_page(&folio->page);
+               __folio_put(folio);
 }
 
 void release_pages(struct page **pages, int nr);

diff --git a/mm/swap.c b/mm/swap.c
index a5a91aec83da364d916d305499382b9c8573ca3d..d09e9ac538098ca677c39e1d7c67084cd7588190 100644 (file)
--- a/mm/swap.c
+++ b/mm/swap.c
@@ -119,16 +119,16 @@ static void __put_compound_page(struct page *page)
        destroy_compound_page(page);
 }
 
-void __put_page(struct page *page)
+void __folio_put(struct folio *folio)
 {
-       if (unlikely(is_zone_device_page(page)))
-               free_zone_device_page(page);
-       else if (unlikely(PageCompound(page)))
-               __put_compound_page(page);
+       if (unlikely(folio_is_zone_device(folio)))
+               free_zone_device_page(&folio->page);
+       else if (unlikely(folio_test_large(folio)))
+               __put_compound_page(&folio->page);
        else
-               __put_single_page(page);
+               __put_single_page(&folio->page);
 }
-EXPORT_SYMBOL(__put_page);
+EXPORT_SYMBOL(__folio_put);
 
 /**
  * put_pages_list() - release a list of pages

diff --git a/net/core/page_pool.c b/net/core/page_pool.c
index f18e6e771993df0dda3f2a93d161eed19ac22fb0..db70e94c8df2521a0dc8319321eccc691450254d 100644 (file)
--- a/net/core/page_pool.c
+++ b/net/core/page_pool.c
@@ -16,7 +16,7 @@
 #include <linux/dma-direction.h>
 #include <linux/dma-mapping.h>
 #include <linux/page-flags.h>
-#include <linux/mm.h> /* for __put_page() */
+#include <linux/mm.h> /* for put_page() */
 #include <linux/poison.h>
 #include <linux/ethtool.h>