Merge branch 'dax-4.10-iomap-pmd' into origin

1 files changed, 2 insertions, 3 deletions

diff --git a/mm/filemap.c b/mm/filemap.c
index c7fe2f16503f..db26ebc6c62f 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -137,13 +137,12 @@ static int page_cache_tree_insert(struct address_space *mapping,
                 } else {
                         /* DAX can replace empty locked entry with a hole */
                         WARN_ON_ONCE(p !=
-                                (void *)(RADIX_TREE_EXCEPTIONAL_ENTRY |
-                                         RADIX_DAX_ENTRY_LOCK));
+                                dax_radix_locked_entry(0, RADIX_DAX_EMPTY));
                         /* DAX accounts exceptional entries as normal pages */
                         if (node)
                                 workingset_node_pages_dec(node);
                         /* Wakeup waiters for exceptional entry lock */
-                        dax_wake_mapping_entry_waiter(mapping, page->index,
+                        dax_wake_mapping_entry_waiter(mapping, page->index, p,
                                                       false);
                 }
         }