1 files changed, 7 insertions, 7 deletions

diff --git a/mm/memory.c b/mm/memory.c
index 2466d1250231..7c7fa7b4b6b6 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -2638,6 +2638,9 @@ reuse:
                 if (!page_mkwrite) {
                         wait_on_page_locked(dirty_page);
                         set_page_dirty_balance(dirty_page, page_mkwrite);
+                        /* file_update_time outside page_lock */
+                        if (vma->vm_file)
+                                file_update_time(vma->vm_file);
                 }
                 put_page(dirty_page);
                 if (page_mkwrite) {
@@ -2655,10 +2658,6 @@ reuse:
                         }
                 }
 
-                /* file_update_time outside page_lock */
-                if (vma->vm_file)
-                        file_update_time(vma->vm_file);
-
                 return ret;
         }
 
@@ -3327,12 +3326,13 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
 
         if (dirty_page) {
                 struct address_space *mapping = page->mapping;
+                int dirtied = 0;
 
                 if (set_page_dirty(dirty_page))
-                        page_mkwrite = 1;
+                        dirtied = 1;
                 unlock_page(dirty_page);
                 put_page(dirty_page);
-                if (page_mkwrite && mapping) {
+                if ((dirtied || page_mkwrite) && mapping) {
                         /*
                          * Some device drivers do not set page.mapping but still
                          * dirty their pages
@@ -3341,7 +3341,7 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
                 }
 
                 /* file_update_time outside page_lock */
-                if (vma->vm_file)
+                if (vma->vm_file && !page_mkwrite)
                         file_update_time(vma->vm_file);
         } else {
                 unlock_page(vmf.page);