diff --git a/[refs] b/[refs]
index 0c30f27a8ed3..c3e48cfdffb3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 55e829af06681e5d731c03ba04febbd1c76ca293
+refs/heads/master: e08748ce01e02f0ec154b141f392ccb9555333f4
diff --git a/trunk/fs/buffer.c b/trunk/fs/buffer.c
index 904d59d1eb8e..d1f1b54d3108 100644
--- a/trunk/fs/buffer.c
+++ b/trunk/fs/buffer.c
@@ -2853,8 +2853,13 @@ int try_to_free_buffers(struct page *page)
 		 * could encounter a non-uptodate page, which is unresolvable.
 		 * This only applies in the rare case where try_to_free_buffers
 		 * succeeds but the page is not freed.
+		 *
+		 * Also, during truncate, discard_buffer will have marked all
+		 * the page's buffers clean.  We discover that here and clean
+		 * the page also.
 		 */
-		clear_page_dirty(page);
+		if (test_clear_page_dirty(page))
+			task_io_account_cancelled_write(PAGE_CACHE_SIZE);
 	}
 out:
 	if (buffers_to_free) {
diff --git a/trunk/mm/truncate.c b/trunk/mm/truncate.c
index e07b1e682c38..9bfb8e853860 100644
--- a/trunk/mm/truncate.c
+++ b/trunk/mm/truncate.c
@@ -13,6 +13,7 @@
 #include <linux/module.h>
 #include <linux/pagemap.h>
 #include <linux/pagevec.h>
+#include <linux/task_io_accounting_ops.h>
 #include <linux/buffer_head.h>	/* grr. try_to_release_page,
 				   do_invalidatepage */
 
@@ -69,7 +70,8 @@ truncate_complete_page(struct address_space *mapping, struct page *page)
 	if (PagePrivate(page))
 		do_invalidatepage(page, 0);
 
-	clear_page_dirty(page);
+	if (test_clear_page_dirty(page))
+		task_io_account_cancelled_write(PAGE_CACHE_SIZE);
 	ClearPageUptodate(page);
 	ClearPageMappedToDisk(page);
 	remove_from_page_cache(page);