---

yaml --- r: 83097 b: refs/heads/master c: a2b3456 h: refs/heads/master i: 83095: b64a211 v: v3
git-mirror · Feb 5, 2008 · 2166e09 · 2166e09
1 parent 99ec2cc
commit 2166e09
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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);