On Mon, Aug 28, 2017 at 08:36:58AM +0200, Christoph Hellwig wrote:
> All callers will need the VM_FAULT_* flags, so convert in the helper.
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
> Reviewed-by: Ross Zwisler <ross.zwisler@xxxxxxxxxxxxxxx>
Reviewed-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
> ---
> fs/iomap.c | 4 ++--
> fs/xfs/xfs_file.c | 1 -
> 2 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/fs/iomap.c b/fs/iomap.c
> index 59cc98ad7577..8554a8d75281 100644
> --- 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 c4893e226fd8..8b0181c6d2a6 100644
> --- 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);
> --
> 2.11.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
