Re: [PATCH] mm: Rename page struct field helpers

[Hugh Dickins]

On Wed, 30 Jan 2013, Mel Gorman wrote:
> mm: Rename page_xchg_last_nid
> 
> Andrew found the functions names page_xchg_last_nid(), page_last_nid()
> and reset_page_last_nid() to be inconsistent and were renamed
> to page_nid_xchg_last(), page_nid_last() and page_nid_reset_last().
> Hugh found this unhelpful and suggested a rename of page_xchg_last_nid to
> keep with a verb_struct_field naming pattern.
> 
> This patch replaces mm-rename-page-struct-field-helpers.patch.
> 
> Suggested-by: Hugh Dickins <hughd@xxxxxxxxxx>
> Signed-off-by: Mel Gorman <mgorman@xxxxxxx>

FWIW looks just right to me (I don't think I deserve a Suggested-by
and an Acked-by), thanks.  But we may get a Rejected-by from Andrew.

> ---
>  include/linux/mm.h |    6 +++---
>  mm/huge_memory.c   |    2 +-
>  mm/mempolicy.c     |    2 +-
>  mm/migrate.c       |    4 ++--
>  mm/mmzone.c        |    2 +-
>  5 files changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/include/linux/mm.h b/include/linux/mm.h
> index 6e4468f..6356db0 100644
> --- a/include/linux/mm.h
> +++ b/include/linux/mm.h
> @@ -657,7 +657,7 @@ 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 xchg_page_last_nid(struct page *page, int nid)
>  {
>  	return xchg(&page->_last_nid, nid);
>  }
> @@ -676,7 +676,7 @@ static inline int page_last_nid(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 xchg_page_last_nid(struct page *page, int nid);
>  
>  static inline void reset_page_last_nid(struct page *page)
>  {
> @@ -687,7 +687,7 @@ 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 xchg_page_last_nid(struct page *page, int nid)
>  {
>  	return page_to_nid(page);
>  }
> diff --git a/mm/huge_memory.c b/mm/huge_memory.c
> index 648c102..ed97040 100644
> --- a/mm/huge_memory.c
> +++ b/mm/huge_memory.c
> @@ -1642,7 +1642,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));
> +		xchg_page_last_nid(page_tail, page_last_nid(page));
>  
>  		BUG_ON(!PageAnon(page_tail));
>  		BUG_ON(!PageUptodate(page_tail));
> diff --git a/mm/mempolicy.c b/mm/mempolicy.c
> index e2df1c1..61226db 100644
> --- a/mm/mempolicy.c
> +++ b/mm/mempolicy.c
> @@ -2308,7 +2308,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 = xchg_page_last_nid(page, polnid);
>  		if (last_nid != polnid)
>  			goto out;
>  	}
> diff --git a/mm/migrate.c b/mm/migrate.c
> index 8ef1cbf..4d9b724 100644
> --- a/mm/migrate.c
> +++ b/mm/migrate.c
> @@ -1495,7 +1495,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));
> +		xchg_page_last_nid(newpage, page_last_nid(page));
>  
>  	return newpage;
>  }
> @@ -1679,7 +1679,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));
> +	xchg_page_last_nid(new_page, page_last_nid(page));
>  
>  	isolated = numamigrate_isolate_page(pgdat, page);
>  	if (!isolated) {
> diff --git a/mm/mmzone.c b/mm/mmzone.c
> index bce796e..de2a951 100644
> --- a/mm/mmzone.c
> +++ b/mm/mmzone.c
> @@ -98,7 +98,7 @@ 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 xchg_page_last_nid(struct page *page, int nid)
>  {
>  	unsigned long old_flags, flags;
>  	int last_nid;
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/