diff options
author | Ross Zwisler <ross.zwisler@linux.intel.com> | 2016-01-22 18:10:53 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-22 20:02:18 -0500 |
commit | d5be7a03b002a0faec136687ec03dbee6c579930 (patch) | |
tree | 607b4fc65083d8d33f334b543e509d8c00bc9407 /fs | |
parent | 80b4adcafc076d4179431656b7e83afea99ddec8 (diff) |
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: Ross 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/ext4/file.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/ext4/file.c b/fs/ext4/file.c index 749b222e6498..8c8965cc4aab 100644 --- a/fs/ext4/file.c +++ b/fs/ext4/file.c | |||
@@ -291,8 +291,8 @@ static int ext4_dax_pfn_mkwrite(struct vm_area_struct *vma, | |||
291 | { | 291 | { |
292 | struct inode *inode = file_inode(vma->vm_file); | 292 | struct inode *inode = file_inode(vma->vm_file); |
293 | struct super_block *sb = inode->i_sb; | 293 | struct super_block *sb = inode->i_sb; |
294 | int ret = VM_FAULT_NOPAGE; | ||
295 | loff_t size; | 294 | loff_t size; |
295 | int ret; | ||
296 | 296 | ||
297 | sb_start_pagefault(sb); | 297 | sb_start_pagefault(sb); |
298 | file_update_time(vma->vm_file); | 298 | file_update_time(vma->vm_file); |
@@ -300,6 +300,8 @@ static int ext4_dax_pfn_mkwrite(struct vm_area_struct *vma, | |||
300 | size = (i_size_read(inode) + PAGE_SIZE - 1) >> PAGE_SHIFT; | 300 | size = (i_size_read(inode) + PAGE_SIZE - 1) >> PAGE_SHIFT; |
301 | if (vmf->pgoff >= size) | 301 | if (vmf->pgoff >= size) |
302 | ret = VM_FAULT_SIGBUS; | 302 | ret = VM_FAULT_SIGBUS; |
303 | else | ||
304 | ret = dax_pfn_mkwrite(vma, vmf); | ||
303 | up_read(&EXT4_I(inode)->i_mmap_sem); | 305 | up_read(&EXT4_I(inode)->i_mmap_sem); |
304 | sb_end_pagefault(sb); | 306 | sb_end_pagefault(sb); |
305 | 307 | ||