From 5da5d4b5d835c7075cc29ea09d71ec571a6addc7 Mon Sep 17 00:00:00 2001
From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
Date: Mon, 28 Feb 2011 17:03:55 +0530
Subject: [PATCH] --- yaml --- r: 235020 b: refs/heads/master c:
 46848de0249470e50d87af6d7f9d41cdff3e43f5 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/fs/9p/vfs_file.c       | 4 +---
 trunk/fs/9p/vfs_inode.c      | 4 ++++
 trunk/fs/9p/vfs_inode_dotl.c | 4 ++++
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index d73262195263..2ecf6698be6d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 29236f4e18dde0c772968b6ce965d0365fe3fe4e
+refs/heads/master: 46848de0249470e50d87af6d7f9d41cdff3e43f5
diff --git a/trunk/fs/9p/vfs_file.c b/trunk/fs/9p/vfs_file.c
index 6a671000263f..ce1eae48a127 100644
--- a/trunk/fs/9p/vfs_file.c
+++ b/trunk/fs/9p/vfs_file.c
@@ -87,10 +87,8 @@ int v9fs_file_open(struct inode *inode, struct file *file)
 
 	file->private_data = fid;
 #ifdef CONFIG_9P_FSCACHE
-	if ((fid->qid.version) && (v9ses->cache)) {
-		P9_DPRINTK(P9_DEBUG_VFS, "cached");
+	if (v9ses->cache)
 		v9fs_cache_inode_set_cookie(inode, file);
-	}
 #endif
 	return 0;
 }
diff --git a/trunk/fs/9p/vfs_inode.c b/trunk/fs/9p/vfs_inode.c
index 83af2b7e65db..95f55011aca1 100644
--- a/trunk/fs/9p/vfs_inode.c
+++ b/trunk/fs/9p/vfs_inode.c
@@ -608,6 +608,10 @@ v9fs_vfs_create(struct inode *dir, struct dentry *dentry, int mode,
 		}
 
 		filp->private_data = fid;
+#ifdef CONFIG_9P_FSCACHE
+		if (v9ses->cache)
+			v9fs_cache_inode_set_cookie(dentry->d_inode, filp);
+#endif
 	} else
 		p9_client_clunk(fid);
 
diff --git a/trunk/fs/9p/vfs_inode_dotl.c b/trunk/fs/9p/vfs_inode_dotl.c
index fe3ffa9aace4..fbe957268f05 100644
--- a/trunk/fs/9p/vfs_inode_dotl.c
+++ b/trunk/fs/9p/vfs_inode_dotl.c
@@ -226,6 +226,10 @@ v9fs_vfs_create_dotl(struct inode *dir, struct dentry *dentry, int omode,
 		return PTR_ERR(filp);
 	}
 	filp->private_data = ofid;
+#ifdef CONFIG_9P_FSCACHE
+	if (v9ses->cache)
+		v9fs_cache_inode_set_cookie(inode, filp);
+#endif
 	return 0;
 
 error: