svn commit: r292642 - in user/ngie/stable-10-libnv: cddl/contrib/opensolaris/lib/libzfs/common cddl/contrib/opensolaris/lib/libzpool/common sys/cddl/contrib/opensolaris/common/nvpair

[Garrett Cooper]

Author: ngie
Date: Wed Dec 23 04:35:01 2015
New Revision: 292642
URL: https://svnweb.freebsd.org/changeset/base/292642

Log:
  Revert r282122 and r288340
  
  I'll reapply them as direct MFCs

Modified:
  user/ngie/stable-10-libnv/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c
  user/ngie/stable-10-libnv/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
  user/ngie/stable-10-libnv/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c
Directory Properties:
  user/ngie/stable-10-libnv/   (props changed)

Modified: user/ngie/stable-10-libnv/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c
==============================================================================
--- user/ngie/stable-10-libnv/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c	Wed Dec 23 03:34:43 2015	(r292641)
+++ user/ngie/stable-10-libnv/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c	Wed Dec 23 04:35:01 2015	(r292642)
@@ -55,6 +55,7 @@
 #include "zfs_prop.h"
 #include "zfeature_common.h"
 
+int aok;
 
 int
 libzfs_errno(libzfs_handle_t *hdl)

Modified: user/ngie/stable-10-libnv/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
==============================================================================
--- user/ngie/stable-10-libnv/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c	Wed Dec 23 03:34:43 2015	(r292641)
+++ user/ngie/stable-10-libnv/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c	Wed Dec 23 04:35:01 2015	(r292642)
@@ -45,9 +45,7 @@
  * 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: user/ngie/stable-10-libnv/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c
==============================================================================
--- user/ngie/stable-10-libnv/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c	Wed Dec 23 03:34:43 2015	(r292641)
+++ user/ngie/stable-10-libnv/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c	Wed Dec 23 04:35:01 2015	(r292642)
@@ -44,14 +44,6 @@
 #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.
@@ -1235,7 +1227,6 @@ nvpair_type_is_array(nvpair_t *nvp)
 	data_type_t type = NVP_TYPE(nvp);
 
 	if ((type == DATA_TYPE_BYTE_ARRAY) ||
-	    (type == DATA_TYPE_INT8_ARRAY) ||
 	    (type == DATA_TYPE_UINT8_ARRAY) ||
 	    (type == DATA_TYPE_INT16_ARRAY) ||
 	    (type == DATA_TYPE_UINT16_ARRAY) ||