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>

diff --git a/drivers/staging/zcache/zbud.c b/drivers/staging/zcache/zbud.c
index 328c397ea5dcf755f8a8073a032b92198762d9c7..fdff5c6a02396382a7d765461daa257a77f159ed 100644 (file)
--- a/drivers/staging/zcache/zbud.c
+++ b/drivers/staging/zcache/zbud.c
@@ -404,7 +404,7 @@ static inline struct page *zbud_unuse_zbudpage(struct zbudpage *zbudpage,
        else
                zbud_pers_pageframes--;
        zbudpage_spin_unlock(zbudpage);
-       reset_page_mapcount(page);
+       page_mapcount_reset(page);
        init_page_count(page);
        page->index = 0;
        return page;

diff --git a/drivers/staging/zsmalloc/zsmalloc-main.c b/drivers/staging/zsmalloc/zsmalloc-main.c
index 06f73a93a44d2a5481f34c2b26c833c748a1a07d..e78d262c5249887415b4b5a628ee684a47408f87 100644 (file)
--- a/drivers/staging/zsmalloc/zsmalloc-main.c
+++ b/drivers/staging/zsmalloc/zsmalloc-main.c
@@ -472,7 +472,7 @@ static void reset_page(struct page *page)
        set_page_private(page, 0);
        page->mapping = NULL;
        page->freelist = NULL;
-       reset_page_mapcount(page);
+       page_mapcount_reset(page);
 }
 
 static void free_zspage(struct page *first_page)

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 8a5bbe3b9e56e37e6d49214c590974e22ae5d9b4..fe039bdba4edd9d04818a35f8a29fa0784357848 100644 (file)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -367,7 +367,7 @@ static inline struct page *compound_head(struct page *page)
  * both from it and to it can be tracked, using atomic_inc_and_test
  * and atomic_add_negative(-1).
  */
-static inline void reset_page_mapcount(struct page *page)
+static inline void page_mapcount_reset(struct page *page)
 {
        atomic_set(&(page)->_mapcount, -1);
 }
@@ -658,28 +658,28 @@ static inline int page_to_nid(const struct page *page)
 
 #ifdef CONFIG_NUMA_BALANCING
 #ifdef LAST_NID_NOT_IN_PAGE_FLAGS
-static inline int page_xchg_last_nid(struct page *page, int nid)
+static inline int page_nid_xchg_last(struct page *page, int nid)
 {
        return xchg(&page->_last_nid, nid);
 }
 
-static inline int page_last_nid(struct page *page)
+static inline int page_nid_last(struct page *page)
 {
        return page->_last_nid;
 }
-static inline void reset_page_last_nid(struct page *page)
+static inline void page_nid_reset_last(struct page *page)
 {
        page->_last_nid = -1;
 }
 #else
-static inline int page_last_nid(struct page *page)
+static inline int page_nid_last(struct page *page)
 {
        return (page->flags >> LAST_NID_PGSHIFT) & LAST_NID_MASK;
 }
 
-extern int page_xchg_last_nid(struct page *page, int nid);
+extern int page_nid_xchg_last(struct page *page, int nid);
 
-static inline void reset_page_last_nid(struct page *page)
+static inline void page_nid_reset_last(struct page *page)
 {
        int nid = (1 << LAST_NID_SHIFT) - 1;
 
@@ -688,17 +688,17 @@ static inline void reset_page_last_nid(struct page *page)
 }
 #endif /* LAST_NID_NOT_IN_PAGE_FLAGS */
 #else
-static inline int page_xchg_last_nid(struct page *page, int nid)
+static inline int page_nid_xchg_last(struct page *page, int nid)
 {
        return page_to_nid(page);
 }
 
-static inline int page_last_nid(struct page *page)
+static inline int page_nid_last(struct page *page)
 {
        return page_to_nid(page);
 }
 
-static inline void reset_page_last_nid(struct page *page)
+static inline void page_nid_reset_last(struct page *page)
 {
 }
 #endif

diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index c63a21d0e9916ee979a0ba44a9ed946043ae43ad..6049376c7226caa47ee1b983157f07d05c76172a 100644 (file)
--- 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 6f7979c566d97c6314898fe8375f49ccdfd122aa..2ae78e255e080fa02492a2cc06a677174ee339ca 100644 (file)
--- 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 f560071e89c50e6c9caeae7e4f0bec63a0de705c..de5c371a79690e7c496fa6c257d8fbf59df7cc43 100644 (file)
--- 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 bce796e8487f35a4e8f806e3fa942a20abcfb263..2ac0afbd68f356cfaaa3bf47b33703df6b475785 100644 (file)
--- 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 3ede25e6686e0e7f7dbf7816740ba67abdb97710..445718b328b638759e800b2c8154455d85520dab 100644 (file)
--- 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 a99fdf7a0907db8f0f12909435e7da714f917d9a..eeed4a05a2ef2ffa3f7fc1b3ff1ccada895f3e77 100644 (file)
--- 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 ba2ca53f6c3aafdd3165c3ae5115fb719d0c17bd..ebcc44eb43b96dcbc4da948d282364a26099ed3c 100644 (file)
--- 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);