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;