3 files changed, 3 insertions, 36 deletions

diff --git a/fs/dax.c b/fs/dax.c
index 66d79067eedf..38deebb8c86e 100644
--- a/fs/dax.c
+++ b/fs/dax.c
@@ -461,35 +461,6 @@ int dax_delete_mapping_entry(struct address_space *mapping, pgoff_t index)
 }
 
 /*
- * Invalidate exceptional DAX entry if easily possible. This handles DAX
- * entries for invalidate_inode_pages() so we evict the entry only if we can
- * do so without blocking.
- */
-int dax_invalidate_mapping_entry(struct address_space *mapping, pgoff_t index)
-{
-        int ret = 0;
-        void *entry, **slot;
-        struct radix_tree_root *page_tree = &mapping->page_tree;
-
-        spin_lock_irq(&mapping->tree_lock);
-        entry = __radix_tree_lookup(page_tree, index, NULL, &slot);
-        if (!entry || !radix_tree_exceptional_entry(entry) ||
-            slot_locked(mapping, slot))
-                goto out;
-        if (radix_tree_tag_get(page_tree, index, PAGECACHE_TAG_DIRTY) ||
-            radix_tree_tag_get(page_tree, index, PAGECACHE_TAG_TOWRITE))
-                goto out;
-        radix_tree_delete(page_tree, index);
-        mapping->nrexceptional--;
-        ret = 1;
-out:
-        spin_unlock_irq(&mapping->tree_lock);
-        if (ret)
-                dax_wake_mapping_entry_waiter(mapping, index, entry, true);
-        return ret;
-}
-
-/*
  * Invalidate exceptional DAX entry if it is clean.
  */
 int dax_invalidate_mapping_entry_sync(struct address_space *mapping,
diff --git a/include/linux/dax.h b/include/linux/dax.h
index d3158e74a59e..d1236d16ef00 100644
--- a/include/linux/dax.h
+++ b/include/linux/dax.h
@@ -63,7 +63,6 @@ ssize_t dax_iomap_rw(struct kiocb *iocb, struct iov_iter *iter,
 int dax_iomap_fault(struct vm_fault *vmf, enum page_entry_size pe_size,
                     const struct iomap_ops *ops);
 int dax_delete_mapping_entry(struct address_space *mapping, pgoff_t index);
-int dax_invalidate_mapping_entry(struct address_space *mapping, pgoff_t index);
 int dax_invalidate_mapping_entry_sync(struct address_space *mapping,
                                       pgoff_t index);
 void dax_wake_mapping_entry_waiter(struct address_space *mapping,
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;
 }