summaryrefslogtreecommitdiffstats
path: root/fs/bfs/dir.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-06-15 01:55:58 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-06-15 01:55:58 +0000
commit53b3988d474435254a3b053a68bb24ce9e439295 (patch)
treef8da8e40f01f4ad02bbd76b8c9920749b118235f /fs/bfs/dir.c
parentb0cb48abe83d1a4389ea938bf624f8baa82c5047 (diff)
Merge with 2.3.99-pre9.
Diffstat (limited to 'fs/bfs/dir.c')
-rw-r--r--fs/bfs/dir.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/fs/bfs/dir.c b/fs/bfs/dir.c
index 38881a1b6..bd8be88c3 100644
--- a/fs/bfs/dir.c
+++ b/fs/bfs/dir.c
@@ -32,11 +32,6 @@ static int bfs_readdir(struct file * f, void * dirent, filldir_t filldir)
unsigned int offset;
int block;
- if (!dir || !dir->i_sb || !S_ISDIR(dir->i_mode)) {
- printf("Bad inode or not a directory %s:%08lx\n", bdevname(dev), dir->i_ino);
- return -EBADF;
- }
-
if (f->f_pos & (BFS_DIRENT_SIZE-1)) {
printf("Bad f_pos=%08lx for %s:%08lx\n", (unsigned long)f->f_pos,
bdevname(dev), dir->i_ino);
@@ -188,7 +183,6 @@ static int bfs_unlink(struct inode * dir, struct dentry * dentry)
inode->i_nlink--;
inode->i_ctime = dir->i_ctime;
mark_inode_dirty(inode);
- d_delete(dentry);
error = 0;
out_brelse: