diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-28 22:00:09 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-28 22:00:09 +0000 |
| commit | 1a1d77dd589de5a567fa95e36aa6999c704ceca4 (patch) | |
| tree | 141e31f89f18b9fe0831f31852e0435ceaccafc5 /fs/devfs | |
| parent | fb9c690a18b3d66925a65b17441c37fa14d4370b (diff) | |
Merge with 2.4.0-test7.
Diffstat (limited to 'fs/devfs')
| -rw-r--r-- | fs/devfs/base.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/devfs/base.c b/fs/devfs/base.c index ad28db63a..3ffb8275e 100644 --- a/fs/devfs/base.c +++ b/fs/devfs/base.c @@ -2439,14 +2439,14 @@ static int devfs_readdir (struct file *file, void *dirent, filldir_t filldir) case 0: scan_dir_for_removable (parent); err = (*filldir) (dirent, "..", 2, file->f_pos, - file->f_dentry->d_parent->d_inode->i_ino); + file->f_dentry->d_parent->d_inode->i_ino, DT_DIR); if (err == -EINVAL) break; if (err < 0) return err; file->f_pos++; ++stored; /* Fall through */ case 1: - err = (*filldir) (dirent, ".", 1, file->f_pos, inode->i_ino); + err = (*filldir) (dirent, ".", 1, file->f_pos, inode->i_ino, DT_DIR); if (err == -EINVAL) break; if (err < 0) return err; file->f_pos++; @@ -2463,7 +2463,7 @@ static int devfs_readdir (struct file *file, void *dirent, filldir_t filldir) { if ( IS_HIDDEN (de) ) continue; err = (*filldir) (dirent, de->name, de->namelen, - file->f_pos, de->inode.ino); + file->f_pos, de->inode.ino, de->mode >> 12); if (err == -EINVAL) break; if (err < 0) return err; file->f_pos++; |