---

yaml --- r: 175951 b: refs/heads/master c: 24e9302 h: refs/heads/master i: 175949: a14c607 175947: 8605d71 175943: d2aebbb 175935: 9942f68 v: v3
git-mirror · Dec 3, 2009 · 5e8016a · 5e8016a
1 parent 610504b
commit 5e8016a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 27226104e60964f21717e0f452cecd45c85a64c6
+refs/heads/master: 24e93025ee434a58d35e5abb283c5bcc9a13e477
diff --git a/trunk/fs/nfs/dir.c b/trunk/fs/nfs/dir.c
@@ -1611,14 +1611,11 @@ static int nfs_rename(struct inode *old_dir, struct dentry *old_dentry,
 
 			/* silly-rename the existing target ... */
 			err = nfs_sillyrename(new_dir, new_dentry);
-			if (!err) {
-				new_dentry = rehash = dentry;
-				new_inode = NULL;
-				/* instantiate the replacement target */
-				d_instantiate(new_dentry, NULL);
-			} else if (atomic_read(&new_dentry->d_count) > 1)
-				/* dentry still busy? */
+			if (err)
 				goto out;
+
+			new_dentry = dentry;
+			new_inode = NULL;
 		}
 	}