1 files changed, 13 insertions, 21 deletions

diff --git a/drivers/dax/dax.c b/drivers/dax/dax.c
index 0261f332bf3e..922ec461dcaa 100644
--- a/drivers/dax/dax.c
+++ b/drivers/dax/dax.c
@@ -419,7 +419,7 @@ static phys_addr_t pgoff_to_phys(struct dax_dev *dax_dev, pgoff_t pgoff,
         return -1;
 }
 
-static int __dax_dev_fault(struct dax_dev *dax_dev, struct vm_fault *vmf)
+static int __dax_dev_pte_fault(struct dax_dev *dax_dev, struct vm_fault *vmf)
 {
         struct device *dev = &dax_dev->dev;
         struct dax_region *dax_region;
@@ -455,23 +455,6 @@ static int __dax_dev_fault(struct dax_dev *dax_dev, struct vm_fault *vmf)
         return VM_FAULT_NOPAGE;
 }
 
-static int dax_dev_fault(struct vm_fault *vmf)
-{
-        struct vm_area_struct *vma = vmf->vma;
-        int rc;
-        struct file *filp = vma->vm_file;
-        struct dax_dev *dax_dev = filp->private_data;
-
-        dev_dbg(&dax_dev->dev, "%s: %s: %s (%#lx - %#lx)\n", __func__,
-                        current->comm, (vmf->flags & FAULT_FLAG_WRITE)
-                        ? "write" : "read", vma->vm_start, vma->vm_end);
-        rcu_read_lock();
-        rc = __dax_dev_fault(dax_dev, vmf);
-        rcu_read_unlock();
-
-        return rc;
-}
-
 static int __dax_dev_pmd_fault(struct dax_dev *dax_dev, struct vm_fault *vmf)
 {
         unsigned long pmd_addr = vmf->address & PMD_MASK;
@@ -510,7 +493,7 @@ static int __dax_dev_pmd_fault(struct dax_dev *dax_dev, struct vm_fault *vmf)
                         vmf->flags & FAULT_FLAG_WRITE);
 }
 
-static int dax_dev_pmd_fault(struct vm_fault *vmf)
+static int dax_dev_fault(struct vm_fault *vmf)
 {
         int rc;
         struct file *filp = vmf->vma->vm_file;
@@ -522,7 +505,16 @@ static int dax_dev_pmd_fault(struct vm_fault *vmf)
                         vmf->vma->vm_start, vmf->vma->vm_end);
 
         rcu_read_lock();
-        rc = __dax_dev_pmd_fault(dax_dev, vmf);
+        switch (vmf->flags & FAULT_FLAG_SIZE_MASK) {
+        case FAULT_FLAG_SIZE_PTE:
+                rc = __dax_dev_pte_fault(dax_dev, vmf);
+                break;
+        case FAULT_FLAG_SIZE_PMD:
+                rc = __dax_dev_pmd_fault(dax_dev, vmf);
+                break;
+        default:
+                return VM_FAULT_FALLBACK;
+        }
         rcu_read_unlock();
 
         return rc;
@@ -530,7 +522,7 @@ static int dax_dev_pmd_fault(struct vm_fault *vmf)
 
 static const struct vm_operations_struct dax_dev_vm_ops = {
         .fault = dax_dev_fault,
-        .pmd_fault = dax_dev_pmd_fault,
+        .huge_fault = dax_dev_fault,
 };
 
 static int dax_mmap(struct file *filp, struct vm_area_struct *vma)