From: Hugh Dickins <hughd@google.com>
To: Mel Gorman <mgorman@suse.de>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Andrea Arcangeli <aarcange@redhat.com>,
Ingo Molnar <mingo@kernel.org>,
Simon Jeons <simon.jeons@gmail.com>,
Wanpeng Li <liwanp@linux.vnet.ibm.com>,
Linux-MM <linux-mm@kvack.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] mm: Rename page struct field helpers
Date: Wed, 30 Jan 2013 12:32:14 -0800 (PST) [thread overview]
Message-ID: <alpine.LNX.2.00.1301301226570.22527@eggly.anvils> (raw)
In-Reply-To: <20130130115833.GB2964@suse.de>
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@google.com>
> Signed-off-by: Mel Gorman <mgorman@suse.de>
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, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2013-01-30 20:32 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-22 17:12 [PATCH 0/6] Follow up work on NUMA Balancing Mel Gorman
2013-01-22 17:12 ` [PATCH 1/6] mm: numa: Fix minor typo in numa_next_scan Mel Gorman
2013-01-22 17:12 ` [PATCH 2/6] mm: numa: Take THP into account when migrating pages for NUMA balancing Mel Gorman
2013-01-22 17:12 ` [PATCH 3/6] mm: numa: Handle side-effects in count_vm_numa_events() for !CONFIG_NUMA_BALANCING Mel Gorman
2013-01-22 22:40 ` Andrew Morton
2013-01-23 9:27 ` Mel Gorman
2013-01-22 17:12 ` [PATCH 4/6] mm: Move page flags layout to separate header Mel Gorman
2013-01-22 17:12 ` [PATCH 5/6] mm: Fold page->_last_nid into page->flags where possible Mel Gorman
2013-01-22 22:46 ` Andrew Morton
2013-01-23 13:17 ` Mel Gorman
2013-01-23 21:45 ` KOSAKI Motohiro
2013-01-23 13:18 ` [PATCH] mm: init: Report on last-nid information stored in page->flags Mel Gorman
2013-01-23 14:25 ` [PATCH 5/6] mm: Fold page->_last_nid into page->flags where possible Mel Gorman
2013-01-23 21:56 ` Andrew Morton
2013-01-24 10:55 ` [PATCH] mm: Rename page struct field helpers Mel Gorman
2013-01-29 4:39 ` Hugh Dickins
2013-01-30 11:58 ` Mel Gorman
2013-01-30 20:32 ` Hugh Dickins [this message]
2013-01-23 15:23 ` [PATCH] mm: uninline page_xchg_last_nid() Mel Gorman
2013-01-22 17:12 ` [PATCH 6/6] mm: numa: Cleanup flow of transhuge page migration Mel Gorman
2013-01-27 21:20 ` Hugh Dickins
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.LNX.2.00.1301301226570.22527@eggly.anvils \
--to=hughd@google.com \
--cc=a.p.zijlstra@chello.nl \
--cc=aarcange@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=liwanp@linux.vnet.ibm.com \
--cc=mgorman@suse.de \
--cc=mingo@kernel.org \
--cc=simon.jeons@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox