From b6f25cdc99cb94757ac784ac2633c5fa074a4745 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Tue, 17 Oct 2006 00:09:36 -0700
Subject: [PATCH] --- yaml --- r: 39713 b: refs/heads/master c:
 a649fd9271773dd0f78e2b9f347bcceecb8827f9 h: refs/heads/master i:   39711:
 ae1990ace104c7dad7adcadd5afc958f89c1694f v: v3

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

diff --git a/[refs] b/[refs]
index 6ae4eefa732d..d1c509c34e79 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5eb30790d4ccd3409240a80eaf9ab76b4fb75fd8
+refs/heads/master: a649fd9271773dd0f78e2b9f347bcceecb8827f9
diff --git a/trunk/mm/truncate.c b/trunk/mm/truncate.c
index 11ca480701dd..e07b1e682c38 100644
--- a/trunk/mm/truncate.c
+++ b/trunk/mm/truncate.c
@@ -96,7 +96,6 @@ invalidate_complete_page(struct address_space *mapping, struct page *page)
 		return 0;
 
 	ret = remove_mapping(mapping, page);
-	ClearPageUptodate(page);
 
 	return ret;
 }
diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c
index eca70310adb2..af73c14f9d88 100644
--- a/trunk/mm/vmscan.c
+++ b/trunk/mm/vmscan.c
@@ -378,6 +378,12 @@ static pageout_t pageout(struct page *page, struct address_space *mapping)
 	return PAGE_CLEAN;
 }
 
+/*
+ * Attempt to detach a locked page from its ->mapping.  If it is dirty or if
+ * someone else has a ref on the page, abort and return 0.  If it was
+ * successfully detached, return 1.  Assumes the caller has a single ref on
+ * this page.
+ */
 int remove_mapping(struct address_space *mapping, struct page *page)
 {
 	BUG_ON(!PageLocked(page));