Deal with missing exports for hostfs

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/arch/um/include/shared/os.h b/arch/um/include/shared/os.h
index cd40fddcf99df8fcf4a583d5c8fe05314d27077c..c4617baaa4f2752a84a3cb20fa517e326e5ebaa7 100644 (file)
--- a/arch/um/include/shared/os.h
+++ b/arch/um/include/shared/os.h
@@ -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);

diff --git a/arch/um/kernel/ksyms.c b/arch/um/kernel/ksyms.c
index 836fc9b9470717dcbe81bc8cabe0e1261892dd7b..0ae0dfcfbffbbc76fdc49dcdf14dfd0ca246744e 100644 (file)
--- a/arch/um/kernel/ksyms.c
+++ b/arch/um/kernel/ksyms.c
@@ -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);

diff --git a/arch/um/os-Linux/file.c b/arch/um/os-Linux/file.c
index b5afcfd0f8611dedd72bd3c58defddcd1e647035..140e587bc0adedf23debeb7183ad24c0c49d9267 100644 (file)
--- a/arch/um/os-Linux/file.c
+++ b/arch/um/os-Linux/file.c
@@ -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);
+}

diff --git a/arch/um/os-Linux/user_syms.c b/arch/um/os-Linux/user_syms.c
index 89b48a116a89b0807f77929c752366eee6ecb4fc..05f5ea8e83d2ab211e4dfc27b6be2a458da59e74 100644 (file)
--- a/arch/um/os-Linux/user_syms.c
+++ b/arch/um/os-Linux/user_syms.c
@@ -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);

diff --git a/fs/hostfs/hostfs_user.c b/fs/hostfs/hostfs_user.c
index b79424f9328298e60bdae763ffd85669d1d96214..4b8c666ba28f5a29b6ede422fa02de5de85ae583 100644 (file)
--- a/fs/hostfs/hostfs_user.c
+++ b/fs/hostfs/hostfs_user.c
@@ -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;