mm: rename gfpflags_to_migratetype to gfp_migratetype for same convention

Pageblock migrate type is encoded in GFP flags, just as zone_type and
zonelist.

Currently we use gfp_zone() and gfp_zonelist() to extract related
information, it would be proper to use the same naming convention for
migrate type.

Signed-off-by: Wei Yang <richard.weiyang@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: Pankaj Gupta <pankaj.gupta.linux@gmail.com>
Link: http://lkml.kernel.org/r/20200329080823.7735-1-richard.weiyang@gmail.com
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/include/linux/gfp.h b/include/linux/gfp.h
index fab6d486cbb77aacc732a8b2ae326cfbe3cd12ea..67a0774e080b9828c83c6dbea6e5591aa2273524 100644 (file)
--- a/include/linux/gfp.h
+++ b/include/linux/gfp.h
@@ -312,7 +312,7 @@ struct vm_area_struct;
 #define GFP_MOVABLE_MASK (__GFP_RECLAIMABLE|__GFP_MOVABLE)
 #define GFP_MOVABLE_SHIFT 3
 
-static inline int gfpflags_to_migratetype(const gfp_t gfp_flags)
+static inline int gfp_migratetype(const gfp_t gfp_flags)
 {
        VM_WARN_ON((gfp_flags & GFP_MOVABLE_MASK) == GFP_MOVABLE_MASK);
        BUILD_BUG_ON((1UL << GFP_MOVABLE_SHIFT) != ___GFP_MOVABLE);

diff --git a/mm/compaction.c b/mm/compaction.c
index 883355de4ace5eb87f70fe43b8c5d2d4000d7bd0..5e3e3a972cd286046eced14fb749b7d75fe0b166 100644 (file)
--- a/mm/compaction.c
+++ b/mm/compaction.c
@@ -2100,7 +2100,7 @@ compact_zone(struct compact_control *cc, struct capture_control *capc)
        INIT_LIST_HEAD(&cc->freepages);
        INIT_LIST_HEAD(&cc->migratepages);
 
-       cc->migratetype = gfpflags_to_migratetype(cc->gfp_mask);
+       cc->migratetype = gfp_migratetype(cc->gfp_mask);
        ret = compaction_suitable(cc->zone, cc->order, cc->alloc_flags,
                                                        cc->highest_zoneidx);
        /* Compaction is likely to fail */

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 818c2644a20070a0d712f1928a6114c7a09c11e3..2bd8d6893b3f48e989d23dc3565e56d91978b8ef 100644 (file)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -4285,7 +4285,7 @@ gfp_to_alloc_flags(gfp_t gfp_mask)
                alloc_flags |= ALLOC_HARDER;
 
 #ifdef CONFIG_CMA
-       if (gfpflags_to_migratetype(gfp_mask) == MIGRATE_MOVABLE)
+       if (gfp_migratetype(gfp_mask) == MIGRATE_MOVABLE)
                alloc_flags |= ALLOC_CMA;
 #endif
        return alloc_flags;
@@ -4735,7 +4735,7 @@ static inline bool prepare_alloc_pages(gfp_t gfp_mask, unsigned int order,
        ac->highest_zoneidx = gfp_zone(gfp_mask);
        ac->zonelist = node_zonelist(preferred_nid, gfp_mask);
        ac->nodemask = nodemask;
-       ac->migratetype = gfpflags_to_migratetype(gfp_mask);
+       ac->migratetype = gfp_migratetype(gfp_mask);
 
        if (cpusets_enabled()) {
                *alloc_mask |= __GFP_HARDWALL;

diff --git a/mm/page_owner.c b/mm/page_owner.c
index 18ecde9f45b24c069172045ef2f829fc94a1133f..3604615094235330e0db502f492a0227192549c0 100644 (file)
--- a/mm/page_owner.c
+++ b/mm/page_owner.c
@@ -312,8 +312,7 @@ void pagetypeinfo_showmixedcount_print(struct seq_file *m,
                                continue;
 
                        page_owner = get_page_owner(page_ext);
-                       page_mt = gfpflags_to_migratetype(
-                                       page_owner->gfp_mask);
+                       page_mt = gfp_migratetype(page_owner->gfp_mask);
                        if (pageblock_mt != page_mt) {
                                if (is_migrate_cma(pageblock_mt))
                                        count[MIGRATE_MOVABLE]++;
@@ -359,7 +358,7 @@ print_page_owner(char __user *buf, size_t count, unsigned long pfn,
 
        /* Print information relevant to grouping pages by mobility */
        pageblock_mt = get_pageblock_migratetype(page);
-       page_mt  = gfpflags_to_migratetype(page_owner->gfp_mask);
+       page_mt  = gfp_migratetype(page_owner->gfp_mask);
        ret += snprintf(kbuf + ret, count - ret,
                        "PFN %lu type %s Block %lu type %s Flags %#lx(%pGp)\n",
                        pfn,
@@ -416,7 +415,7 @@ void __dump_page_owner(struct page *page)
 
        page_owner = get_page_owner(page_ext);
        gfp_mask = page_owner->gfp_mask;
-       mt = gfpflags_to_migratetype(gfp_mask);
+       mt = gfp_migratetype(gfp_mask);
 
        if (!test_bit(PAGE_EXT_OWNER, &page_ext->flags)) {
                pr_alert("page_owner info is not present (never set?)\n");