mm: rename page struct field helpers

The function names page_xchg_last_nid(), page_last_nid() and
reset_page_last_nid() were judged to be inconsistent so rename them to a
struct_field_op style pattern.  As it looked jarring to have
reset_page_mapcount() and page_nid_reset_last() beside each other in
memmap_init_zone(), this patch also renames reset_page_mapcount() to
page_mapcount_reset().  There are others like init_page_count() but as
it is used throughout the arch code a rename would likely cause more
conflicts than it is worth.

[akpm@linux-foundation.org: fix zcache]
Signed-off-by: Mel Gorman <mgorman@suse.de>
Suggested-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

7 files changed, 13 insertions, 13 deletions

diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index c63a21d0e991..6049376c7226 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -1639,7 +1639,7 @@ static void __split_huge_page_refcount(struct page *page)
                 page_tail->mapping = page->mapping;
 
                 page_tail->index = page->index + i;
-                page_xchg_last_nid(page_tail, page_last_nid(page));
+                page_nid_xchg_last(page_tail, page_nid_last(page));
 
                 BUG_ON(!PageAnon(page_tail));
                 BUG_ON(!PageUptodate(page_tail));
diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index 6f7979c566d9..2ae78e255e08 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -2316,7 +2316,7 @@ int mpol_misplaced(struct page *page, struct vm_area_struct *vma, unsigned long
                  * it less likely we act on an unlikely task<->page
                  * relation.
                  */
-                last_nid = page_xchg_last_nid(page, polnid);
+                last_nid = page_nid_xchg_last(page, polnid);
                 if (last_nid != polnid)
                         goto out;
         }
diff --git a/mm/migrate.c b/mm/migrate.c
index f560071e89c5..de5c371a7969 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -1497,7 +1497,7 @@ static struct page *alloc_misplaced_dst_page(struct page *page,
                                           __GFP_NOWARN) &
                                          ~GFP_IOFS, 0);
         if (newpage)
-                page_xchg_last_nid(newpage, page_last_nid(page));
+                page_nid_xchg_last(newpage, page_nid_last(page));
 
         return newpage;
 }
@@ -1681,7 +1681,7 @@ int migrate_misplaced_transhuge_page(struct mm_struct *mm,
         if (!new_page)
                 goto out_fail;
 
-        page_xchg_last_nid(new_page, page_last_nid(page));
+        page_nid_xchg_last(new_page, page_nid_last(page));
 
         isolated = numamigrate_isolate_page(pgdat, page);
         if (!isolated) {
diff --git a/mm/mmzone.c b/mm/mmzone.c
index bce796e8487f..2ac0afbd68f3 100644
--- a/mm/mmzone.c
+++ b/mm/mmzone.c
@@ -98,14 +98,14 @@ void lruvec_init(struct lruvec *lruvec)
 }
 
 #if defined(CONFIG_NUMA_BALANCING) && !defined(LAST_NID_NOT_IN_PAGE_FLAGS)
-int page_xchg_last_nid(struct page *page, int nid)
+int page_nid_xchg_last(struct page *page, int nid)
 {
         unsigned long old_flags, flags;
         int last_nid;
 
         do {
                 old_flags = flags = page->flags;
-                last_nid = page_last_nid(page);
+                last_nid = page_nid_last(page);
 
                 flags &= ~(LAST_NID_MASK << LAST_NID_PGSHIFT);
                 flags |= (nid & LAST_NID_MASK) << LAST_NID_PGSHIFT;
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 3ede25e6686e..445718b328b6 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -295,7 +295,7 @@ static void bad_page(struct page *page)
 
         /* Don't complain about poisoned pages */
         if (PageHWPoison(page)) {
-                reset_page_mapcount(page); /* remove PageBuddy */
+                page_mapcount_reset(page); /* remove PageBuddy */
                 return;
         }
 
@@ -327,7 +327,7 @@ static void bad_page(struct page *page)
         dump_stack();
 out:
         /* Leave bad fields for debug, except PageBuddy could make trouble */
-        reset_page_mapcount(page); /* remove PageBuddy */
+        page_mapcount_reset(page); /* remove PageBuddy */
         add_taint(TAINT_BAD_PAGE);
 }
 
@@ -613,7 +613,7 @@ static inline int free_pages_check(struct page *page)
                 bad_page(page);
                 return 1;
         }
-        reset_page_last_nid(page);
+        page_nid_reset_last(page);
         if (page->flags & PAGE_FLAGS_CHECK_AT_PREP)
                 page->flags &= ~PAGE_FLAGS_CHECK_AT_PREP;
         return 0;
@@ -3894,8 +3894,8 @@ void __meminit memmap_init_zone(unsigned long size, int nid, unsigned long zone,
                 set_page_links(page, zone, nid, pfn);
                 mminit_verify_page_links(page, zone, nid, pfn);
                 init_page_count(page);
-                reset_page_mapcount(page);
-                reset_page_last_nid(page);
+                page_mapcount_reset(page);
+                page_nid_reset_last(page);
                 SetPageReserved(page);
                 /*
                  * Mark the block movable so that blocks are reserved for
diff --git a/mm/slob.c b/mm/slob.c
index a99fdf7a0907..eeed4a05a2ef 100644
--- a/mm/slob.c
+++ b/mm/slob.c
@@ -360,7 +360,7 @@ static void slob_free(void *block, int size)
                         clear_slob_page_free(sp);
                 spin_unlock_irqrestore(&slob_lock, flags);
                 __ClearPageSlab(sp);
-                reset_page_mapcount(sp);
+                page_mapcount_reset(sp);
                 slob_free_pages(b, 0);
                 return;
         }
diff --git a/mm/slub.c b/mm/slub.c
index ba2ca53f6c3a..ebcc44eb43b9 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -1408,7 +1408,7 @@ static void __free_slab(struct kmem_cache *s, struct page *page)
         __ClearPageSlab(page);
 
         memcg_release_pages(s, order);
-        reset_page_mapcount(page);
+        page_mapcount_reset(page);
         if (current->reclaim_state)
                 current->reclaim_state->reclaimed_slab += pages;
         __free_memcg_kmem_pages(page, order);