From 143e0c72bab3bd9fe373a9fdd056c478ff6de025 Mon Sep 17 00:00:00 2001
From: Jan Kara <jack@suse.cz>
Date: Tue, 12 Jun 2012 16:20:26 +0200
Subject: [PATCH] --- yaml --- r: 320974 b: refs/heads/master c:
 a63e9b2e76632b3ccb0f33f43484c0c64d601849 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/fs/gfs2/file.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7cb6d31619f0..37a3eacceb5b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 120c2bcad80c0f7c6691ad70f7fb1e709854d725
+refs/heads/master: a63e9b2e76632b3ccb0f33f43484c0c64d601849
diff --git a/trunk/fs/gfs2/file.c b/trunk/fs/gfs2/file.c
index 31b199f6efc1..07959150d44e 100644
--- a/trunk/fs/gfs2/file.c
+++ b/trunk/fs/gfs2/file.c
@@ -376,6 +376,9 @@ static int gfs2_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
 	 */
 	vfs_check_frozen(inode->i_sb, SB_FREEZE_WRITE);
 
+	/* Update file times before taking page lock */
+	file_update_time(vma->vm_file);
+
 	gfs2_holder_init(ip->i_gl, LM_ST_EXCLUSIVE, 0, &gh);
 	ret = gfs2_glock_nq(&gh);
 	if (ret)