2 files changed, 2 insertions, 1 deletions

diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index ea9da3bed3e9..886ea0d5a136 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -824,6 +824,7 @@ int __set_page_dirty_nobuffers(struct page *page)
                 mapping2 = page_mapping(page);
                 if (mapping2) { /* Race with truncate? */
                         BUG_ON(mapping2 != mapping);
+                        WARN_ON_ONCE(!PagePrivate(page) && !PageUptodate(page));
                         if (mapping_cap_account_dirty(mapping)) {
                                 __inc_zone_page_state(page, NR_FILE_DIRTY);
                                 task_io_account_write(PAGE_CACHE_SIZE);
diff --git a/mm/truncate.c b/mm/truncate.c
index 7c994f2d6145..f47e46d1be3b 100644
--- a/mm/truncate.c
+++ b/mm/truncate.c
@@ -100,9 +100,9 @@ truncate_complete_page(struct address_space *mapping, struct page *page)
         if (PagePrivate(page))
                 do_invalidatepage(page, 0);
 
+        remove_from_page_cache(page);
         ClearPageUptodate(page);
         ClearPageMappedToDisk(page);
-        remove_from_page_cache(page);
         page_cache_release(page);       /* pagecache ref */
 }