Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932556AbbFHOAF (ORCPT ); Mon, 8 Jun 2015 10:00:05 -0400 Received: from cantor2.suse.de ([195.135.220.15]:52524 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752200AbbFHN5G (ORCPT ); Mon, 8 Jun 2015 09:57:06 -0400 From: Mel Gorman To: Linux-MM Cc: Rik van Riel , Johannes Weiner , Michal Hocko , LKML , Mel Gorman Subject: [PATCH 14/25] mm: Rename NR_ANON_PAGES to NR_ANON_MAPPED Date: Mon, 8 Jun 2015 14:56:20 +0100 Message-Id: <1433771791-30567-15-git-send-email-mgorman@suse.de> X-Mailer: git-send-email 2.3.5 In-Reply-To: <1433771791-30567-1-git-send-email-mgorman@suse.de> References: <1433771791-30567-1-git-send-email-mgorman@suse.de> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3974 Lines: 106 NR_FILE_PAGES is the number of file pages. NR_FILE_MAPPED is the number of mapped file pages. NR_ANON_PAGES is the number of mapped anon pages. This is unhelpful naming as it's easy to confuse NR_FILE_MAPPED and NR_ANON_PAGES for mapped pages. This patch renames NR_ANON_PAGES so we have NR_FILE_PAGES is the number of file pages. NR_FILE_MAPPED is the number of mapped file pages. NR_ANON_MAPPED is the number of mapped anon pages. Signed-off-by: Mel Gorman --- fs/proc/meminfo.c | 2 +- include/linux/mmzone.h | 2 +- mm/migrate.c | 2 +- mm/rmap.c | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c index 8f105c774b2e..2072876cce7c 100644 --- a/fs/proc/meminfo.c +++ b/fs/proc/meminfo.c @@ -173,7 +173,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v) K(i.freeswap), K(global_page_state(NR_FILE_DIRTY)), K(global_page_state(NR_WRITEBACK)), - K(global_node_page_state(NR_ANON_PAGES)), + K(global_node_page_state(NR_ANON_MAPPED)), K(global_node_page_state(NR_FILE_MAPPED)), K(i.sharedram), K(global_page_state(NR_SLAB_RECLAIMABLE) + diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index a523e1a30e54..4406f855d58e 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -157,7 +157,7 @@ enum node_stat_item { WORKINGSET_REFAULT, WORKINGSET_ACTIVATE, WORKINGSET_NODERECLAIM, - NR_ANON_PAGES, /* Mapped anonymous pages */ + NR_ANON_MAPPED, /* Mapped anonymous pages */ NR_FILE_MAPPED, /* pagecache pages mapped into pagetables. only modified from process context */ NR_VM_NODE_STAT_ITEMS diff --git a/mm/migrate.c b/mm/migrate.c index a33e4b4ed60d..4a50bb7c06a6 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -376,7 +376,7 @@ int migrate_page_move_mapping(struct address_space *mapping, * new page and drop references to the old page. * * Note that anonymous pages are accounted for - * via NR_FILE_PAGES and NR_ANON_PAGES if they + * via NR_FILE_PAGES and NR_ANON_MAPPED if they * are mapped to swap space. */ __dec_zone_page_state(page, NR_FILE_PAGES); diff --git a/mm/rmap.c b/mm/rmap.c index f2ce8d11bed6..e6bf7a205913 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1047,7 +1047,7 @@ void do_page_add_anon_rmap(struct page *page, __inc_zone_page_state(page, NR_ANON_TRANSPARENT_HUGEPAGES); __mod_node_page_state(page_zone(page)->zone_pgdat, - NR_ANON_PAGES, hpage_nr_pages(page)); + NR_ANON_MAPPED, hpage_nr_pages(page)); } if (unlikely(PageKsm(page))) return; @@ -1078,7 +1078,7 @@ void page_add_new_anon_rmap(struct page *page, atomic_set(&page->_mapcount, 0); /* increment count (starts at -1) */ if (PageTransHuge(page)) __inc_zone_page_state(page, NR_ANON_TRANSPARENT_HUGEPAGES); - __mod_node_page_state(page_zone(page)->zone_pgdat, NR_ANON_PAGES, + __mod_node_page_state(page_zone(page)->zone_pgdat, NR_ANON_MAPPED, hpage_nr_pages(page)); __page_set_anon_rmap(page, vma, address, 1); } @@ -1146,7 +1146,7 @@ void page_remove_rmap(struct page *page) if (!atomic_add_negative(-1, &page->_mapcount)) return; - /* Hugepages are not counted in NR_ANON_PAGES for now. */ + /* Hugepages are not counted in NR_ANON_MAPPED for now. */ if (unlikely(PageHuge(page))) return; @@ -1158,7 +1158,7 @@ void page_remove_rmap(struct page *page) if (PageTransHuge(page)) __dec_zone_page_state(page, NR_ANON_TRANSPARENT_HUGEPAGES); - __mod_node_page_state(page_zone(page)->zone_pgdat, NR_ANON_PAGES, + __mod_node_page_state(page_zone(page)->zone_pgdat, NR_ANON_MAPPED, -hpage_nr_pages(page)); if (unlikely(PageMlocked(page))) -- 2.3.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/