From 90f7f67028a1247dd1fbc4429f70a9a3ca07b29f Mon Sep 17 00:00:00 2001 From: Michael Rubin Date: Tue, 26 Oct 2010 14:21:35 -0700 Subject: [PATCH] --- yaml --- r: 217451 b: refs/heads/master c: ea941f0e2a8c02ae876cd73deb4e1557248f258c h: refs/heads/master i: 217449: e609981c1560b244c1d32bd313695dc247e40e5c 217447: 4f9518e288c86e51e0d47344dda2db06895987ab v: v3 --- [refs] | 2 +- trunk/include/linux/mmzone.h | 2 ++ trunk/mm/page-writeback.c | 2 ++ trunk/mm/vmstat.c | 3 +++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index d2803bd1953b..c9e8340a8793 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f629d1c9bd0dbc44a6c4f9a4a67d1646c42bfc6f +refs/heads/master: ea941f0e2a8c02ae876cd73deb4e1557248f258c diff --git a/trunk/include/linux/mmzone.h b/trunk/include/linux/mmzone.h index 3984c4eb41fd..c3c17fb675ee 100644 --- a/trunk/include/linux/mmzone.h +++ b/trunk/include/linux/mmzone.h @@ -104,6 +104,8 @@ enum zone_stat_item { NR_ISOLATED_ANON, /* Temporary isolated pages from anon lru */ NR_ISOLATED_FILE, /* Temporary isolated pages from file lru */ NR_SHMEM, /* shmem pages (included tmpfs/GEM pages) */ + NR_DIRTIED, /* page dirtyings since bootup */ + NR_WRITTEN, /* page writings since bootup */ #ifdef CONFIG_NUMA NUMA_HIT, /* allocated in intended node */ NUMA_MISS, /* allocated in non intended node */ diff --git a/trunk/mm/page-writeback.c b/trunk/mm/page-writeback.c index 94159819a651..4dd91f7fd39f 100644 --- a/trunk/mm/page-writeback.c +++ b/trunk/mm/page-writeback.c @@ -1121,6 +1121,7 @@ void account_page_dirtied(struct page *page, struct address_space *mapping) { if (mapping_cap_account_dirty(mapping)) { __inc_zone_page_state(page, NR_FILE_DIRTY); + __inc_zone_page_state(page, NR_DIRTIED); __inc_bdi_stat(mapping->backing_dev_info, BDI_RECLAIMABLE); task_dirty_inc(current); task_io_account_write(PAGE_CACHE_SIZE); @@ -1136,6 +1137,7 @@ EXPORT_SYMBOL(account_page_dirtied); void account_page_writeback(struct page *page) { inc_zone_page_state(page, NR_WRITEBACK); + inc_zone_page_state(page, NR_WRITTEN); } EXPORT_SYMBOL(account_page_writeback); diff --git a/trunk/mm/vmstat.c b/trunk/mm/vmstat.c index 355a9e669aaa..44e7ac0fdb66 100644 --- a/trunk/mm/vmstat.c +++ b/trunk/mm/vmstat.c @@ -745,6 +745,9 @@ static const char * const vmstat_text[] = { "nr_isolated_anon", "nr_isolated_file", "nr_shmem", + "nr_dirtied", + "nr_written", + #ifdef CONFIG_NUMA "numa_hit", "numa_miss",