3 files changed, 9 insertions, 6 deletions

diff --git a/fs/buffer.c b/fs/buffer.c
index 9f6d2e41281..1fe3968357a 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -2318,12 +2318,6 @@ int __block_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf,
         loff_t size;
         int ret;
 
-        /*
-         * Update file times before taking page lock. We may end up failing the
-         * fault so this update may be superfluous but who really cares...
-         */
-        file_update_time(vma->vm_file);
-
         lock_page(page);
         size = i_size_read(inode);
         if ((page->mapping != inode->i_mapping) ||
@@ -2361,6 +2355,13 @@ int block_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf,
         struct super_block *sb = vma->vm_file->f_path.dentry->d_inode->i_sb;
 
         sb_start_pagefault(sb);
+
+        /*
+         * Update file times before taking page lock. We may end up failing the
+         * fault so this update may be superfluous but who really cares...
+         */
+        file_update_time(vma->vm_file);
+
         ret = __block_page_mkwrite(vma, vmf, get_block);
         sb_end_pagefault(sb);
         return block_page_mkwrite_return(ret);
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 09308ad0f31..f18e786e87b 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -4788,6 +4788,7 @@ int ext4_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
         int retries = 0;
 
         sb_start_pagefault(inode->i_sb);
+        file_update_time(vma->vm_file);
         /* Delalloc case is easy... */
         if (test_opt(inode->i_sb, DELALLOC) &&
             !ext4_should_journal_data(inode) &&
diff --git a/fs/nilfs2/file.c b/fs/nilfs2/file.c
index a4d56ac02e6..5b387a4c293 100644
--- a/fs/nilfs2/file.c
+++ b/fs/nilfs2/file.c
@@ -116,6 +116,7 @@ static int nilfs_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
         if (unlikely(ret))
                 goto out;
 
+        file_update_time(vma->vm_file);
         ret = __block_page_mkwrite(vma, vmf, nilfs_get_block);
         if (ret) {
                 nilfs_transaction_abort(inode->i_sb);