dax: pass detailed error code from dax_iomap_fault()

Ext4 needs to pass through error from its iomap handler to the page
fault handler so that it can properly detect ENOSPC and force
transaction commit and retry the fault (and block allocation). Add
argument to dax_iomap_fault() for passing such error.

Reviewed-by: Ross Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

1 files changed, 6 insertions, 3 deletions

diff --git a/fs/dax.c b/fs/dax.c
index 95981591977a..f3afa1d6156c 100644
--- a/fs/dax.c
+++ b/fs/dax.c
@@ -1096,7 +1096,7 @@ static bool dax_fault_is_synchronous(unsigned long flags,
 }
 
 static int dax_iomap_pte_fault(struct vm_fault *vmf, pfn_t *pfnp,
-                               const struct iomap_ops *ops)
+                               int *iomap_errp, const struct iomap_ops *ops)
 {
         struct vm_area_struct *vma = vmf->vma;
         struct address_space *mapping = vma->vm_file->f_mapping;
@@ -1149,6 +1149,8 @@ static int dax_iomap_pte_fault(struct vm_fault *vmf, pfn_t *pfnp,
          * that we never have to deal with more than a single extent here.
          */
         error = ops->iomap_begin(inode, pos, PAGE_SIZE, flags, &iomap);
+        if (iomap_errp)
+                *iomap_errp = error;
         if (error) {
                 vmf_ret = dax_fault_return(error);
                 goto unlock_entry;
@@ -1488,6 +1490,7 @@ static int dax_iomap_pmd_fault(struct vm_fault *vmf, pfn_t *pfnp,
  * @vmf: The description of the fault
  * @pe_size: Size of the page to fault in
  * @pfnp: PFN to insert for synchronous faults if fsync is required
+ * @iomap_errp: Storage for detailed error code in case of error
  * @ops: Iomap ops passed from the file system
  *
  * When a page fault occurs, filesystems may call this helper in
@@ -1496,11 +1499,11 @@ static int dax_iomap_pmd_fault(struct vm_fault *vmf, pfn_t *pfnp,
  * successfully.
  */
 int dax_iomap_fault(struct vm_fault *vmf, enum page_entry_size pe_size,
-                    pfn_t *pfnp, const struct iomap_ops *ops)
+                    pfn_t *pfnp, int *iomap_errp, const struct iomap_ops *ops)
 {
         switch (pe_size) {
         case PE_SIZE_PTE:
-                return dax_iomap_pte_fault(vmf, pfnp, ops);
+                return dax_iomap_pte_fault(vmf, pfnp, iomap_errp, ops);
         case PE_SIZE_PMD:
                 return dax_iomap_pmd_fault(vmf, pfnp, ops);
         default: