lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Deal with missing exports for hostfs

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro
2009-04-21 01:27:08 -04:00
parent 51102ee5b8
commit 005a59ec74
5 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/um/include/shared/os.h
View File

@@ -161,6 +161,9 @@ extern int os_stat_filesystem(char *path, long *bsize_out,
long *spare_out); long *spare_out);
extern int os_change_dir(char *dir); extern int os_change_dir(char *dir);
extern int os_fchange_dir(int fd); 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 */ /* start_up.c */
extern void os_early_checks(void); extern void os_early_checks(void);

3
arch/um/kernel/ksyms.c
View File

@@ -58,6 +58,9 @@ EXPORT_SYMBOL(os_accept_connection);
EXPORT_SYMBOL(os_rcv_fd); EXPORT_SYMBOL(os_rcv_fd);
EXPORT_SYMBOL(run_helper); EXPORT_SYMBOL(run_helper);
EXPORT_SYMBOL(start_thread); EXPORT_SYMBOL(start_thread);
EXPORT_SYMBOL(os_major);
EXPORT_SYMBOL(os_minor);
EXPORT_SYMBOL(os_makedev);
EXPORT_SYMBOL(add_sigio_fd); EXPORT_SYMBOL(add_sigio_fd);
EXPORT_SYMBOL(ignore_sigio_fd); EXPORT_SYMBOL(ignore_sigio_fd);

15
arch/um/os-Linux/file.c
View File

@@ -561,3 +561,18 @@ int os_lock_file(int fd, int excl)
out: out:
return err; 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);
}

4
arch/um/os-Linux/user_syms.c
View File

@@ -103,6 +103,10 @@ EXPORT_SYMBOL_PROTO(getuid);
EXPORT_SYMBOL_PROTO(fsync); EXPORT_SYMBOL_PROTO(fsync);
EXPORT_SYMBOL_PROTO(fdatasync); 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. */ /* Export symbols used by GCC for the stack protector. */
extern void __stack_smash_handler(void *) __attribute__((weak)); extern void __stack_smash_handler(void *) __attribute__((weak));
EXPORT_SYMBOL(__stack_smash_handler); EXPORT_SYMBOL(__stack_smash_handler);

6
fs/hostfs/hostfs_user.c
View File

@@ -76,9 +76,9 @@ int file_type(const char *path, int *maj, int *min)
* about its definition. * about its definition.
*/ */
if (maj != NULL) if (maj != NULL)
*maj = major(buf.st_rdev); *maj = os_major(buf.st_rdev);
if (min != NULL) if (min != NULL)
*min = minor(buf.st_rdev); *min = os_minor(buf.st_rdev);
if (S_ISDIR(buf.st_mode)) if (S_ISDIR(buf.st_mode))
return OS_TYPE_DIR; return OS_TYPE_DIR;
@@ -361,7 +361,7 @@ int do_mknod(const char *file, int mode, unsigned int major, unsigned int minor)
{ {
int err; int err;
err = mknod(file, mode, makedev(major, minor)); err = mknod(file, mode, os_makedev(major, minor));
if (err) if (err)
return -errno; return -errno;
return 0; return 0;