From 6d0381bee244d4a8177b94eb639a904fb0199ddc Mon Sep 17 00:00:00 2001
From: Jan Kara <jack@suse.cz>
Date: Tue, 12 Jun 2012 16:20:23 +0200
Subject: [PATCH] --- yaml --- r: 320971 b: refs/heads/master c:
 5e8830dc85d0a6258132977381430b327cf553f2 h: refs/heads/master i:   320969:
 f742a12e59d688a676d623f15e27d799b270ee3b   320967:
 3a598112c1f0e22feda06537efb2053e7504905e v: v3

---
 [refs]            | 2 +-
 trunk/fs/buffer.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 11dd9d40f6ee..a4fdb6728daa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 183fef91cd06ab32c379d217c816bb6607133642
+refs/heads/master: 5e8830dc85d0a6258132977381430b327cf553f2
diff --git a/trunk/fs/buffer.c b/trunk/fs/buffer.c
index c7062c896d7c..d5ec360e332d 100644
--- a/trunk/fs/buffer.c
+++ b/trunk/fs/buffer.c
@@ -2318,6 +2318,12 @@ 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) ||