From 9083c59a9184e1798877136b57e2e497f6866299 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Thu, 28 Feb 2013 01:29:48 -0500
Subject: [PATCH] --- yaml --- r: 360720 b: refs/heads/master c:
 a3b2157e72e321fa313389ac744bbf6d6cb6986d h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 57d42c1725e3..64b870698e07 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b5be621993567d39f09a5190c4d651241be296f
+refs/heads/master: a3b2157e72e321fa313389ac744bbf6d6cb6986d
diff --git a/trunk/fs/9p/vfs_inode.c b/trunk/fs/9p/vfs_inode.c
index 80ff01bcae3d..d86edc8d3fd0 100644
--- a/trunk/fs/9p/vfs_inode.c
+++ b/trunk/fs/9p/vfs_inode.c
@@ -824,7 +824,6 @@ struct dentry *v9fs_vfs_lookup(struct inode *dir, struct dentry *dentry,
 		p9_client_clunk(fid);
 		return ERR_CAST(inode);
 	}
-	v9fs_fid_add(dentry, fid);
 	/*
 	 * If we had a rename on the server and a parallel lookup
 	 * for the new name, then make sure we instantiate with
@@ -833,7 +832,11 @@ struct dentry *v9fs_vfs_lookup(struct inode *dir, struct dentry *dentry,
 	 * k/b.
 	 */
 	res = d_materialise_unique(dentry, inode);
-	if (IS_ERR(res))
+	if (!res)
+		v9fs_fid_add(dentry, fid);
+	else if (!IS_ERR(res))
+		v9fs_fid_add(res, fid);
+	else
 		p9_client_clunk(fid);
 	return res;
 }