diff --git a/[refs] b/[refs]
index 9245347deab9..2daaff5fc6ec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bb4067e34159648d394943d5e2a011f838bff22f
+refs/heads/master: 5f2a105d5e33a038a717995d2738434f9c25aed2
diff --git a/trunk/mm/truncate.c b/trunk/mm/truncate.c
index 89a5c359b6e8..4a38dd1a4ce8 100644
--- a/trunk/mm/truncate.c
+++ b/trunk/mm/truncate.c
@@ -60,7 +60,8 @@ void cancel_dirty_page(struct page *page, unsigned int account_size)
 		WARN_ON(++warncount < 5);
 	}
 		
-	if (TestClearPageDirty(page) && account_size) {
+	if (TestClearPageDirty(page) && account_size &&
+			mapping_cap_account_dirty(page->mapping)) {
 		dec_zone_page_state(page, NR_FILE_DIRTY);
 		task_io_account_cancelled_write(account_size);
 	}