From 2166e09be1938bcb09c866e6d2305365ee6dd0fd Mon Sep 17 00:00:00 2001
From: Bjorn Steinbrink <B.Steinbrink@gmx.de>
Date: Mon, 4 Feb 2008 22:29:28 -0800
Subject: [PATCH] --- yaml --- r: 83097 b: refs/heads/master c:
 a2b345642f530054a92b8d2b5108436225a8093e h: refs/heads/master i:   83095:
 b64a2116c15a107399fe02f4a1fec6996fcfbd00 v: v3

---
 [refs]              | 2 +-
 trunk/mm/truncate.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 8838a58f5781..376fac819533 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae1276b9349a2fd9c3afb4651e25a77ac03299d9
+refs/heads/master: a2b345642f530054a92b8d2b5108436225a8093e
diff --git a/trunk/mm/truncate.c b/trunk/mm/truncate.c
index 3855492f1c3a..9838c050e2dd 100644
--- a/trunk/mm/truncate.c
+++ b/trunk/mm/truncate.c
@@ -98,11 +98,11 @@ truncate_complete_page(struct address_space *mapping, struct page *page)
 	if (page->mapping != mapping)
 		return;
 
-	cancel_dirty_page(page, PAGE_CACHE_SIZE);
-
 	if (PagePrivate(page))
 		do_invalidatepage(page, 0);
 
+	cancel_dirty_page(page, PAGE_CACHE_SIZE);
+
 	remove_from_page_cache(page);
 	ClearPageUptodate(page);
 	ClearPageMappedToDisk(page);