[PATCH] delete from_swap_cache BUG_ONs
Three of the four BUG_ONs in delete_from_swap_cache are immediately repeated in __delete_from_swap_cache: delete those and add the one. But perhaps mm/ is altogether overprovisioned with historic BUGs? Signed-off-by: Hugh Dickins <hugh@veritas.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
dae06ac43d
commit
3279ffd97f
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue
Block a user