---

yaml --- r: 69287 b: refs/heads/master c: 9697d23 h: refs/heads/master i: 69285: e9a4782 69283: 2dabb89 69279: 7002894 v: v3
git-mirror · Oct 9, 2007 · 1684344 · 1684344
1 parent 7533816
commit 1684344
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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;