Commit 7b565c9f authored by Jan Kara's avatar Jan Kara Committed by Dan Williams
Browse files

xfs: Implement xfs_filemap_pfn_mkwrite() using __xfs_filemap_fault()

xfs_filemap_pfn_mkwrite() duplicates a lot of __xfs_filemap_fault().
It will also need to handle flushing for synchronous page faults. So
just make that function use __xfs_filemap_fault().
Signed-off-by: default avatarJan Kara <>
Signed-off-by: default avatarDan Williams <>
parent b8a6176c
......@@ -1085,37 +1085,16 @@ xfs_filemap_page_mkwrite(
* pfn_mkwrite was originally inteneded to ensure we capture time stamp
* updates on write faults. In reality, it's need to serialise against
* truncate similar to page_mkwrite. Hence we cycle the XFS_MMAPLOCK_SHARED
* to ensure we serialise the fault barrier in place.
* pfn_mkwrite was originally intended to ensure we capture time stamp updates
* on write faults. In reality, it needs to serialise against truncate and
* prepare memory for writing so handle is as standard write fault.
static int
struct vm_fault *vmf)
struct inode *inode = file_inode(vmf->vma->vm_file);
struct xfs_inode *ip = XFS_I(inode);
int ret = VM_FAULT_NOPAGE;
loff_t size;
/* check if the faulting page hasn't raced with truncate */
xfs_ilock(ip, XFS_MMAPLOCK_SHARED);
size = (i_size_read(inode) + PAGE_SIZE - 1) >> PAGE_SHIFT;
if (vmf->pgoff >= size)
else if (IS_DAX(inode))
ret = dax_iomap_fault(vmf, PE_SIZE_PTE, NULL, &xfs_iomap_ops);
xfs_iunlock(ip, XFS_MMAPLOCK_SHARED);
return ret;
return __xfs_filemap_fault(vmf, PE_SIZE_PTE, true);
static const struct vm_operations_struct xfs_file_vm_ops = {
......@@ -688,8 +688,6 @@ DEFINE_INODE_EVENT(xfs_inode_set_cowblocks_tag);
TP_PROTO(struct xfs_inode *ip, enum page_entry_size pe_size,
bool write_fault),
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment