Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ee6bd8e authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Richard Weinberger
Browse files

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: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent c0b79a90

fs/hostfs/hostfs.h

+2 −1
Original line number Diff line number Diff line
@@ -67,7 +67,8 @@ extern int access_file(char *path, int r, int w, int x); 
extern int open_file(char *path, int r, int w, int append);

extern void *open_dir(char *path, int *err_out);

extern char *read_dir(void *stream, unsigned long long *pos,

		      unsigned long long *ino_out, int *len_out);

		      unsigned long long *ino_out, int *len_out,

		      unsigned int *type_out);

extern void close_file(void *stream);

extern int replace_file(int oldfd, int fd);

extern void close_dir(void *stream);

fs/hostfs/hostfs_kern.c

+3 −2
Original line number Diff line number Diff line
@@ -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;

	}

fs/hostfs/hostfs_user.c

+3 −1
Original line number Diff line number Diff line
@@ -98,7 +98,8 @@ void *open_dir(char *path, int *err_out) 
}



char *read_dir(void *stream, unsigned long long *pos,

	       unsigned long long *ino_out, int *len_out)

	       unsigned long long *ino_out, int *len_out,

	       unsigned int *type_out)

{

	DIR *dir = stream;

	struct dirent *ent;
@@ -109,6 +110,7 @@ char *read_dir(void *stream, unsigned long long *pos, 
		return NULL;

	*len_out = strlen(ent->d_name);

	*ino_out = ent->d_ino;

	*type_out = ent->d_type;

	*pos = telldir(dir);

	return ent->d_name;

}