From 1dd1d6d49e81906391b1edbaab977bc18081e87e Mon Sep 17 00:00:00 2001
From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
Date: Fri, 14 May 2010 13:04:39 +0000
Subject: [PATCH] --- yaml --- r: 198101 b: refs/heads/master c:
 85e0df240e9376ff58eb1a50d9854f5f176dd297 h: refs/heads/master i:   198099:
 d39e1e29e632872e3dea026845ccbeda4c9323df v: v3

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

diff --git a/[refs] b/[refs]
index cf7f6008ea10..d4f32afab818 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4681dbdacb5cdc4d3273c3a97a1858d6e00a5fe7
+refs/heads/master: 85e0df240e9376ff58eb1a50d9854f5f176dd297
diff --git a/trunk/fs/9p/vfs_inode.c b/trunk/fs/9p/vfs_inode.c
index de9a39590b70..b44c99979143 100644
--- a/trunk/fs/9p/vfs_inode.c
+++ b/trunk/fs/9p/vfs_inode.c
@@ -697,8 +697,8 @@ static struct dentry *v9fs_vfs_lookup(struct inode *dir, struct dentry *dentry,
 	if (IS_ERR(fid)) {
 		result = PTR_ERR(fid);
 		if (result == -ENOENT) {
-			d_add(dentry, NULL);
-			return NULL;
+			inode = NULL;
+			goto inst_out;
 		}
 
 		return ERR_PTR(result);
@@ -715,7 +715,8 @@ static struct dentry *v9fs_vfs_lookup(struct inode *dir, struct dentry *dentry,
 	if (result < 0)
 		goto error;
 
-	if ((fid->qid.version) && (v9ses->cache))
+inst_out:
+	if (v9ses->cache)
 		dentry->d_op = &v9fs_cached_dentry_operations;
 	else
 		dentry->d_op = &v9fs_dentry_operations;