1 files changed, 4 insertions, 2 deletions

diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index 0cd3de3550f0..7c72f2a95785 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -1161,6 +1161,7 @@ static int memory_failure_dev_pagemap(unsigned long pfn, int flags,
         LIST_HEAD(tokill);
         int rc = -EBUSY;
         loff_t start;
+        dax_entry_t cookie;
 
         /*
          * Prevent the inode from being freed while we are interrogating
@@ -1169,7 +1170,8 @@ static int memory_failure_dev_pagemap(unsigned long pfn, int flags,
          * also prevents changes to the mapping of this pfn until
          * poison signaling is complete.
          */
-        if (!dax_lock_mapping_entry(page))
+        cookie = dax_lock_page(page);
+        if (!cookie)
                 goto out;
 
         if (hwpoison_filter(page)) {
@@ -1220,7 +1222,7 @@ static int memory_failure_dev_pagemap(unsigned long pfn, int flags,
         kill_procs(&tokill, flags & MF_MUST_KILL, !unmap_success, pfn, flags);
         rc = 0;
 unlock:
-        dax_unlock_mapping_entry(page);
+        dax_unlock_page(page, cookie);
 out:
         /* drop pgmap ref acquired in caller */
         put_dev_pagemap(pgmap);