From 31128a4d6c6024dd4b8be9b8ee0302cb59ce1ba1 Mon Sep 17 00:00:00 2001
From: Jan Kara <jack@suse.cz>
Date: Tue, 12 Jun 2012 16:20:25 +0200
Subject: [PATCH] --- yaml --- r: 320973 b: refs/heads/master c:
 120c2bcad80c0f7c6691ad70f7fb1e709854d725 h: refs/heads/master i:   320971:
 6d0381bee244d4a8177b94eb639a904fb0199ddc v: v3

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

diff --git a/[refs] b/[refs]
index eb6dba035e8c..7cb6d31619f0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ca9c3bd8a55956bee291cda5b224f737b0d0cfe
+refs/heads/master: 120c2bcad80c0f7c6691ad70f7fb1e709854d725
diff --git a/trunk/fs/9p/vfs_file.c b/trunk/fs/9p/vfs_file.c
index fc06fd27065e..dd6f7ee1e312 100644
--- a/trunk/fs/9p/vfs_file.c
+++ b/trunk/fs/9p/vfs_file.c
@@ -610,6 +610,9 @@ v9fs_vm_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
 	p9_debug(P9_DEBUG_VFS, "page %p fid %lx\n",
 		 page, (unsigned long)filp->private_data);
 
+	/* Update file times before taking page lock */
+	file_update_time(filp);
+
 	v9inode = V9FS_I(inode);
 	/* make sure the cache has finished storing the page */
 	v9fs_fscache_wait_on_page_write(inode, page);