GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-28 01:21:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mm: rename page struct field helpers

Browse source 
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>
This commit is contained in:
Mel Gorman 2013-02-22 16:34:59 -08:00 • committed by Linus Torvalds
parent e4715f01be
commit 22b751c3d0
10 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/staging/zcache/zbud.c
View file

@ -404,7 +404,7 @@ static inline struct page *zbud_unuse_zbudpage(struct zbudpage *zbudpage,
else else
zbud_pers_pageframes--; zbud_pers_pageframes--;
zbudpage_spin_unlock(zbudpage); zbudpage_spin_unlock(zbudpage);
reset_page_mapcount(page); page_mapcount_reset(page);
init_page_count(page); init_page_count(page);
page->index = 0; page->index = 0;
return page; return page;

2
drivers/staging/zsmalloc/zsmalloc-main.c
View file

@ -472,7 +472,7 @@ static void reset_page(struct page *page)
set_page_private(page, 0); set_page_private(page, 0);
page->mapping = NULL; page->mapping = NULL;
page->freelist = NULL; page->freelist = NULL;
reset_page_mapcount(page); page_mapcount_reset(page);
} }
static void free_zspage(struct page *first_page) static void free_zspage(struct page *first_page)

20
include/linux/mm.h
View file

@ -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 * both from it and to it can be tracked, using atomic_inc_and_test
* and atomic_add_negative(-1). * 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); atomic_set(&(page)->_mapcount, -1);
} }
@ -658,28 +658,28 @@ static inline int page_to_nid(const struct page *page)
#ifdef CONFIG_NUMA_BALANCING #ifdef CONFIG_NUMA_BALANCING
#ifdef LAST_NID_NOT_IN_PAGE_FLAGS #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); 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; 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; page->_last_nid = -1;
} }
#else #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; 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; 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 */ #endif /* LAST_NID_NOT_IN_PAGE_FLAGS */
#else #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); 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); 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 #endif

2
mm/huge_memory.c
View file

@ -1639,7 +1639,7 @@ static void __split_huge_page_refcount(struct page *page)
page_tail->mapping = page->mapping; page_tail->mapping = page->mapping;
page_tail->index = page->index + i; 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(!PageAnon(page_tail));
BUG_ON(!PageUptodate(page_tail)); BUG_ON(!PageUptodate(page_tail));

2
mm/mempolicy.c
View file

@ -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 * it less likely we act on an unlikely task<->page
* relation. * relation.
*/ */
last_nid = page_xchg_last_nid(page, polnid); last_nid = page_nid_xchg_last(page, polnid);
if (last_nid != polnid) if (last_nid != polnid)
goto out; goto out;
} }

4
mm/migrate.c
View file

@ -1497,7 +1497,7 @@ static struct page *alloc_misplaced_dst_page(struct page *page,
__GFP_NOWARN) & __GFP_NOWARN) &
~GFP_IOFS, 0); ~GFP_IOFS, 0);
if (newpage) if (newpage)
page_xchg_last_nid(newpage, page_last_nid(page)); page_nid_xchg_last(newpage, page_nid_last(page));
return newpage; return newpage;
} }
@ -1681,7 +1681,7 @@ int migrate_misplaced_transhuge_page(struct mm_struct *mm,
if (!new_page) if (!new_page)
goto out_fail; 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); isolated = numamigrate_isolate_page(pgdat, page);
if (!isolated) { if (!isolated) {

4
mm/mmzone.c
View file

@ -98,14 +98,14 @@ void lruvec_init(struct lruvec *lruvec)
} }
#if defined(CONFIG_NUMA_BALANCING) && !defined(LAST_NID_NOT_IN_PAGE_FLAGS) #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; unsigned long old_flags, flags;
int last_nid; int last_nid;
do { do {
old_flags = flags = page->flags; 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 &= ~(LAST_NID_MASK << LAST_NID_PGSHIFT);
flags |= (nid & LAST_NID_MASK) << LAST_NID_PGSHIFT; flags |= (nid & LAST_NID_MASK) << LAST_NID_PGSHIFT;

10
mm/page_alloc.c
View file

@ -295,7 +295,7 @@ static void bad_page(struct page *page)
/* Don't complain about poisoned pages */ /* Don't complain about poisoned pages */
if (PageHWPoison(page)) { if (PageHWPoison(page)) {
reset_page_mapcount(page); /* remove PageBuddy */ page_mapcount_reset(page); /* remove PageBuddy */
return; return;
} }
@ -327,7 +327,7 @@ static void bad_page(struct page *page)
dump_stack(); dump_stack();
out: out:
/* Leave bad fields for debug, except PageBuddy could make trouble */ /* 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); add_taint(TAINT_BAD_PAGE);
} }
@ -613,7 +613,7 @@ static inline int free_pages_check(struct page *page)
bad_page(page); bad_page(page);
return 1; return 1;
} }
reset_page_last_nid(page); page_nid_reset_last(page);
if (page->flags & PAGE_FLAGS_CHECK_AT_PREP) if (page->flags & PAGE_FLAGS_CHECK_AT_PREP)
page->flags &= ~PAGE_FLAGS_CHECK_AT_PREP; page->flags &= ~PAGE_FLAGS_CHECK_AT_PREP;
return 0; 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); set_page_links(page, zone, nid, pfn);
mminit_verify_page_links(page, zone, nid, pfn); mminit_verify_page_links(page, zone, nid, pfn);
init_page_count(page); init_page_count(page);
reset_page_mapcount(page); page_mapcount_reset(page);
reset_page_last_nid(page); page_nid_reset_last(page);
SetPageReserved(page); SetPageReserved(page);
/* /*
* Mark the block movable so that blocks are reserved for * Mark the block movable so that blocks are reserved for

2
mm/slob.c
View file

@ -360,7 +360,7 @@ static void slob_free(void *block, int size)
clear_slob_page_free(sp); clear_slob_page_free(sp);
spin_unlock_irqrestore(&slob_lock, flags); spin_unlock_irqrestore(&slob_lock, flags);
__ClearPageSlab(sp); __ClearPageSlab(sp);
reset_page_mapcount(sp); page_mapcount_reset(sp);
slob_free_pages(b, 0); slob_free_pages(b, 0);
return; return;
} }

2
mm/slub.c
View file

@ -1408,7 +1408,7 @@ static void __free_slab(struct kmem_cache *s, struct page *page)
__ClearPageSlab(page); __ClearPageSlab(page);
memcg_release_pages(s, order); memcg_release_pages(s, order);
reset_page_mapcount(page); page_mapcount_reset(page);
if (current->reclaim_state) if (current->reclaim_state)
current->reclaim_state->reclaimed_slab += pages; current->reclaim_state->reclaimed_slab += pages;
__free_memcg_kmem_pages(page, order); __free_memcg_kmem_pages(page, order);