mm, dump_page: rename head_mapcount() --> head_compound_mapcount()

Rename head_pincount() --> head_compound_pincount().  These names are more
accurate (or less misleading) than the original ones.

Signed-off-by: John Hubbard <jhubbard@nvidia.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Qian Cai <cai@lca.pw>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Mike Rapoport <rppt@linux.ibm.com>
Cc: William Kucharski <william.kucharski@oracle.com>
Link: https://lkml.kernel.org/r/20200807183358.105097-1-jhubbard@nvidia.com
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 13dc9b9ccf8e740d9490e2c39bc0c006dd25cdaf..9cc0894e7d61079df2fe7c9b1c71424e9d3d19c9 100644 (file)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -791,7 +791,7 @@ static inline void *kvcalloc(size_t n, size_t size, gfp_t flags)
 extern void kvfree(const void *addr);
 extern void kvfree_sensitive(const void *addr, size_t len);
 
-static inline int head_mapcount(struct page *head)
+static inline int head_compound_mapcount(struct page *head)
 {
        return atomic_read(compound_mapcount_ptr(head)) + 1;
 }
@@ -805,7 +805,7 @@ static inline int compound_mapcount(struct page *page)
 {
        VM_BUG_ON_PAGE(!PageCompound(page), page);
        page = compound_head(page);
-       return head_mapcount(page);
+       return head_compound_mapcount(page);
 }
 
 /*
@@ -918,7 +918,7 @@ static inline bool hpage_pincount_available(struct page *page)
        return PageCompound(page) && compound_order(page) > 1;
 }
 
-static inline int head_pincount(struct page *head)
+static inline int head_compound_pincount(struct page *head)
 {
        return atomic_read(compound_pincount_ptr(head));
 }
@@ -927,7 +927,7 @@ static inline int compound_pincount(struct page *page)
 {
        VM_BUG_ON_PAGE(!hpage_pincount_available(page), page);
        page = compound_head(page);
-       return head_pincount(page);
+       return head_compound_pincount(page);
 }
 
 static inline void set_compound_order(struct page *page, unsigned int order)

diff --git a/mm/debug.c b/mm/debug.c
index 2a767865145cc6aa240c6b04ccc91aa134bb6130..ccca576b28990476dfdc1f73d44042a34d23bf3f 100644 (file)
--- a/mm/debug.c
+++ b/mm/debug.c
@@ -102,12 +102,12 @@ void __dump_page(struct page *page, const char *reason)
                if (hpage_pincount_available(page)) {
                        pr_warn("head:%p order:%u compound_mapcount:%d compound_pincount:%d\n",
                                        head, compound_order(head),
-                                       head_mapcount(head),
-                                       head_pincount(head));
+                                       head_compound_mapcount(head),
+                                       head_compound_pincount(head));
                } else {
                        pr_warn("head:%p order:%u compound_mapcount:%d\n",
                                        head, compound_order(head),
-                                       head_mapcount(head));
+                                       head_compound_mapcount(head));
                }
        }
        if (PageKsm(page))