Attachment 158043 Details for Bug 199811 – preliminary patch

[patch] preliminary patch

file_199811.txt (text/plain), 1.90 KB, created by Andriy Gapon on 2015-06-25 11:09:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andriy Gapon

Created: 2015-06-25 11:09:21 UTC

Size: 1.90 KB

patch

obsolete

>commit 6d5846329b74bbf17a15b7f03e158184ff5841d6
>Author: Andriy Gapon <avg@icyb.net.ua>
>Date:   Thu Jun 25 13:58:48 2015 +0300
>
>    define aok in libnvpair which is linked to all zfs libraries that need aok
>    
>    This removes the circular dependency of libnvpair on libzfs.
>    
>    PR:		199811
>    Obtained from:	bapt
>
>diff --git a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c
>index 427b2fd..ab8a9bf 100644
>--- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c
>+++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c
>@@ -55,7 +55,6 @@
> #include "zfs_prop.h"
> #include "zfeature_common.h"
> 
>-int aok;
> 
> int
> libzfs_errno(libzfs_handle_t *hdl)
>diff --git a/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c b/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
>index ef38696..f2515d5 100644
>--- a/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
>+++ b/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
>@@ -45,7 +45,9 @@
>  * Emulation of kernel services in userland.
>  */
> 
>+#ifndef __FreeBSD__
> int aok;
>+#endif
> uint64_t physmem;
> vnode_t *rootdir = (vnode_t *)0xabcd1234;
> char hw_serial[HW_HOSTID_LEN];
>diff --git a/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c b/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c
>index cd6af4e..7038f7f 100644
>--- a/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c
>+++ b/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c
>@@ -44,6 +44,14 @@
> #endif
> #define	skip_whitespace(p)	while ((*(p) == ' ') || (*(p) == '\t')) p++
> 
>+#if defined(__FreeBSD__) && !defined(_KERNEL)
>+/*
>+ * libnvpair is the lowest commen denominator for ZFS related libraries,
>+ * defining aok here makes it usable by all ZFS related libraries
>+ */
>+int aok;
>+#endif
>+
> /*
>  * nvpair.c - Provides kernel & userland interfaces for manipulating
>  *	name-value pairs.

Actions: View | Diff

Attachments on bug 199811: 158043