From owner-svn-src-head@freebsd.org  Fri Dec  6 19:33:40 2019
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id C42521B435E;
 Fri,  6 Dec 2019 19:33:40 +0000 (UTC)
 (envelope-from kevans@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 47V2nc4mp8z3J9Q;
 Fri,  6 Dec 2019 19:33:40 +0000 (UTC)
 (envelope-from kevans@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 874F46273;
 Fri,  6 Dec 2019 19:33:40 +0000 (UTC)
 (envelope-from kevans@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xB6JXenr047847;
 Fri, 6 Dec 2019 19:33:40 GMT (envelope-from kevans@FreeBSD.org)
Received: (from kevans@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id xB6JXdxo047844;
 Fri, 6 Dec 2019 19:33:39 GMT (envelope-from kevans@FreeBSD.org)
Message-Id: <201912061933.xB6JXdxo047844@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kevans set sender to
 kevans@FreeBSD.org using -f
From: Kyle Evans <kevans@FreeBSD.org>
Date: Fri, 6 Dec 2019 19:33:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r355460 - head/lib/libbe
X-SVN-Group: head
X-SVN-Commit-Author: kevans
X-SVN-Commit-Paths: head/lib/libbe
X-SVN-Commit-Revision: 355460
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Dec 2019 19:33:40 -0000

Author: kevans
Date: Fri Dec  6 19:33:39 2019
New Revision: 355460
URL: https://svnweb.freebsd.org/changeset/base/355460

Log:
  libbe: fix build against sysutils/openzfs, part 1
  
  This is the half of the changes required that work as-is with both in-tree
  ZFS and the new hotness, sysutils/openzfs.  Highlights are less dependency
  on header pollution (from somewhere) and using 'mnttab' instead of
  'extmnttab'.   In the in-tree ZFS, the latter is a #define for the former,
  but in the port extmnttab is actually a distinct struct that's a super-set
  of mnttab.  We really want mnttab here anyways, so just use it.

Modified:
  head/lib/libbe/be.c
  head/lib/libbe/be_access.c
  head/lib/libbe/be_info.c

Modified: head/lib/libbe/be.c
==============================================================================
--- head/lib/libbe/be.c	Fri Dec  6 19:20:45 2019	(r355459)
+++ head/lib/libbe/be.c	Fri Dec  6 19:33:39 2019	(r355460)
@@ -34,6 +34,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/stat.h>
 #include <sys/ucred.h>
 
+#include <sys/zfs_context.h>
+#include <sys/mntent.h>
+
 #include <ctype.h>
 #include <libgen.h>
 #include <libzfs_core.h>
@@ -67,7 +70,7 @@ static int
 be_locate_rootfs(libbe_handle_t *lbh)
 {
 	struct statfs sfs;
-	struct extmnttab entry;
+	struct mnttab entry;
 	zfs_handle_t *zfs;
 
 	/*

Modified: head/lib/libbe/be_access.c
==============================================================================
--- head/lib/libbe/be_access.c	Fri Dec  6 19:20:45 2019	(r355459)
+++ head/lib/libbe/be_access.c	Fri Dec  6 19:33:39 2019	(r355460)
@@ -31,6 +31,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include <sys/mntent.h>
+
 #include "be.h"
 #include "be_impl.h"
 

Modified: head/lib/libbe/be_info.c
==============================================================================
--- head/lib/libbe/be_info.c	Fri Dec  6 19:20:45 2019	(r355459)
+++ head/lib/libbe/be_info.c	Fri Dec  6 19:33:39 2019	(r355460)
@@ -30,6 +30,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include <sys/zfs_context.h>
+
 #include "be.h"
 #include "be_impl.h"