diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2012-01-27 22:14:58 +0400 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2012-03-25 03:29:52 +0400 |
| commit | 3ee6bd8e8dc0c58b9ba5bab7ef8a7a131da346eb (patch) | |
| tree | b1050db82803495116ac255a2b6c755622bd1044 /fs/hostfs/hostfs_kern.c | |
| parent | c0b79a90b1556a7e51d7a49a655eb60306f6258d (diff) | |
| download | linux-3ee6bd8e8dc0c58b9ba5bab7ef8a7a131da346eb.tar.xz | |
uml/hostfs: Propagate dirent.d_type to filldir()
Currently the (optional) d_type member in struct dirent is always
DT_UNKNOWN on hostfs, which may confuse buggy software using readdir().
Make sure to propagate its value from the underlying filesystem if it's
available there.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'fs/hostfs/hostfs_kern.c')
| -rw-r--r-- | fs/hostfs/hostfs_kern.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c index e130bd46d671..dc4222bd6e77 100644 --- a/fs/hostfs/hostfs_kern.c +++ b/fs/hostfs/hostfs_kern.c @@ -283,6 +283,7 @@ int hostfs_readdir(struct file *file, void *ent, filldir_t filldir) char *name; unsigned long long next, ino; int error, len; + unsigned int type; name = dentry_name(file->f_path.dentry); if (name == NULL) @@ -292,9 +293,9 @@ int hostfs_readdir(struct file *file, void *ent, filldir_t filldir) if (dir == NULL) return -error; next = file->f_pos; - while ((name = read_dir(dir, &next, &ino, &len)) != NULL) { + while ((name = read_dir(dir, &next, &ino, &len, &type)) != NULL) { error = (*filldir)(ent, name, len, file->f_pos, - ino, DT_UNKNOWN); + ino, type); if (error) break; file->f_pos = next; } |