iomap: return VM_FAULT_* codes from iomap_page_mkwrite

All callers will need the VM_FAULT_* flags, so convert in the helper.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Ross Zwisler <ross.zwisler@linux.intel.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

diff --git a/fs/iomap.c b/fs/iomap.c
index 59cc98ad7577b438a7928cdace1f2af3a7cabf75..8554a8d752812cefce1118f033cf75dd899dbfa1 100644 (file)
--- a/fs/iomap.c
+++ b/fs/iomap.c
@@ -477,10 +477,10 @@ int iomap_page_mkwrite(struct vm_fault *vmf, const struct iomap_ops *ops)
 
        set_page_dirty(page);
        wait_for_stable_page(page);
-       return 0;
+       return VM_FAULT_LOCKED;
 out_unlock:
        unlock_page(page);
-       return ret;
+       return block_page_mkwrite_return(ret);
 }
 EXPORT_SYMBOL_GPL(iomap_page_mkwrite);
 

diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
index c4893e226fd8e7ddebf8ee22aed420d5d122d473..8b0181c6d2a6e72552b9f4ab14bbadfb1b9243d1 100644 (file)
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@ -1035,7 +1035,6 @@ xfs_filemap_page_mkwrite(
                ret = dax_iomap_fault(vmf, PE_SIZE_PTE, &xfs_iomap_ops);
        } else {
                ret = iomap_page_mkwrite(vmf, &xfs_iomap_ops);
-               ret = block_page_mkwrite_return(ret);
        }
 
        xfs_iunlock(XFS_I(inode), XFS_MMAPLOCK_SHARED);