2.6.25-git19

 mm

diff --git a/mm/filemap.c b/mm/filemap.c
index 07e9d92..239d361 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -576,10 +576,12 @@ EXPORT_SYMBOL(unlock_page);
  */
 void end_page_writeback(struct page *page)
 {
-   if (!TestClearPageReclaim(page) || rotate_reclaimable_page(page)) {
-      if (!test_clear_page_writeback(page))
-         BUG();
-   }
+   if (TestClearPageReclaim(page))
+      rotate_reclaimable_page(page);
+
+   if (!test_clear_page_writeback(page))
+      BUG();
+
    smp_mb__after_clear_bit();
    wake_up_page(page, PG_writeback);
 }