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

Commit 005a59ec authored by Al Viro's avatar Al Viro
Browse files

Deal with missing exports for hostfs 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 51102ee5

arch/um/include/shared/os.h

+3 −0
Original line number Diff line number Diff line
@@ -161,6 +161,9 @@ extern int os_stat_filesystem(char *path, long *bsize_out, 
			      long *spare_out);

extern int os_change_dir(char *dir);

extern int os_fchange_dir(int fd);

extern unsigned os_major(unsigned long long dev);

extern unsigned os_minor(unsigned long long dev);

extern unsigned long long os_makedev(unsigned major, unsigned minor);



/* start_up.c */

extern void os_early_checks(void);

arch/um/kernel/ksyms.c

+3 −0
Original line number Diff line number Diff line
@@ -58,6 +58,9 @@ EXPORT_SYMBOL(os_accept_connection); 
EXPORT_SYMBOL(os_rcv_fd);

EXPORT_SYMBOL(run_helper);

EXPORT_SYMBOL(start_thread);

EXPORT_SYMBOL(os_major);

EXPORT_SYMBOL(os_minor);

EXPORT_SYMBOL(os_makedev);



EXPORT_SYMBOL(add_sigio_fd);

EXPORT_SYMBOL(ignore_sigio_fd);

arch/um/os-Linux/file.c

+15 −0
Original line number Diff line number Diff line
@@ -561,3 +561,18 @@ int os_lock_file(int fd, int excl) 
 out:

	return err;

}



unsigned os_major(unsigned long long dev)

{

	return major(dev);

}



unsigned os_minor(unsigned long long dev)

{

	return minor(dev);

}



unsigned long long os_makedev(unsigned major, unsigned minor)

{

	return makedev(major, minor);

}

arch/um/os-Linux/user_syms.c

+4 −0
Original line number Diff line number Diff line
@@ -103,6 +103,10 @@ EXPORT_SYMBOL_PROTO(getuid); 
EXPORT_SYMBOL_PROTO(fsync);

EXPORT_SYMBOL_PROTO(fdatasync);



EXPORT_SYMBOL_PROTO(lstat64);

EXPORT_SYMBOL_PROTO(fstat64);

EXPORT_SYMBOL_PROTO(mknod);



/* Export symbols used by GCC for the stack protector. */

extern void __stack_smash_handler(void *) __attribute__((weak));

EXPORT_SYMBOL(__stack_smash_handler);

fs/hostfs/hostfs_user.c

+3 −3
Original line number Diff line number Diff line
@@ -76,9 +76,9 @@ int file_type(const char *path, int *maj, int *min) 
	 * about its definition.

	 */

	if (maj != NULL)

		*maj = major(buf.st_rdev);

		*maj = os_major(buf.st_rdev);

	if (min != NULL)

		*min = minor(buf.st_rdev);

		*min = os_minor(buf.st_rdev);



	if (S_ISDIR(buf.st_mode))

		return OS_TYPE_DIR;
@@ -361,7 +361,7 @@ int do_mknod(const char *file, int mode, unsigned int major, unsigned int minor) 
{

	int err;



	err = mknod(file, mode, makedev(major, minor));

	err = mknod(file, mode, os_makedev(major, minor));

	if (err)

		return -errno;

	return 0;