diff options
author | Mel Gorman <mgorman@suse.de> | 2013-02-22 19:34:59 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-23 20:50:18 -0500 |
commit | 22b751c3d0376e86a377e3a0aa2ddbbe9d2eefc1 (patch) | |
tree | fe946d7d4350b2454d65f88377d264fbc93958ce /mm/migrate.c | |
parent | e4715f01be697a3730c78f8ffffb595591d6a88c (diff) |
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>
Diffstat (limited to 'mm/migrate.c')
-rw-r--r-- | mm/migrate.c | 4 |
1 files changed, 2 insertions, 2 deletions
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, | |||
1497 | __GFP_NOWARN) & | 1497 | __GFP_NOWARN) & |
1498 | ~GFP_IOFS, 0); | 1498 | ~GFP_IOFS, 0); |
1499 | if (newpage) | 1499 | if (newpage) |
1500 | page_xchg_last_nid(newpage, page_last_nid(page)); | 1500 | page_nid_xchg_last(newpage, page_nid_last(page)); |
1501 | 1501 | ||
1502 | return newpage; | 1502 | return newpage; |
1503 | } | 1503 | } |
@@ -1681,7 +1681,7 @@ int migrate_misplaced_transhuge_page(struct mm_struct *mm, | |||
1681 | if (!new_page) | 1681 | if (!new_page) |
1682 | goto out_fail; | 1682 | goto out_fail; |
1683 | 1683 | ||
1684 | page_xchg_last_nid(new_page, page_last_nid(page)); | 1684 | page_nid_xchg_last(new_page, page_nid_last(page)); |
1685 | 1685 | ||
1686 | isolated = numamigrate_isolate_page(pgdat, page); | 1686 | isolated = numamigrate_isolate_page(pgdat, page); |
1687 | if (!isolated) { | 1687 | if (!isolated) { |