ceph: fix root quota realm check

[mirror_ubuntu-bionic-kernel.git] / fs / dax.c

diff --git a/fs/dax.c b/fs/dax.c
index 78b72c48374e5eed09587292f3b7eee62059e18b..c2ebf10b70daf706fcf80a1ad2cab3468fe75170 100644 (file)
--- a/fs/dax.c
+++ b/fs/dax.c
@@ -627,8 +627,7 @@ static void dax_mapping_entry_mkclean(struct address_space *mapping,
 
                        if (pfn != pmd_pfn(*pmdp))
                                goto unlock_pmd;
-                       if (!pmd_dirty(*pmdp)
-                                       && !pmd_access_permitted(*pmdp, WRITE))
+                       if (!pmd_dirty(*pmdp) && !pmd_write(*pmdp))
                                goto unlock_pmd;
 
                        flush_cache_page(vma, address, pfn);
@@ -637,8 +636,8 @@ static void dax_mapping_entry_mkclean(struct address_space *mapping,
                        pmd = pmd_mkclean(pmd);
                        set_pmd_at(vma->vm_mm, address, pmdp, pmd);
 unlock_pmd:
-                       spin_unlock(ptl);
 #endif
+                       spin_unlock(ptl);
                } else {
                        if (pfn != pte_pfn(*ptep))
                                goto unlock_pte;