From: Andrew Morton <akpm@osdl.org>

Update reiser4 for zoned-vm-counters-*.patch

Cc: "Vladimir V. Saveliev" <vs@namesys.com>
Cc: Christoph Lameter <clameter@engr.sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 fs/reiser4/as_ops.c     |    3 ++-
 fs/reiser4/page_cache.c |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff -puN fs/reiser4/as_ops.c~reiser4-vs-zoned-allocator fs/reiser4/as_ops.c
--- a/fs/reiser4/as_ops.c~reiser4-vs-zoned-allocator
+++ a/fs/reiser4/as_ops.c
@@ -83,7 +83,8 @@ int reiser4_set_page_dirty(struct page *
 			if (page->mapping) {
 				assert("vs-1652", page->mapping == mapping);
 				if (mapping_cap_account_dirty(mapping))
-					inc_page_state(nr_dirty);
+					inc_zone_page_state(page,
+							NR_FILE_DIRTY);
 				radix_tree_tag_set(&mapping->page_tree,
 						   page->index,
 						   PAGECACHE_TAG_REISER4_MOVED);
diff -puN fs/reiser4/page_cache.c~reiser4-vs-zoned-allocator fs/reiser4/page_cache.c
--- a/fs/reiser4/page_cache.c~reiser4-vs-zoned-allocator
+++ a/fs/reiser4/page_cache.c
@@ -464,7 +464,7 @@ int set_page_dirty_internal(struct page 
 
 	if (!TestSetPageDirty(page)) {
 		if (mapping_cap_account_dirty(mapping))
-			inc_page_state(nr_dirty);
+			inc_zone_page_state(page, NR_FILE_DIRTY);
 
 		__mark_inode_dirty(mapping->host, I_DIRTY_PAGES);
 	}
_