Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/gcc-branch' into gcc-branch

This commit is contained in:
Brian Behlendorf 2008-12-05 09:34:09 -08:00
parent d920e6403a 82e0ed26f9
commit a36e20de29
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zfs/lib/libspl/include/sys/zfs_context.h
View File

@ -195,7 +195,7 @@ typedef struct kthread kthread_t;
zk_thread_create(func, arg)
#define thread_exit() thr_exit(NULL)
extern kthread_t *zk_thread_create(void (*func)(), void *arg);
extern kthread_t *zk_thread_create(void (*func)(void), void *arg);
#define issig(why) (FALSE)
#define ISSIG(thr, why) (FALSE)

4
zfs/lib/libzfs/libzfs_mount.c
View File

@ -93,7 +93,7 @@ zfs_share_type_t zfs_is_shared_proto(zfs_handle_t *, char **,
static int (*iscsitgt_zfs_share)(const char *);
static int (*iscsitgt_zfs_unshare)(const char *);
static int (*iscsitgt_zfs_is_shared)(const char *);
static int (*iscsitgt_svc_online)();
static int (*iscsitgt_svc_online)(void);
/*
* The share protocols table must be in the same order as the zfs_share_prot_t
@ -146,7 +146,7 @@ zfs_iscsi_init(void)
"iscsitgt_zfs_unshare")) == NULL ||
(iscsitgt_zfs_is_shared = (int (*)(const char *))dlsym(libiscsitgt,
"iscsitgt_zfs_is_shared")) == NULL ||
(iscsitgt_svc_online = (int (*)(const char *))dlsym(libiscsitgt,
(iscsitgt_svc_online = (int (*)(void))dlsym(libiscsitgt,
"iscsitgt_svc_online")) == NULL) {
iscsitgt_zfs_share = NULL;
iscsitgt_zfs_unshare = NULL;

2
zfs/lib/libzpool/include/sys/spa.h
View File

@ -522,7 +522,7 @@ extern void vdev_cache_stat_fini(void);
/* Initialization and termination */
extern void spa_init(int flags);
extern void spa_fini(void);
extern void spa_boot_init();
extern void spa_boot_init(void);
/* properties */
extern int spa_prop_set(spa_t *spa, nvlist_t *nvp);

4
zfs/lib/libzpool/include/sys/zfs_znode.h
View File

@ -305,8 +305,8 @@ extern int zfs_rezget(znode_t *);
extern void zfs_zinactive(znode_t *);
extern void zfs_znode_delete(znode_t *, dmu_tx_t *);
extern void zfs_znode_free(znode_t *);
extern void zfs_remove_op_tables();
extern int zfs_create_op_tables();
extern void zfs_remove_op_tables(void);
extern int zfs_create_op_tables(void);
extern int zfs_sync(vfs_t *vfsp, short flag, cred_t *cr);
extern dev_t zfs_cmpldev(uint64_t);
extern int zfs_get_zplprop(objset_t *os, zfs_prop_t prop, uint64_t *value);

2
zfs/lib/libzpool/spa_history.c
View File

@ -176,7 +176,7 @@ spa_history_write(spa_t *spa, void *buf, uint64_t len, spa_history_phys_t *shpp,
}
static char *
spa_history_zone()
spa_history_zone(void)
{
#ifdef _KERNEL
return (curproc->p_zone->zone_name);

2
zfs/lib/libzpool/spa_misc.c
View File

@ -1329,7 +1329,7 @@ spa_busy(void)
}
void
spa_boot_init()
spa_boot_init(void)
{
spa_config_load();
}