diff for duplicates of <20160713130415.GB9905@cmpxchg.org>
diff --git a/a/1.txt b/N1/1.txt
index 3229242..17bc045 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -40,157 +40,4 @@ it's not your problem that I waited until the last revision went into
mmots to review and comment. But if you agreed to a revert, would you
consider tacking on a revert patch at the end of the series?
-Something like this?
-
->From de22dd5dee337db8590f46919616dd7ef2cfd002 Mon Sep 17 00:00:00 2001
-From: Johannes Weiner <hannes@cmpxchg.org>
-Date: Wed, 13 Jul 2016 08:50:24 -0400
-Subject: [PATCH] mm: revert NR_ANON_MAPPED to NR_ANON_PAGES
-
-This reverts 'mm: rename NR_ANON_PAGES to NR_ANON_MAPPED', which had
-the following rationale:
-
-> 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.
-
-Arguably, the symmetry is either between mapped and unmapped, or anon
-and file, so both namings work. However, this change disconnected the
-internal enum name from the name exported to userspace, which makes it
-painful to trace back an observed statistic to its sources in the VM.
-
-Revert back, such that NR_ANON_PAGES and NR_FILE_PAGES go together,
-and NR_FILE_MAPPED is an elaboration on the latter. To make this even
-clearer, reorder the statistics so that NR_FILE_MAPPED goes with the
-other file page specifics, NR_FILE_DIRTY, NR_FILE_WRITEBACK, NR_SHMEM.
-
-Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
----
- drivers/base/node.c | 2 +-
- fs/proc/meminfo.c | 2 +-
- include/linux/mmzone.h | 4 ++--
- mm/migrate.c | 2 +-
- mm/rmap.c | 8 ++++----
- mm/vmstat.c | 2 +-
- 6 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/drivers/base/node.c b/drivers/base/node.c
-index 89e4f96..50d4004 100644
---- a/drivers/base/node.c
-+++ b/drivers/base/node.c
-@@ -122,7 +122,7 @@ static ssize_t node_read_meminfo(struct device *dev,
- nid, K(node_page_state(pgdat, NR_WRITEBACK)),
- nid, K(node_page_state(pgdat, NR_FILE_PAGES)),
- nid, K(node_page_state(pgdat, NR_FILE_MAPPED)),
-- nid, K(node_page_state(pgdat, NR_ANON_MAPPED)),
-+ nid, K(node_page_state(pgdat, NR_ANON_PAGES)),
- nid, K(i.sharedram),
- nid, sum_zone_node_page_state(nid, NR_KERNEL_STACK) *
- THREAD_SIZE / 1024,
-diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
-index c1fdcc1..f7b4bbd 100644
---- a/fs/proc/meminfo.c
-+++ b/fs/proc/meminfo.c
-@@ -140,7 +140,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
- K(i.freeswap),
- K(global_node_page_state(NR_FILE_DIRTY)),
- K(global_node_page_state(NR_WRITEBACK)),
-- K(global_node_page_state(NR_ANON_MAPPED)),
-+ K(global_node_page_state(NR_ANON_PAGES)),
- 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 a3b7f45..fd16082 100644
---- a/include/linux/mmzone.h
-+++ b/include/linux/mmzone.h
-@@ -144,10 +144,10 @@ enum node_stat_item {
- WORKINGSET_REFAULT,
- WORKINGSET_ACTIVATE,
- WORKINGSET_NODERECLAIM,
-- NR_ANON_MAPPED, /* Mapped anonymous pages */
-+ NR_ANON_PAGES, /* Mapped anonymous pages */
-+ NR_FILE_PAGES,
- NR_FILE_MAPPED, /* pagecache pages mapped into pagetables.
- only modified from process context */
-- NR_FILE_PAGES,
- NR_FILE_DIRTY,
- NR_WRITEBACK,
- NR_WRITEBACK_TEMP, /* Writeback using temporary buffers */
-diff --git a/mm/migrate.c b/mm/migrate.c
-index ed2f85e..525679a 100644
---- a/mm/migrate.c
-+++ b/mm/migrate.c
-@@ -501,7 +501,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_MAPPED if they
-+ * via NR_FILE_PAGES and NR_ANON_PAGES if they
- * are mapped to swap space.
- */
- if (newzone != oldzone) {
-diff --git a/mm/rmap.c b/mm/rmap.c
-index 414688c..203ba16 100644
---- a/mm/rmap.c
-+++ b/mm/rmap.c
-@@ -1217,7 +1217,7 @@ void do_page_add_anon_rmap(struct page *page,
- */
- if (compound)
- __inc_node_page_state(page, NR_ANON_THPS);
-- __mod_node_page_state(page_pgdat(page), NR_ANON_MAPPED, nr);
-+ __mod_node_page_state(page_pgdat(page), NR_ANON_PAGES, nr);
- }
- if (unlikely(PageKsm(page)))
- return;
-@@ -1261,7 +1261,7 @@ void page_add_new_anon_rmap(struct page *page,
- /* increment count (starts at -1) */
- atomic_set(&page->_mapcount, 0);
- }
-- __mod_node_page_state(page_pgdat(page), NR_ANON_MAPPED, nr);
-+ __mod_node_page_state(page_pgdat(page), NR_ANON_PAGES, nr);
- __page_set_anon_rmap(page, vma, address, 1);
- }
-
-@@ -1378,7 +1378,7 @@ static void page_remove_anon_compound_rmap(struct page *page)
- clear_page_mlock(page);
-
- if (nr) {
-- __mod_node_page_state(page_pgdat(page), NR_ANON_MAPPED, -nr);
-+ __mod_node_page_state(page_pgdat(page), NR_ANON_PAGES, -nr);
- deferred_split_huge_page(page);
- }
- }
-@@ -1407,7 +1407,7 @@ void page_remove_rmap(struct page *page, bool compound)
- * these counters are not modified in interrupt context, and
- * pte lock(a spinlock) is held, which implies preemption disabled.
- */
-- __dec_node_page_state(page, NR_ANON_MAPPED);
-+ __dec_node_page_state(page, NR_ANON_PAGES);
-
- if (unlikely(PageMlocked(page)))
- clear_page_mlock(page);
-diff --git a/mm/vmstat.c b/mm/vmstat.c
-index 7415775..1d5de5d 100644
---- a/mm/vmstat.c
-+++ b/mm/vmstat.c
-@@ -953,8 +953,8 @@ const char * const vmstat_text[] = {
- "workingset_activate",
- "workingset_nodereclaim",
- "nr_anon_pages",
-- "nr_mapped",
- "nr_file_pages",
-+ "nr_mapped",
- "nr_dirty",
- "nr_writeback",
- "nr_writeback_temp",
---
-2.8.2
\ No newline at end of file
+Something like this?
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index 4e0c721..97c60b9 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -80,160 +80,7 @@
"mmots to review and comment. But if you agreed to a revert, would you\n",
"consider tacking on a revert patch at the end of the series?\n",
"\n",
- "Something like this?\n",
- "\n",
- ">From de22dd5dee337db8590f46919616dd7ef2cfd002 Mon Sep 17 00:00:00 2001\n",
- "From: Johannes Weiner <hannes\@cmpxchg.org>\n",
- "Date: Wed, 13 Jul 2016 08:50:24 -0400\n",
- "Subject: [PATCH] mm: revert NR_ANON_MAPPED to NR_ANON_PAGES\n",
- "\n",
- "This reverts 'mm: rename NR_ANON_PAGES to NR_ANON_MAPPED', which had\n",
- "the following rationale:\n",
- "\n",
- "> NR_FILE_PAGES is the number of file pages.\n",
- "> NR_FILE_MAPPED is the number of mapped file pages.\n",
- "> NR_ANON_PAGES is the number of mapped anon pages.\n",
- ">\n",
- "> This is unhelpful naming as it's easy to confuse NR_FILE_MAPPED and\n",
- "> NR_ANON_PAGES for mapped pages. This patch renames NR_ANON_PAGES so we\n",
- "> have\n",
- ">\n",
- "> NR_FILE_PAGES is the number of file pages.\n",
- "> NR_FILE_MAPPED is the number of mapped file pages.\n",
- "> NR_ANON_MAPPED is the number of mapped anon pages.\n",
- "\n",
- "Arguably, the symmetry is either between mapped and unmapped, or anon\n",
- "and file, so both namings work. However, this change disconnected the\n",
- "internal enum name from the name exported to userspace, which makes it\n",
- "painful to trace back an observed statistic to its sources in the VM.\n",
- "\n",
- "Revert back, such that NR_ANON_PAGES and NR_FILE_PAGES go together,\n",
- "and NR_FILE_MAPPED is an elaboration on the latter. To make this even\n",
- "clearer, reorder the statistics so that NR_FILE_MAPPED goes with the\n",
- "other file page specifics, NR_FILE_DIRTY, NR_FILE_WRITEBACK, NR_SHMEM.\n",
- "\n",
- "Signed-off-by: Johannes Weiner <hannes\@cmpxchg.org>\n",
- "---\n",
- " drivers/base/node.c | 2 +-\n",
- " fs/proc/meminfo.c | 2 +-\n",
- " include/linux/mmzone.h | 4 ++--\n",
- " mm/migrate.c | 2 +-\n",
- " mm/rmap.c | 8 ++++----\n",
- " mm/vmstat.c | 2 +-\n",
- " 6 files changed, 10 insertions(+), 10 deletions(-)\n",
- "\n",
- "diff --git a/drivers/base/node.c b/drivers/base/node.c\n",
- "index 89e4f96..50d4004 100644\n",
- "--- a/drivers/base/node.c\n",
- "+++ b/drivers/base/node.c\n",
- "\@\@ -122,7 +122,7 \@\@ static ssize_t node_read_meminfo(struct device *dev,\n",
- " \t\t nid, K(node_page_state(pgdat, NR_WRITEBACK)),\n",
- " \t\t nid, K(node_page_state(pgdat, NR_FILE_PAGES)),\n",
- " \t\t nid, K(node_page_state(pgdat, NR_FILE_MAPPED)),\n",
- "-\t\t nid, K(node_page_state(pgdat, NR_ANON_MAPPED)),\n",
- "+\t\t nid, K(node_page_state(pgdat, NR_ANON_PAGES)),\n",
- " \t\t nid, K(i.sharedram),\n",
- " \t\t nid, sum_zone_node_page_state(nid, NR_KERNEL_STACK) *\n",
- " \t\t\t\tTHREAD_SIZE / 1024,\n",
- "diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c\n",
- "index c1fdcc1..f7b4bbd 100644\n",
- "--- a/fs/proc/meminfo.c\n",
- "+++ b/fs/proc/meminfo.c\n",
- "\@\@ -140,7 +140,7 \@\@ static int meminfo_proc_show(struct seq_file *m, void *v)\n",
- " \t\tK(i.freeswap),\n",
- " \t\tK(global_node_page_state(NR_FILE_DIRTY)),\n",
- " \t\tK(global_node_page_state(NR_WRITEBACK)),\n",
- "-\t\tK(global_node_page_state(NR_ANON_MAPPED)),\n",
- "+\t\tK(global_node_page_state(NR_ANON_PAGES)),\n",
- " \t\tK(global_node_page_state(NR_FILE_MAPPED)),\n",
- " \t\tK(i.sharedram),\n",
- " \t\tK(global_page_state(NR_SLAB_RECLAIMABLE) +\n",
- "diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h\n",
- "index a3b7f45..fd16082 100644\n",
- "--- a/include/linux/mmzone.h\n",
- "+++ b/include/linux/mmzone.h\n",
- "\@\@ -144,10 +144,10 \@\@ enum node_stat_item {\n",
- " \tWORKINGSET_REFAULT,\n",
- " \tWORKINGSET_ACTIVATE,\n",
- " \tWORKINGSET_NODERECLAIM,\n",
- "-\tNR_ANON_MAPPED,\t/* Mapped anonymous pages */\n",
- "+\tNR_ANON_PAGES,\t/* Mapped anonymous pages */\n",
- "+\tNR_FILE_PAGES,\n",
- " \tNR_FILE_MAPPED,\t/* pagecache pages mapped into pagetables.\n",
- " \t\t\t only modified from process context */\n",
- "-\tNR_FILE_PAGES,\n",
- " \tNR_FILE_DIRTY,\n",
- " \tNR_WRITEBACK,\n",
- " \tNR_WRITEBACK_TEMP,\t/* Writeback using temporary buffers */\n",
- "diff --git a/mm/migrate.c b/mm/migrate.c\n",
- "index ed2f85e..525679a 100644\n",
- "--- a/mm/migrate.c\n",
- "+++ b/mm/migrate.c\n",
- "\@\@ -501,7 +501,7 \@\@ int migrate_page_move_mapping(struct address_space *mapping,\n",
- " \t * new page and drop references to the old page.\n",
- " \t *\n",
- " \t * Note that anonymous pages are accounted for\n",
- "-\t * via NR_FILE_PAGES and NR_ANON_MAPPED if they\n",
- "+\t * via NR_FILE_PAGES and NR_ANON_PAGES if they\n",
- " \t * are mapped to swap space.\n",
- " \t */\n",
- " \tif (newzone != oldzone) {\n",
- "diff --git a/mm/rmap.c b/mm/rmap.c\n",
- "index 414688c..203ba16 100644\n",
- "--- a/mm/rmap.c\n",
- "+++ b/mm/rmap.c\n",
- "\@\@ -1217,7 +1217,7 \@\@ void do_page_add_anon_rmap(struct page *page,\n",
- " \t\t */\n",
- " \t\tif (compound)\n",
- " \t\t\t__inc_node_page_state(page, NR_ANON_THPS);\n",
- "-\t\t__mod_node_page_state(page_pgdat(page), NR_ANON_MAPPED, nr);\n",
- "+\t\t__mod_node_page_state(page_pgdat(page), NR_ANON_PAGES, nr);\n",
- " \t}\n",
- " \tif (unlikely(PageKsm(page)))\n",
- " \t\treturn;\n",
- "\@\@ -1261,7 +1261,7 \@\@ void page_add_new_anon_rmap(struct page *page,\n",
- " \t\t/* increment count (starts at -1) */\n",
- " \t\tatomic_set(&page->_mapcount, 0);\n",
- " \t}\n",
- "-\t__mod_node_page_state(page_pgdat(page), NR_ANON_MAPPED, nr);\n",
- "+\t__mod_node_page_state(page_pgdat(page), NR_ANON_PAGES, nr);\n",
- " \t__page_set_anon_rmap(page, vma, address, 1);\n",
- " }\n",
- " \n",
- "\@\@ -1378,7 +1378,7 \@\@ static void page_remove_anon_compound_rmap(struct page *page)\n",
- " \t\tclear_page_mlock(page);\n",
- " \n",
- " \tif (nr) {\n",
- "-\t\t__mod_node_page_state(page_pgdat(page), NR_ANON_MAPPED, -nr);\n",
- "+\t\t__mod_node_page_state(page_pgdat(page), NR_ANON_PAGES, -nr);\n",
- " \t\tdeferred_split_huge_page(page);\n",
- " \t}\n",
- " }\n",
- "\@\@ -1407,7 +1407,7 \@\@ void page_remove_rmap(struct page *page, bool compound)\n",
- " \t * these counters are not modified in interrupt context, and\n",
- " \t * pte lock(a spinlock) is held, which implies preemption disabled.\n",
- " \t */\n",
- "-\t__dec_node_page_state(page, NR_ANON_MAPPED);\n",
- "+\t__dec_node_page_state(page, NR_ANON_PAGES);\n",
- " \n",
- " \tif (unlikely(PageMlocked(page)))\n",
- " \t\tclear_page_mlock(page);\n",
- "diff --git a/mm/vmstat.c b/mm/vmstat.c\n",
- "index 7415775..1d5de5d 100644\n",
- "--- a/mm/vmstat.c\n",
- "+++ b/mm/vmstat.c\n",
- "\@\@ -953,8 +953,8 \@\@ const char * const vmstat_text[] = {\n",
- " \t\"workingset_activate\",\n",
- " \t\"workingset_nodereclaim\",\n",
- " \t\"nr_anon_pages\",\n",
- "-\t\"nr_mapped\",\n",
- " \t\"nr_file_pages\",\n",
- "+\t\"nr_mapped\",\n",
- " \t\"nr_dirty\",\n",
- " \t\"nr_writeback\",\n",
- " \t\"nr_writeback_temp\",\n",
- "-- \n",
- "2.8.2"
+ "Something like this?"
]
-7e1871817e78b1cb940a6a46b6e3af356c68f8a7f624e7312afe3d19943ce20f
+1417e6934ca199a5030a4f6be2c65965220a8643b55e6d76170b16900c36673d
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.