Merge tag 'ext4_for_linus-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[thirdparty/linux.git] / fs / ext4 / file.c

diff --git a/fs/ext4/file.c b/fs/ext4/file.c
index e99cc17b6bd279ee8e60ea52d3a0373540415685..6830ea3a6c59c6b116f83ee4b3345811f92841ed 100644 (file)
--- a/fs/ext4/file.c
+++ b/fs/ext4/file.c
@@ -718,8 +718,7 @@ ext4_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
 }
 
 #ifdef CONFIG_FS_DAX
-static vm_fault_t ext4_dax_huge_fault(struct vm_fault *vmf,
-               enum page_entry_size pe_size)
+static vm_fault_t ext4_dax_huge_fault(struct vm_fault *vmf, unsigned int order)
 {
        int error = 0;
        vm_fault_t result;
@@ -735,7 +734,7 @@ static vm_fault_t ext4_dax_huge_fault(struct vm_fault *vmf,
         * read-only.
         *
         * We check for VM_SHARED rather than vmf->cow_page since the latter is
-        * unset for pe_size != PE_SIZE_PTE (i.e. only in do_cow_fault); for
+        * unset for order != 0 (i.e. only in do_cow_fault); for
         * other sizes, dax_iomap_fault will handle splitting / fallback so that
         * we eventually come back with a COW page.
         */
@@ -759,7 +758,7 @@ retry:
        } else {
                filemap_invalidate_lock_shared(mapping);
        }
-       result = dax_iomap_fault(vmf, pe_size, &pfn, &error, &ext4_iomap_ops);
+       result = dax_iomap_fault(vmf, order, &pfn, &error, &ext4_iomap_ops);
        if (write) {
                ext4_journal_stop(handle);
 
@@ -768,7 +767,7 @@ retry:
                        goto retry;
                /* Handling synchronous page fault? */
                if (result & VM_FAULT_NEEDDSYNC)
-                       result = dax_finish_sync_fault(vmf, pe_size, pfn);
+                       result = dax_finish_sync_fault(vmf, order, pfn);
                filemap_invalidate_unlock_shared(mapping);
                sb_end_pagefault(sb);
        } else {
@@ -780,7 +779,7 @@ retry:
 
 static vm_fault_t ext4_dax_fault(struct vm_fault *vmf)
 {
-       return ext4_dax_huge_fault(vmf, PE_SIZE_PTE);
+       return ext4_dax_huge_fault(vmf, 0);
 }
 
 static const struct vm_operations_struct ext4_dax_vm_ops = {