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

diff -puN fs/reiser4/as_ops.c~reiser4-mapping_cap_account_dirty-fix fs/reiser4/as_ops.c
--- linux-2.6.11/fs/reiser4/as_ops.c~reiser4-mapping_cap_account_dirty-fix	2005-03-25 18:05:42.000000000 +0300
+++ linux-2.6.11-vs/fs/reiser4/as_ops.c	2005-03-25 18:05:43.000000000 +0300
@@ -76,7 +76,7 @@ reiser4_clear_page_dirty(struct page *pa
 	spin_lock_irqsave(&mapping->tree_lock, flags);
 	if (TestClearPageDirty(page)) {
 		spin_unlock_irqrestore(&mapping->tree_lock, flags);
-		if (mapping_cap_account_dirty(mapping))
+		if (!mapping->backing_dev_info->memory_backed)
 			dec_page_state(nr_dirty);
 		return;
 	}
@@ -110,7 +110,7 @@ static int reiser4_set_page_dirty(struct
 			/* check for race with truncate */
 			if (page->mapping) {
 				assert("vs-1652", page->mapping == mapping);
-				if (mapping_cap_account_dirty(mapping))
+				if (!mapping->backing_dev_info->memory_backed)
 					inc_page_state(nr_dirty);
 				radix_tree_tag_set(&mapping->page_tree,
 						   page->index, PAGECACHE_TAG_REISER4_MOVED);
diff -puN fs/reiser4/emergency_flush.c~reiser4-mapping_cap_account_dirty-fix fs/reiser4/emergency_flush.c
--- linux-2.6.11/fs/reiser4/emergency_flush.c~reiser4-mapping_cap_account_dirty-fix	2005-03-25 18:05:42.000000000 +0300
+++ linux-2.6.11-vs/fs/reiser4/emergency_flush.c	2005-03-25 18:05:43.000000000 +0300
@@ -729,7 +729,7 @@ eflush_del (jnode * node, int page_locke
 	   anything specific to reiser4 but usual dirty page accounting. If */
 	if (!TestSetPageDirty(page)) {
 		BUG_ON(jnode_get_mapping(node) != page->mapping);
-		if (mapping_cap_account_dirty(page->mapping))
+		if (!page->mapping->backing_dev_info->memory_backed)
 			inc_page_state(nr_dirty);
 	}
 
diff -puN fs/reiser4/page_cache.c~reiser4-mapping_cap_account_dirty-fix fs/reiser4/page_cache.c
--- linux-2.6.11/fs/reiser4/page_cache.c~reiser4-mapping_cap_account_dirty-fix	2005-03-25 18:05:42.000000000 +0300
+++ linux-2.6.11-vs/fs/reiser4/page_cache.c	2005-03-25 18:05:43.000000000 +0300
@@ -465,7 +465,7 @@ int set_page_dirty_internal (struct page
 	BUG_ON(mapping == NULL);
 
 	if (!TestSetPageDirty(page)) {
-		if (mapping_cap_account_dirty(mapping))
+		if (!mapping->backing_dev_info->memory_backed)
 			inc_page_state(nr_dirty);
 
 		spin_lock_irq(&mapping->tree_lock);

_