aboutsummaryrefslogtreecommitdiffstats
path: root/mm/filemap.c
diff options
context:
space:
mode:
authorMiklos Szeredi <mszeredi@suse.cz>2008-04-28 05:12:38 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-28 11:58:20 -0400
commitac6aadb24b7d4f0e54246732e221c102073412bf (patch)
tree1936c3e847fca977b8c0d650416c66655f7633ad /mm/filemap.c
parentf05111f50105ac479a008cf85749cf9c956453ea (diff)
mm: rotate_reclaimable_page() cleanup
Clean up messy conditional calling of test_clear_page_writeback() from both rotate_reclaimable_page() and end_page_writeback(). The only user of rotate_reclaimable_page() is end_page_writeback() so this is OK. Signed-off-by: Miklos Szeredi <mszeredi@suse.cz> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/filemap.c')
-rw-r--r--mm/filemap.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/mm/filemap.c b/mm/filemap.c
index 07e9d9258b48..239d36163bbe 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -576,10 +576,12 @@ EXPORT_SYMBOL(unlock_page);
576 */ 576 */
577void end_page_writeback(struct page *page) 577void end_page_writeback(struct page *page)
578{ 578{
579 if (!TestClearPageReclaim(page) || rotate_reclaimable_page(page)) { 579 if (TestClearPageReclaim(page))
580 if (!test_clear_page_writeback(page)) 580 rotate_reclaimable_page(page);
581 BUG(); 581
582 } 582 if (!test_clear_page_writeback(page))
583 BUG();
584
583 smp_mb__after_clear_bit(); 585 smp_mb__after_clear_bit();
584 wake_up_page(page, PG_writeback); 586 wake_up_page(page, PG_writeback);
585} 587}