1 files changed, 4 insertions, 4 deletions

diff --git a/mm/truncate.c b/mm/truncate.c
index c3123b08ff6d..c35c49e54fb6 100644
--- a/mm/truncate.c
+++ b/mm/truncate.c
@@ -48,7 +48,7 @@ void do_invalidatepage(struct page *page, unsigned long offset)
 
 static inline void truncate_partial_page(struct page *page, unsigned partial)
 {
-        zero_user_page(page, partial, PAGE_CACHE_SIZE - partial, KM_USER0);
+        zero_user_segment(page, partial, PAGE_CACHE_SIZE);
         if (PagePrivate(page))
                 do_invalidatepage(page, partial);
 }
@@ -84,7 +84,7 @@ EXPORT_SYMBOL(cancel_dirty_page);
 
 /*
  * If truncate cannot remove the fs-private metadata from the page, the page
- * becomes anonymous.  It will be left on the LRU and may even be mapped into
+ * becomes orphaned.  It will be left on the LRU and may even be mapped into
  * user pagetables if we're racing with filemap_fault().
  *
  * We need to bale out if page->mapping is no longer equal to the original
@@ -98,11 +98,11 @@ truncate_complete_page(struct address_space *mapping, struct page *page)
         if (page->mapping != mapping)
                 return;
 
-        cancel_dirty_page(page, PAGE_CACHE_SIZE);
-
         if (PagePrivate(page))
                 do_invalidatepage(page, 0);
 
+        cancel_dirty_page(page, PAGE_CACHE_SIZE);
+
         remove_from_page_cache(page);
         ClearPageUptodate(page);
         ClearPageMappedToDisk(page);