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

• Lines: 19
• Date: Tue Dec 1 22:50:54 1998
• Orig file: v2.1.130/linux/fs/qnx4/namei.c
• Orig date: Sat Sep 5 16:46:41 1998

diff -u --recursive --new-file v2.1.130/linux/fs/qnx4/namei.c linux/fs/qnx4/namei.c
@@ -199,7 +199,7 @@
 		goto end_rmdir;
 	}
 #endif
-	if (dentry->d_count > 1) {
+	if (!list_empty(&dentry->d_hash)) {
 		retval = -EBUSY;
 		goto end_rmdir;
 	}
@@ -245,9 +245,6 @@
 		goto end_unlink;
 	}
 	retval = -EPERM;
-	if (S_ISDIR(inode->i_mode)) {
-		goto end_unlink;
-	}
 	if ((dir->i_mode & S_ISVTX) &&
 	    current->fsuid != inode->i_uid &&
 	    current->fsuid != dir->i_uid && !capable(CAP_FOWNER)) {