p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Christoph Hellwig 2017-08-29 10:08:41 -07:00 committed by Darrick J. Wong
parent 2dd3d709fc
commit e7647fb491
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/iomap.c
View File

@ -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);

1
fs/xfs/xfs_file.c
View File

@ -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);