From 16843443f62b7c4a3e3ece61c3eed4718a64a170 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Tue, 2 Oct 2007 21:58:05 -0400
Subject: [PATCH] --- yaml --- r: 69287 b: refs/heads/master c:
 9697d2342e1a480bc14921c52f185c2fe01016e7 h: refs/heads/master i:   69285:
 e9a4782b3a67a7f8a9781faac5e7482994ced4db   69283:
 2dabb89084b34919a86c889b6e89a023cab5aa9b   69279:
 7002894dc7a5c70fe6e059693facd040fb53a941 v: v3

---
 [refs]             | 2 +-
 trunk/fs/nfs/dir.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2587c928cd6b..273f52af9225 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a12802cab8520f86c9a80bbf87d10ee6171687d1
+refs/heads/master: 9697d2342e1a480bc14921c52f185c2fe01016e7
diff --git a/trunk/fs/nfs/dir.c b/trunk/fs/nfs/dir.c
index c2207e3f2634..d352509d7e2d 100644
--- a/trunk/fs/nfs/dir.c
+++ b/trunk/fs/nfs/dir.c
@@ -1506,10 +1506,11 @@ nfs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *dentry)
 		dentry->d_parent->d_name.name, dentry->d_name.name);
 
 	lock_kernel();
+	d_drop(dentry);
 	error = NFS_PROTO(dir)->link(inode, dir, &dentry->d_name);
 	if (error == 0) {
 		atomic_inc(&inode->i_count);
-		d_instantiate(dentry, inode);
+		d_add(dentry, inode);
 	}
 	unlock_kernel();
 	return error;