summaryrefslogtreecommitdiffstats
path: root/fs/adfs
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-08-28 22:00:09 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-08-28 22:00:09 +0000
commit1a1d77dd589de5a567fa95e36aa6999c704ceca4 (patch)
tree141e31f89f18b9fe0831f31852e0435ceaccafc5 /fs/adfs
parentfb9c690a18b3d66925a65b17441c37fa14d4370b (diff)
Merge with 2.4.0-test7.
Diffstat (limited to 'fs/adfs')
-rw-r--r--fs/adfs/dir.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/adfs/dir.c b/fs/adfs/dir.c
index 21a277344..b650f421f 100644
--- a/fs/adfs/dir.c
+++ b/fs/adfs/dir.c
@@ -40,12 +40,12 @@ adfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
switch ((unsigned long)filp->f_pos) {
case 0:
- if (filldir(dirent, ".", 1, 0, inode->i_ino) < 0)
+ if (filldir(dirent, ".", 1, 0, inode->i_ino, DT_DIR) < 0)
goto free_out;
filp->f_pos += 1;
case 1:
- if (filldir(dirent, "..", 2, 1, dir.parent_id) < 0)
+ if (filldir(dirent, "..", 2, 1, dir.parent_id, DT_DIR) < 0)
goto free_out;
filp->f_pos += 1;
@@ -60,7 +60,7 @@ adfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
goto unlock_out;
while (ops->getnext(&dir, &obj) == 0) {
if (filldir(dirent, obj.name, obj.name_len,
- filp->f_pos, obj.file_id) < 0)
+ filp->f_pos, obj.file_id, DT_UNKNOWN) < 0)
goto unlock_out;
filp->f_pos += 1;
}