[PATCH v3 RESEND 2/2] mm/page_alloc: use a single function to free page

[Aaron Lu]

There are multiple places of freeing a page, they all do the same
things so a common function can be used to reduce code duplicate.

It also avoids bug fixed in one function but left in another.

Acked-by: Vlastimil Babka <vba...@suse.cz>
Signed-off-by: Aaron Lu <aaron...@intel.com>
---
 mm/page_alloc.c | 37 ++++++++++++++-----------------------
 1 file changed, 14 insertions(+), 23 deletions(-)

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 8f8c6b33b637..93cc8e686eca 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -4547,16 +4547,19 @@ unsigned long get_zeroed_page(gfp_t gfp_mask)
 }
 EXPORT_SYMBOL(get_zeroed_page);
 
-void __free_pages(struct page *page, unsigned int order)
+static inline void free_the_page(struct page *page, unsigned int order)
 {
-       if (put_page_testzero(page)) {
-               if (order == 0)
-                       free_unref_page(page);
-               else
-                       __free_pages_ok(page, order);
-       }
+       if (order == 0)
+               free_unref_page(page);
+       else
+               __free_pages_ok(page, order);
 }
 
+void __free_pages(struct page *page, unsigned int order)
+{
+       if (put_page_testzero(page))
+               free_the_page(page, order);
+}
 EXPORT_SYMBOL(__free_pages);
 
 void free_pages(unsigned long addr, unsigned int order)
@@ -4605,14 +4608,8 @@ void __page_frag_cache_drain(struct page *page, unsigned 
int count)
 {
        VM_BUG_ON_PAGE(page_ref_count(page) == 0, page);
 
-       if (page_ref_sub_and_test(page, count)) {
-               unsigned int order = compound_order(page);
-
-               if (order == 0)
-                       free_unref_page(page);
-               else
-                       __free_pages_ok(page, order);
-       }
+       if (page_ref_sub_and_test(page, count))
+               free_the_page(page, compound_order(page));
 }
 EXPORT_SYMBOL(__page_frag_cache_drain);
 
@@ -4677,14 +4674,8 @@ void page_frag_free(void *addr)
 {
        struct page *page = virt_to_head_page(addr);
 
-       if (unlikely(put_page_testzero(page))) {
-               unsigned int order = compound_order(page);
-
-               if (order == 0)
-                       free_unref_page(page);
-               else
-                       __free_pages_ok(page, order);
-       }
+       if (unlikely(put_page_testzero(page)))
+               free_the_page(page, compound_order(page));
 }
 EXPORT_SYMBOL(page_frag_free);
 
-- 
2.17.2