From: Christoph Lameter Conversion of nr_writeback to per zone counter. This removes the last page_state counter from arch/i386/mm/pgtable.c so we drop the page_state from there. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Andrew Morton --- arch/i386/mm/pgtable.c | 5 ++--- drivers/base/node.c | 5 +---- fs/proc/proc_misc.c | 2 +- include/linux/mmzone.h | 1 + include/linux/page-flags.h | 8 ++++---- mm/page-writeback.c | 2 +- mm/page_alloc.c | 2 +- mm/vmstat.c | 2 +- 8 files changed, 12 insertions(+), 15 deletions(-) diff -puN arch/i386/mm/pgtable.c~zoned-vm-counters-conversion-of-nr_writeback-to-per-zone-counter arch/i386/mm/pgtable.c --- a/arch/i386/mm/pgtable.c~zoned-vm-counters-conversion-of-nr_writeback-to-per-zone-counter +++ a/arch/i386/mm/pgtable.c @@ -30,7 +30,6 @@ void show_mem(void) struct page *page; pg_data_t *pgdat; unsigned long i; - struct page_state ps; unsigned long flags; printk(KERN_INFO "Mem-info:\n"); @@ -58,9 +57,9 @@ void show_mem(void) printk(KERN_INFO "%d pages shared\n", shared); printk(KERN_INFO "%d pages swap cached\n", cached); - get_page_state(&ps); printk(KERN_INFO "%lu pages dirty\n", global_page_state(NR_FILE_DIRTY)); - printk(KERN_INFO "%lu pages writeback\n", ps.nr_writeback); + printk(KERN_INFO "%lu pages writeback\n", + global_page_state(NR_WRITEBACK)); printk(KERN_INFO "%lu pages mapped\n", global_page_state(NR_FILE_MAPPED)); printk(KERN_INFO "%lu pages slab\n", global_page_state(NR_SLAB)); printk(KERN_INFO "%lu pages pagetables\n", diff -puN drivers/base/node.c~zoned-vm-counters-conversion-of-nr_writeback-to-per-zone-counter drivers/base/node.c --- a/drivers/base/node.c~zoned-vm-counters-conversion-of-nr_writeback-to-per-zone-counter +++ a/drivers/base/node.c @@ -49,9 +49,6 @@ static ssize_t node_read_meminfo(struct get_page_state_node(&ps, nid); __get_zone_counts(&active, &inactive, &free, NODE_DATA(nid)); - /* Check for negative values in these approximate counters */ - if ((long)ps.nr_writeback < 0) - ps.nr_writeback = 0; n = sprintf(buf, "\n" "Node %d MemTotal: %8lu kB\n" @@ -80,7 +77,7 @@ static ssize_t node_read_meminfo(struct nid, K(i.totalram - i.totalhigh), nid, K(i.freeram - i.freehigh), nid, K(node_page_state(nid, NR_FILE_DIRTY)), - nid, K(ps.nr_writeback), + nid, K(node_page_state(nid, NR_WRITEBACK)), nid, K(node_page_state(nid, NR_FILE_PAGES)), nid, K(node_page_state(nid, NR_FILE_MAPPED)), nid, K(node_page_state(nid, NR_ANON_PAGES)), diff -puN fs/proc/proc_misc.c~zoned-vm-counters-conversion-of-nr_writeback-to-per-zone-counter fs/proc/proc_misc.c --- a/fs/proc/proc_misc.c~zoned-vm-counters-conversion-of-nr_writeback-to-per-zone-counter +++ a/fs/proc/proc_misc.c @@ -191,7 +191,7 @@ static int meminfo_read_proc(char *page, K(i.totalswap), K(i.freeswap), K(global_page_state(NR_FILE_DIRTY)), - K(ps.nr_writeback), + K(global_page_state(NR_WRITEBACK)), K(global_page_state(NR_ANON_PAGES)), K(global_page_state(NR_FILE_MAPPED)), K(global_page_state(NR_SLAB)), diff -puN include/linux/mmzone.h~zoned-vm-counters-conversion-of-nr_writeback-to-per-zone-counter include/linux/mmzone.h --- a/include/linux/mmzone.h~zoned-vm-counters-conversion-of-nr_writeback-to-per-zone-counter +++ a/include/linux/mmzone.h @@ -54,6 +54,7 @@ enum zone_stat_item { NR_SLAB, /* Pages used by slab allocator */ NR_PAGETABLE, /* used for pagetables */ NR_FILE_DIRTY, + NR_WRITEBACK, NR_VM_ZONE_STAT_ITEMS }; struct per_cpu_pages { diff -puN include/linux/page-flags.h~zoned-vm-counters-conversion-of-nr_writeback-to-per-zone-counter include/linux/page-flags.h --- a/include/linux/page-flags.h~zoned-vm-counters-conversion-of-nr_writeback-to-per-zone-counter +++ a/include/linux/page-flags.h @@ -175,7 +175,7 @@ do { \ if (!test_and_set_bit(PG_writeback, \ &(page)->flags)) \ - inc_page_state(nr_writeback); \ + inc_zone_page_state(page, NR_WRITEBACK); \ } while (0) #define TestSetPageWriteback(page) \ ({ \ @@ -183,14 +183,14 @@ ret = test_and_set_bit(PG_writeback, \ &(page)->flags); \ if (!ret) \ - inc_page_state(nr_writeback); \ + inc_zone_page_state(page, NR_WRITEBACK); \ ret; \ }) #define ClearPageWriteback(page) \ do { \ if (test_and_clear_bit(PG_writeback, \ &(page)->flags)) \ - dec_page_state(nr_writeback); \ + dec_zone_page_state(page, NR_WRITEBACK); \ } while (0) #define TestClearPageWriteback(page) \ ({ \ @@ -198,7 +198,7 @@ ret = test_and_clear_bit(PG_writeback, \ &(page)->flags); \ if (ret) \ - dec_page_state(nr_writeback); \ + dec_zone_page_state(page, NR_WRITEBACK); \ ret; \ }) diff -puN mm/page_alloc.c~zoned-vm-counters-conversion-of-nr_writeback-to-per-zone-counter mm/page_alloc.c --- a/mm/page_alloc.c~zoned-vm-counters-conversion-of-nr_writeback-to-per-zone-counter +++ a/mm/page_alloc.c @@ -1315,7 +1315,7 @@ void show_free_areas(void) active, inactive, global_page_state(NR_FILE_DIRTY), - ps.nr_writeback, + global_page_state(NR_WRITEBACK), ps.nr_unstable, nr_free_pages(), global_page_state(NR_SLAB), diff -puN mm/page-writeback.c~zoned-vm-counters-conversion-of-nr_writeback-to-per-zone-counter mm/page-writeback.c --- a/mm/page-writeback.c~zoned-vm-counters-conversion-of-nr_writeback-to-per-zone-counter +++ a/mm/page-writeback.c @@ -114,7 +114,7 @@ static void get_writeback_state(struct w wbs->nr_unstable = read_page_state(nr_unstable); wbs->nr_mapped = global_page_state(NR_FILE_MAPPED) + global_page_state(NR_ANON_PAGES); - wbs->nr_writeback = read_page_state(nr_writeback); + wbs->nr_writeback = global_page_state(NR_WRITEBACK); } /* diff -puN mm/vmstat.c~zoned-vm-counters-conversion-of-nr_writeback-to-per-zone-counter mm/vmstat.c --- a/mm/vmstat.c~zoned-vm-counters-conversion-of-nr_writeback-to-per-zone-counter +++ a/mm/vmstat.c @@ -463,9 +463,9 @@ static char *vmstat_text[] = { "nr_slab", "nr_page_table_pages", "nr_dirty", + "nr_writeback", /* Page state */ - "nr_writeback", "nr_unstable", "pgpgin", _