summaryrefslogtreecommitdiffstats
path: root/fs/qnx4/namei.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/qnx4/namei.c')
-rw-r--r--fs/qnx4/namei.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/qnx4/namei.c b/fs/qnx4/namei.c
index 99cbf05eb..9c6617f50 100644
--- a/fs/qnx4/namei.c
+++ b/fs/qnx4/namei.c
@@ -199,7 +199,7 @@ int qnx4_rmdir(struct inode *dir, struct dentry *dentry)
goto end_rmdir;
}
#endif
- if (dentry->d_count > 1) {
+ if (!list_empty(&dentry->d_hash)) {
retval = -EBUSY;
goto end_rmdir;
}
@@ -245,9 +245,6 @@ int qnx4_unlink(struct inode *dir, struct dentry *dentry)
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)) {