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

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

ext4: 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 80b4adca

fs/ext4/file.c

+3 −1
Original line number Diff line number Diff line
@@ -291,8 +291,8 @@ static int ext4_dax_pfn_mkwrite(struct vm_area_struct *vma, 
{

	struct inode *inode = file_inode(vma->vm_file);

	struct super_block *sb = inode->i_sb;

	int ret = VM_FAULT_NOPAGE;

	loff_t size;

	int ret;



	sb_start_pagefault(sb);

	file_update_time(vma->vm_file);
@@ -300,6 +300,8 @@ static int ext4_dax_pfn_mkwrite(struct vm_area_struct *vma, 
	size = (i_size_read(inode) + PAGE_SIZE - 1) >> PAGE_SHIFT;

	if (vmf->pgoff >= size)

		ret = VM_FAULT_SIGBUS;

	else

		ret = dax_pfn_mkwrite(vma, vmf);

	up_read(&EXT4_I(inode)->i_mmap_sem);

	sb_end_pagefault(sb);