---

yaml --- r: 39713 b: refs/heads/master c: a649fd9 h: refs/heads/master i: 39711: ae1990a v: v3
git-mirror · Oct 17, 2006 · b6f25cd · b6f25cd
1 parent ecdcf4e
commit b6f25cd
Show file tree

Hide file tree

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