aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorHugh Dickins <hugh@veritas.com>2009-01-06 17:40:05 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-06 18:59:07 -0500
commit79f4b7bf393e67bbffec807cc68caaefc72b82ee (patch)
tree5bee7c12fe49e63e38d74afc6bbd2933906ecb9b /mm
parent0f64415d42760379753e6088787ce3fd3e069509 (diff)
badpage: simplify page_alloc flag check+clear
Simplify the PAGE_FLAGS checking and clearing when freeing and allocating a page: check the same flags as before when freeing, clear ALL the flags (unless PageReserved) when freeing, check ALL flags off when allocating. Signed-off-by: Hugh Dickins <hugh@veritas.com> Cc: Nick Piggin <nickpiggin@yahoo.com.au> Cc: Christoph Lameter <cl@linux-foundation.org> Cc: Mel Gorman <mel@csn.ul.ie> Cc: Rik van Riel <riel@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/page_alloc.c19
1 files changed, 6 insertions, 13 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 31c512410a99..b90a74d28485 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -231,7 +231,6 @@ static void bad_page(struct page *page)
231 printk(KERN_EMERG "Trying to fix it up, but a reboot is needed\n" 231 printk(KERN_EMERG "Trying to fix it up, but a reboot is needed\n"
232 KERN_EMERG "Backtrace:\n"); 232 KERN_EMERG "Backtrace:\n");
233 dump_stack(); 233 dump_stack();
234 page->flags &= ~PAGE_FLAGS_CLEAR_WHEN_BAD;
235 set_page_count(page, 0); 234 set_page_count(page, 0);
236 reset_page_mapcount(page); 235 reset_page_mapcount(page);
237 page->mapping = NULL; 236 page->mapping = NULL;
@@ -468,16 +467,16 @@ static inline int free_pages_check(struct page *page)
468 (page_count(page) != 0) | 467 (page_count(page) != 0) |
469 (page->flags & PAGE_FLAGS_CHECK_AT_FREE))) 468 (page->flags & PAGE_FLAGS_CHECK_AT_FREE)))
470 bad_page(page); 469 bad_page(page);
471 if (PageDirty(page))
472 __ClearPageDirty(page);
473 if (PageSwapBacked(page))
474 __ClearPageSwapBacked(page);
475 /* 470 /*
476 * For now, we report if PG_reserved was found set, but do not 471 * For now, we report if PG_reserved was found set, but do not
477 * clear it, and do not free the page. But we shall soon need 472 * clear it, and do not free the page. But we shall soon need
478 * to do more, for when the ZERO_PAGE count wraps negative. 473 * to do more, for when the ZERO_PAGE count wraps negative.
479 */ 474 */
480 return PageReserved(page); 475 if (PageReserved(page))
476 return 1;
477 if (page->flags & PAGE_FLAGS_CHECK_AT_PREP)
478 page->flags &= ~PAGE_FLAGS_CHECK_AT_PREP;
479 return 0;
481} 480}
482 481
483/* 482/*
@@ -621,13 +620,7 @@ static int prep_new_page(struct page *page, int order, gfp_t gfp_flags)
621 if (PageReserved(page)) 620 if (PageReserved(page))
622 return 1; 621 return 1;
623 622
624 page->flags &= ~(1 << PG_uptodate | 1 << PG_error | 1 << PG_reclaim | 623 page->flags &= ~PAGE_FLAGS_CHECK_AT_PREP;
625 1 << PG_referenced | 1 << PG_arch_1 |
626 1 << PG_owner_priv_1 | 1 << PG_mappedtodisk
627#ifdef CONFIG_UNEVICTABLE_LRU
628 | 1 << PG_mlocked
629#endif
630 );
631 set_page_private(page, 0); 624 set_page_private(page, 0);
632 set_page_refcounted(page); 625 set_page_refcounted(page);
633 626