Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7647fb4 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarRoss Zwisler <ross.zwisler@linux.intel.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent 2dd3d709

fs/iomap.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -477,10 +477,10 @@ int iomap_page_mkwrite(struct vm_fault *vmf, const struct iomap_ops *ops) 




	set_page_dirty(page);

	set_page_dirty(page);

	wait_for_stable_page(page);

	wait_for_stable_page(page);

	return 0;

	return VM_FAULT_LOCKED;

out_unlock:

out_unlock:

	unlock_page(page);

	unlock_page(page);

	return ret;

	return block_page_mkwrite_return(ret);

}

}

EXPORT_SYMBOL_GPL(iomap_page_mkwrite);

EXPORT_SYMBOL_GPL(iomap_page_mkwrite);

fs/xfs/xfs_file.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -1035,7 +1035,6 @@ xfs_filemap_page_mkwrite( 
		ret = dax_iomap_fault(vmf, PE_SIZE_PTE, &xfs_iomap_ops);

		ret = dax_iomap_fault(vmf, PE_SIZE_PTE, &xfs_iomap_ops);

	} else {

	} else {

		ret = iomap_page_mkwrite(vmf, &xfs_iomap_ops);

		ret = iomap_page_mkwrite(vmf, &xfs_iomap_ops);

		ret = block_page_mkwrite_return(ret);

	}

	}





	xfs_iunlock(XFS_I(inode), XFS_MMAPLOCK_SHARED);

	xfs_iunlock(XFS_I(inode), XFS_MMAPLOCK_SHARED);