From owner-svn-src-stable@freebsd.org  Fri Oct 23 08:01:47 2015
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id E41DEA19DC0;
 Fri, 23 Oct 2015 08:01:47 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 91B361CF4;
 Fri, 23 Oct 2015 08:01:47 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9N81kI1078270;
 Fri, 23 Oct 2015 08:01:46 GMT (envelope-from avg@FreeBSD.org)
Received: (from avg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9N81k76078267;
 Fri, 23 Oct 2015 08:01:46 GMT (envelope-from avg@FreeBSD.org)
Message-Id: <201510230801.t9N81k76078267@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org
 using -f
From: Andriy Gapon <avg@FreeBSD.org>
Date: Fri, 23 Oct 2015 08:01:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r289805 - in stable/10:
 cddl/contrib/opensolaris/lib/libzfs/common
 cddl/contrib/opensolaris/lib/libzpool/common
 sys/cddl/contrib/opensolaris/common/nvpair
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Oct 2015 08:01:48 -0000

Author: avg
Date: Fri Oct 23 08:01:46 2015
New Revision: 289805
URL: https://svnweb.freebsd.org/changeset/base/289805

Log:
  MFC r288340: define aok in libnvpair which is linked to all zfs
  libraries that need aok

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

Modified: stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c
==============================================================================
--- stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c	Fri Oct 23 07:57:33 2015	(r289804)
+++ stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c	Fri Oct 23 08:01:46 2015	(r289805)
@@ -55,7 +55,6 @@
 #include "zfs_prop.h"
 #include "zfeature_common.h"
 
-int aok;
 
 int
 libzfs_errno(libzfs_handle_t *hdl)

Modified: stable/10/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
==============================================================================
--- stable/10/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c	Fri Oct 23 07:57:33 2015	(r289804)
+++ stable/10/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c	Fri Oct 23 08:01:46 2015	(r289805)
@@ -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: stable/10/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c	Fri Oct 23 07:57:33 2015	(r289804)
+++ stable/10/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c	Fri Oct 23 08:01:46 2015	(r289805)
@@ -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.