All of the sudden gcc 10 linker has found number of duplicate ZFS related symbols which this patch fixes: - g_zfs - aok - zfsdev_state
Signed-off-by: Waldemar Kozaczuk <[email protected]> --- bsd/cddl/contrib/opensolaris/cmd/zfs/zfs_util.h | 2 +- bsd/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c | 2 ++ bsd/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h | 2 +- .../contrib/opensolaris/lib/libzfs/common/libzfs_util.c | 2 -- .../contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c | 8 -------- 5 files changed, 4 insertions(+), 12 deletions(-) diff --git a/bsd/cddl/contrib/opensolaris/cmd/zfs/zfs_util.h b/bsd/cddl/contrib/opensolaris/cmd/zfs/zfs_util.h index 3ddff9e2..a56af59a 100644 --- a/bsd/cddl/contrib/opensolaris/cmd/zfs/zfs_util.h +++ b/bsd/cddl/contrib/opensolaris/cmd/zfs/zfs_util.h @@ -33,7 +33,7 @@ extern "C" { void * safe_malloc(size_t size); void nomem(void); -libzfs_handle_t *g_zfs; +extern libzfs_handle_t *g_zfs; #ifdef __cplusplus } diff --git a/bsd/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c b/bsd/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c index e8073152..8ce99206 100644 --- a/bsd/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c +++ b/bsd/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c @@ -58,6 +58,8 @@ #include "statcommon.h" +libzfs_handle_t *g_zfs; + static int zpool_do_create(int, char **); static int zpool_do_destroy(int, char **); diff --git a/bsd/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h b/bsd/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h index 134c730f..9fd17b89 100644 --- a/bsd/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h +++ b/bsd/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h @@ -63,7 +63,7 @@ void pool_list_free(zpool_list_t *); int pool_list_count(zpool_list_t *); void pool_list_remove(zpool_list_t *, zpool_handle_t *); -libzfs_handle_t *g_zfs; +extern libzfs_handle_t *g_zfs; #ifdef __cplusplus } diff --git a/bsd/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c b/bsd/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c index c01d8c85..54761500 100644 --- a/bsd/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c +++ b/bsd/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c @@ -55,8 +55,6 @@ #include <bsd/porting/netport.h> -int aok; - int libzfs_errno(libzfs_handle_t *hdl) { diff --git a/bsd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c b/bsd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c index 7dbaa5ba..c2d500ce 100644 --- a/bsd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c +++ b/bsd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c @@ -5248,14 +5248,6 @@ pool_status_check(const char *name, zfs_ioc_namecheck_t type) return (error); } -#ifdef __OSV__ - -// really from zvol.c, but we don't build that yet -void *zfsdev_state; - -#endif - - /* * Find a free minor number. */ -- 2.20.1 -- You received this message because you are subscribed to the Google Groups "OSv Development" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/osv-dev/20200506035103.9079-2-jwkozaczuk%40gmail.com.
