patch-2.4.15 linux/mm/vmscan.c

• Lines: 59
• Date: Sat Nov 17 19:18:17 2001
• Orig file: v2.4.14/linux/mm/vmscan.c
• Orig date: Mon Nov 5 15:55:35 2001

diff -u --recursive --new-file v2.4.14/linux/mm/vmscan.c linux/mm/vmscan.c
@@ -7,7 +7,6 @@
  *  kswapd added: 7.1.96  sct
  *  Removed kswapd_ctl limits, and swap out as many pages as needed
  *  to bring the system back to freepages.high: 2.4.97, Rik van Riel.
- *  Version: $Id: vmscan.c,v 1.5 1998/02/23 22:14:28 sct Exp $
  *  Zone aware kswapd started 02/00, Kanoj Sarcar (kanoj@sgi.com).
  *  Multiqueue VM started 5.8.00, Rik van Riel.
  */
@@ -117,6 +116,13 @@
 		goto drop_pte;
 
 	/*
+	 * Anonymous buffercache pages can be left behind by
+	 * concurrent truncate and pagefault.
+	 */
+	if (page->buffers)
+		goto preserve;
+
+	/*
 	 * This is a dirty, swappable page.  First of all,
 	 * get a suitable swap entry for it, and make sure
 	 * we have the swap cache set up to associate the
@@ -140,6 +146,7 @@
 	}
 
 	/* No swap space left */
+preserve:
 	set_pte(page_table, pte);
 	UnlockPage(page);
 	return 0;
@@ -347,7 +354,9 @@
 
 		page = list_entry(entry, struct page, lru);
 
-		if (unlikely(!PageInactive(page)))
+		if (unlikely(!PageLRU(page)))
+			BUG();
+		if (unlikely(PageActive(page)))
 			BUG();
 
 		list_del(entry);
@@ -419,7 +428,7 @@
 			/* avoid to free a locked page */
 			page_cache_get(page);
 
-			if (try_to_free_buffers(page, gfp_mask)) {
+			if (try_to_release_page(page, gfp_mask)) {
 				if (!page->mapping) {
 					/*
 					 * We must not allow an anon page
@@ -440,7 +449,7 @@
 				} else {
 					/*
 					 * The page is still in pagecache so undo the stuff
-					 * before the try_to_free_buffers since we've not
+					 * before the try_to_release_page since we've not
 					 * finished and we can now try the next step.
 					 */
 					page_cache_release(page);