mm/page_alloc: Move set_page_refcounted() to callers of __alloc_pages_cpuset_fallback()

In preparation for allocating frozen pages, stop initialising the page
refcount in __alloc_pages_cpuset_fallback().

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index d84b8ce6edc578227a34874f8963368f79aa238b..ef71500f28bebdd20e318ed780bd9f74ac823663 100644 (file)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -4376,8 +4376,6 @@ __alloc_pages_cpuset_fallback(gfp_t gfp_mask, unsigned int order,
                page = get_page_from_freelist(gfp_mask, order,
                                alloc_flags, ac);
 
-       if (page)
-               set_page_refcounted(page);
        return page;
 }
 
@@ -4464,6 +4462,8 @@ __alloc_pages_may_oom(gfp_t gfp_mask, unsigned int order,
                if (gfp_mask & __GFP_NOFAIL)
                        page = __alloc_pages_cpuset_fallback(gfp_mask, order,
                                        ALLOC_NO_WATERMARKS, ac);
+               if (page)
+                       set_page_refcounted(page);
        }
 out:
        mutex_unlock(&oom_lock);
@@ -5294,8 +5294,10 @@ nopage:
                 * the situation worse
                 */
                page = __alloc_pages_cpuset_fallback(gfp_mask, order, ALLOC_HARDER, ac);
-               if (page)
+               if (page) {
+                       set_page_refcounted(page);
                        goto got_pg;
+               }
 
                cond_resched();
                goto retry;