---

yaml --- r: 35596 b: refs/heads/master c: 28e4d96 h: refs/heads/master v: v3
git-mirror · Sep 26, 2006 · 78b263f · 78b263f
1 parent 3edfe31
commit 78b263f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bfa5bf6d6446f0028187a727f792fbc7934228ad
+refs/heads/master: 28e4d965e6131ace1e813e93aebca89ac6b82dc1
diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c
@@ -377,8 +377,8 @@ static pageout_t pageout(struct page *page, struct address_space *mapping)
 
 int remove_mapping(struct address_space *mapping, struct page *page)
 {
-	if (!mapping)
-		return 0;		/* truncate got there first */
+	BUG_ON(!PageLocked(page));
+	BUG_ON(mapping != page_mapping(page));
 
 	write_lock_irq(&mapping->tree_lock);
 
@@ -547,7 +547,7 @@ static unsigned long shrink_page_list(struct list_head *page_list,
 				goto free_it;
 		}
 
-		if (!remove_mapping(mapping, page))
+		if (!mapping || !remove_mapping(mapping, page))
 			goto keep_locked;
 
 free_it: