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/minix/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/minix/namei.c')
| -rw-r--r-- | fs/minix/namei.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/minix/namei.c b/fs/minix/namei.c index 17ff53aed..ad2211d25 100644 --- a/fs/minix/namei.c +++ b/fs/minix/namei.c @@ -88,7 +88,7 @@ static int minix_hash(struct dentry *dentry, struct qstr *qstr) { unsigned long hash; int i; - const char *name; + const unsigned char *name; i = dentry->d_inode->i_sb->u.minix_sb.s_namelen; if (i >= qstr->len) @@ -452,7 +452,7 @@ int minix_rmdir(struct inode * dir, struct dentry *dentry) 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 @@ repeat: 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; |