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

Commit 5eb88dca authored by Ross Zwisler's avatar Ross Zwisler Committed by Linus Torvalds
Browse files

xfs: call dax_pfn_mkwrite() for DAX fsync/msync 



To properly support the new DAX fsync/msync infrastructure filesystems
need to call dax_pfn_mkwrite() so that DAX can track when user pages are
dirtied.

Signed-off-by: default avatarRoss Zwisler <ross.zwisler@linux.intel.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: "J. Bruce Fields" <bfields@fieldses.org>
Cc: "Theodore Ts'o" <tytso@mit.edu>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Andreas Dilger <adilger.kernel@dilger.ca>
Cc: Dave Chinner <david@fromorbit.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jan Kara <jack@suse.com>
Cc: Jeff Layton <jlayton@poochiereds.net>
Cc: Matthew Wilcox <willy@linux.intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Matthew Wilcox <matthew.r.wilcox@intel.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d5be7a03

fs/xfs/xfs_file.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -1610,9 +1610,8 @@ xfs_filemap_pmd_fault( 
/*

/*

 * pfn_mkwrite was originally inteneded to ensure we capture time stamp

 * pfn_mkwrite was originally inteneded to ensure we capture time stamp

 * updates on write faults. In reality, it's need to serialise against

 * updates on write faults. In reality, it's need to serialise against

 * truncate similar to page_mkwrite. Hence we open-code dax_pfn_mkwrite()

 * truncate similar to page_mkwrite. Hence we cycle the XFS_MMAPLOCK_SHARED

 * here and cycle the XFS_MMAPLOCK_SHARED to ensure we serialise the fault

 * to ensure we serialise the fault barrier in place.

 * barrier in place.

 */

 */

static int

static int

xfs_filemap_pfn_mkwrite(

xfs_filemap_pfn_mkwrite(
@@ -1635,6 +1634,8 @@ xfs_filemap_pfn_mkwrite( 
	size = (i_size_read(inode) + PAGE_SIZE - 1) >> PAGE_SHIFT;

	size = (i_size_read(inode) + PAGE_SIZE - 1) >> PAGE_SHIFT;

	if (vmf->pgoff >= size)

	if (vmf->pgoff >= size)

		ret = VM_FAULT_SIGBUS;

		ret = VM_FAULT_SIGBUS;

	else if (IS_DAX(inode))

		ret = dax_pfn_mkwrite(vma, vmf);

	xfs_iunlock(ip, XFS_MMAPLOCK_SHARED);

	xfs_iunlock(ip, XFS_MMAPLOCK_SHARED);

	sb_end_pagefault(inode->i_sb);

	sb_end_pagefault(inode->i_sb);

	return ret;

	return ret;