2 files changed, 12 insertions, 2 deletions

diff --git a/fs/dax.c b/fs/dax.c
index 38deebb8c86e..123d9903c77d 100644
--- a/fs/dax.c
+++ b/fs/dax.c
@@ -1015,7 +1015,7 @@ dax_iomap_actor(struct inode *inode, loff_t pos, loff_t length, void *data,
          * into page tables. We have to tear down these mappings so that data
          * written by write(2) is visible in mmap.
          */
-        if ((iomap->flags & IOMAP_F_NEW) && inode->i_mapping->nrpages) {
+        if (iomap->flags & IOMAP_F_NEW) {
                 invalidate_inode_pages2_range(inode->i_mapping,
                                               pos >> PAGE_SHIFT,
                                               (end - 1) >> PAGE_SHIFT);
diff --git a/mm/truncate.c b/mm/truncate.c
index 706cff171a15..6479ed2afc53 100644
--- a/mm/truncate.c
+++ b/mm/truncate.c
@@ -686,7 +686,17 @@ int invalidate_inode_pages2_range(struct address_space *mapping,
                 cond_resched();
                 index++;
         }
-
+        /*
+         * For DAX we invalidate page tables after invalidating radix tree.  We
+         * could invalidate page tables while invalidating each entry however
+         * that would be expensive. And doing range unmapping before doesn't
+         * work as we have no cheap way to find whether radix tree entry didn't
+         * get remapped later.
+         */
+        if (dax_mapping(mapping)) {
+                unmap_mapping_range(mapping, (loff_t)start << PAGE_SHIFT,
+                                    (loff_t)(end - start + 1) << PAGE_SHIFT, 0);
+        }
 out:
         cleancache_invalidate_inode(mapping);
         return ret;