patch-2.1.131 linux/fs/minix/namei.c

• Lines: 18
• Date: Tue Dec 1 22:51:46 1998
• Orig file: v2.1.130/linux/fs/minix/namei.c
• Orig date: Mon Sep 28 10:51:34 1998

diff -u --recursive --new-file v2.1.130/linux/fs/minix/namei.c linux/fs/minix/namei.c
@@ -452,7 +452,7 @@
 		retval = -ENOENT;
 		goto end_rmdir;
 	}
-	if (dentry->d_count > 1) {
+	if (!list_empty(&dentry->d_hash)) {
 		retval = -EBUSY;
 		goto end_rmdir;
 	}
@@ -490,8 +490,6 @@
 	inode = dentry->d_inode;
 
 	retval = -EPERM;
-	if (S_ISDIR(inode->i_mode))
-		goto end_unlink;
 	if (de->inode != inode->i_ino) {
 		brelse(bh);
 		current->counter = 0;