patch-2.3.99-pre6 linux/fs/sysv/namei.c

• Lines: 21
• Date: Mon Apr 24 18:56:33 2000
• Orig file: v2.3.99-pre5/linux/fs/sysv/namei.c
• Orig date: Fri Mar 10 16:40:48 2000

diff -u --recursive --new-file v2.3.99-pre5/linux/fs/sysv/namei.c linux/fs/sysv/namei.c
@@ -389,10 +389,6 @@
 		retval = -ENOTEMPTY;
 		goto end_rmdir;
 	}
-	if (!d_unhashed(dentry)) {
-		retval = -EBUSY;
-		goto end_rmdir;
-	}
 	if (inode->i_nlink != 2)
 		printk("empty directory has nlink!=2 (%d)\n", inode->i_nlink);
 	de->inode = 0;
@@ -552,9 +548,6 @@
 	}
 	if (S_ISDIR(old_inode->i_mode)) {
 		if (new_inode) {
-			retval = -EBUSY;
-			if (!d_unhashed(new_dentry))
-				goto end_rename;
 			retval = -ENOTEMPTY;
 			if (!empty_dir(new_inode))
 				goto end_rename;