svn commit: r288340 - in head: cddl/contrib/opensolaris/lib/libzfs/common cddl/contrib/opensolaris/lib/libzpool/common sys/cddl/contrib/opensolaris/common/nvpair

[Andriy Gapon]

Author: avg
Date: Mon Sep 28 15:25:36 2015
New Revision: 288340
URL: https://svnweb.freebsd.org/changeset/base/288340

Log:
  define aok in libnvpair which is linked to all zfs libraries that need aok
  
  This removes the circular dependency of libnvpair on libzfs / libzpool.
  
  PR:		199811
  Obtained from:	bapt
  MFC after:	23 days

Modified:
  head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c
  head/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
  head/sys/cddl/contrib/opensolaris/common/nvpair/opensolaris_nvpair.c

Modified: head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c
==============================================================================
--- head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c	Mon Sep 28 12:38:57 2015	(r288339)
+++ head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c	Mon Sep 28 15:25:36 2015	(r288340)
@@ -55,7 +55,6 @@
 #include "zfs_prop.h"
 #include "zfeature_common.h"
 
-int aok;
 
 int
 libzfs_errno(libzfs_handle_t *hdl)

Modified: head/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
==============================================================================
--- head/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c	Mon Sep 28 12:38:57 2015	(r288339)
+++ head/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c	Mon Sep 28 15:25:36 2015	(r288340)
@@ -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];

Modified: head/sys/cddl/contrib/opensolaris/common/nvpair/opensolaris_nvpair.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/common/nvpair/opensolaris_nvpair.c	Mon Sep 28 12:38:57 2015	(r288339)
+++ head/sys/cddl/contrib/opensolaris/common/nvpair/opensolaris_nvpair.c	Mon Sep 28 15:25:36 2015	(r288340)
@@ -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.