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

Next file: linux/fs/namei.c
Previous file: linux/fs/minix/namei.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.99-pre5/linux/fs/msdos/namei.c linux/fs/msdos/namei.c
@@ -325,9 +325,6 @@
 	 * Check whether the directory is not in use, then check
 	 * whether it is empty.
 	 */
-	res = -EBUSY;
-	if (!d_unhashed(dentry))
-		goto rmdir_done;
 	res = fat_dir_empty(inode);
 	if (res)
 		goto rmdir_done;
@@ -463,9 +460,6 @@
 		goto degenerate_case;
 	if (is_dir) {
 		if (new_inode) {
-			error = -EBUSY;
-			if (!d_unhashed(new_dentry))
-				goto out;
 			error = fat_dir_empty(new_inode);
 			if (error)
 				goto out;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)