mm: simplify calling a compound page destructor

None of the three callers of get_compound_page_dtor() want to know the
value; they just want to call the function.  Replace it with
destroy_compound_page() which calls the dtor for them.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Link: http://lkml.kernel.org/r/20200517105051.9352-1-willy@infradead.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 32f3c17715ac00d35dc66d2da93c52c59f39de43..ff73187c3fd4fef901bb407d0c6a6552d0713205 100644 (file)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -876,10 +876,10 @@ static inline void set_compound_page_dtor(struct page *page,
        page[1].compound_dtor = compound_dtor;
 }
 
-static inline compound_page_dtor *get_compound_page_dtor(struct page *page)
+static inline void destroy_compound_page(struct page *page)
 {
        VM_BUG_ON_PAGE(page[1].compound_dtor >= NR_COMPOUND_DTORS, page);
-       return compound_page_dtors[page[1].compound_dtor];
+       compound_page_dtors[page[1].compound_dtor](page);
 }
 
 static inline unsigned int compound_order(struct page *page)

diff --git a/mm/swap.c b/mm/swap.c
index 0ac463d44cff4bc36dce077015db91620e4f337a..6e454a5c5ab995dfae6a7a953d4e3c6f119b6794 100644 (file)
--- a/mm/swap.c
+++ b/mm/swap.c
@@ -102,8 +102,6 @@ static void __put_single_page(struct page *page)
 
 static void __put_compound_page(struct page *page)
 {
-       compound_page_dtor *dtor;
-
        /*
         * __page_cache_release() is supposed to be called for thp, not for
         * hugetlb. This is because hugetlb page does never have PageLRU set
@@ -112,8 +110,7 @@ static void __put_compound_page(struct page *page)
         */
        if (!PageHuge(page))
                __page_cache_release(page);
-       dtor = get_compound_page_dtor(page);
-       (*dtor)(page);
+       destroy_compound_page(page);
 }
 
 void __put_page(struct page *page)

diff --git a/mm/vmscan.c b/mm/vmscan.c
index 18bfbee9a581e4fae8c8836f3e09d55022b037f8..1d1d25306ca231399d02b9266483bd8f0fb396e3 100644 (file)
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -1438,7 +1438,7 @@ free_it:
                 * appear not as the counts should be low
                 */
                if (unlikely(PageTransHuge(page)))
-                       (*get_compound_page_dtor(page))(page);
+                       destroy_compound_page(page);
                else
                        list_add(&page->lru, &free_pages);
                continue;
@@ -1859,7 +1859,7 @@ static unsigned noinline_for_stack move_pages_to_lru(struct lruvec *lruvec,
 
                        if (unlikely(PageCompound(page))) {
                                spin_unlock_irq(&pgdat->lru_lock);
-                               (*get_compound_page_dtor(page))(page);
+                               destroy_compound_page(page);
                                spin_lock_irq(&pgdat->lru_lock);
                        } else
                                list_add(&page->lru, &pages_to_free);