3 files changed, 7 insertions, 7 deletions

diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index e62482718012..51b3eb6ab445 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -920,6 +920,7 @@ int clear_page_dirty_for_io(struct page *page)
 
         BUG_ON(!PageLocked(page));
 
+        ClearPageReclaim(page);
         if (mapping && mapping_cap_account_dirty(mapping)) {
                 /*
                  * Yes, Virginia, this is indeed insane.
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 2165be9462c0..43cb3b3e1679 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -453,12 +453,6 @@ static inline int free_pages_check(struct page *page)
                         1 << PG_reserved |
                         1 << PG_buddy ))))
                 bad_page(page);
-        /*
-         * PageReclaim == PageTail. It is only an error
-         * for PageReclaim to be set if PageCompound is clear.
-         */
-        if (unlikely(!PageCompound(page) && PageReclaim(page)))
-                bad_page(page);
         if (PageDirty(page))
                 __ClearPageDirty(page);
         /*
@@ -602,7 +596,6 @@ static int prep_new_page(struct page *page, int order, gfp_t gfp_flags)
                         1 << PG_locked  |
                         1 << PG_active  |
                         1 << PG_dirty   |
-                        1 << PG_reclaim |
                         1 << PG_slab    |
                         1 << PG_swapcache |
                         1 << PG_writeback |
diff --git a/mm/readahead.c b/mm/readahead.c
index 5b3c9b7d70fa..205a4a431516 100644
--- a/mm/readahead.c
+++ b/mm/readahead.c
@@ -448,6 +448,12 @@ page_cache_readahead_ondemand(struct address_space *mapping,
                 return 0;
 
         if (page) {
+                /*
+                 * It can be PG_reclaim.
+                 */
+                if (PageWriteback(page))
+                        return 0;
+
                 ClearPageReadahead(page);
 
                 /*