1 files changed, 3 insertions, 6 deletions

diff --git a/mm/truncate.c b/mm/truncate.c
index 83a059e8cd1d..706cff171a15 100644
--- a/mm/truncate.c
+++ b/mm/truncate.c
@@ -67,17 +67,14 @@ static void truncate_exceptional_entry(struct address_space *mapping,
 
 /*
  * Invalidate exceptional entry if easily possible. This handles exceptional
- * entries for invalidate_inode_pages() so for DAX it evicts only unlocked and
- * clean entries.
+ * entries for invalidate_inode_pages().
  */
 static int invalidate_exceptional_entry(struct address_space *mapping,
                                         pgoff_t index, void *entry)
 {
-        /* Handled by shmem itself */
-        if (shmem_mapping(mapping))
+        /* Handled by shmem itself, or for DAX we do nothing. */
+        if (shmem_mapping(mapping) || dax_mapping(mapping))
                 return 1;
-        if (dax_mapping(mapping))
-                return dax_invalidate_mapping_entry(mapping, index);
         clear_shadow_entry(mapping, index, entry);
         return 1;
 }