---

yaml --- r: 6857 b: refs/heads/master c: 3279ffd h: refs/heads/master i: 6855: 67c37ef v: v3
git-mirror · Sep 5, 2005 · ecb6835 · ecb6835
1 parent 794b0d5
commit ecb6835
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dae06ac43d56d23e50a2300d511b32a9e38cd657
+refs/heads/master: 3279ffd97f1b3962e40d3c5f09495ef8320b180b
diff --git a/trunk/mm/swap_state.c b/trunk/mm/swap_state.c
@@ -124,6 +124,7 @@ void __delete_from_swap_cache(struct page *page)
 	BUG_ON(!PageLocked(page));
 	BUG_ON(!PageSwapCache(page));
 	BUG_ON(PageWriteback(page));
+	BUG_ON(PagePrivate(page));
 
 	radix_tree_delete(&swapper_space.page_tree, page->private);
 	page->private = 0;
@@ -196,11 +197,6 @@ void delete_from_swap_cache(struct page *page)
 {
 	swp_entry_t entry;
 
-	BUG_ON(!PageSwapCache(page));
-	BUG_ON(!PageLocked(page));
-	BUG_ON(PageWriteback(page));
-	BUG_ON(PagePrivate(page));
-
 	entry.val = page->private;
 
 	write_lock_irq(&swapper_space.tree_lock);