diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
| commit | 78c388aed2b7184182c08428db1de6c872d815f5 (patch) | |
| tree | 4b2003b1b4ceb241a17faa995da8dd1004bb8e45 /fs/qnx4/namei.c | |
| parent | eb7a5bf93aaa4be1d7c6181100ab7639e74d67f7 (diff) | |
Merge with Linux 2.1.131 and more MIPS goodies.
(Did I mention that CVS is buggy ...)
Diffstat (limited to 'fs/qnx4/namei.c')
| -rw-r--r-- | fs/qnx4/namei.c | 5 |
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)) { |