Date: Thu, 12 Dec 2019 18:53:45 +0000 (UTC) From: Kyle Evans <kevans@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r355662 - in stable: 11/lib/libbe 12/lib/libbe Message-ID: <201912121853.xBCIrjTT081308@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kevans Date: Thu Dec 12 18:53:45 2019 New Revision: 355662 URL: https://svnweb.freebsd.org/changeset/base/355662 Log: MFC r355460: 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: stable/11/lib/libbe/be.c stable/11/lib/libbe/be_access.c stable/11/lib/libbe/be_info.c Directory Properties: stable/11/ (props changed) Changes in other areas also in this revision: Modified: stable/12/lib/libbe/be.c stable/12/lib/libbe/be_access.c stable/12/lib/libbe/be_info.c Directory Properties: stable/12/ (props changed) Modified: stable/11/lib/libbe/be.c ============================================================================== --- stable/11/lib/libbe/be.c Thu Dec 12 18:51:32 2019 (r355661) +++ stable/11/lib/libbe/be.c Thu Dec 12 18:53:45 2019 (r355662) @@ -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: stable/11/lib/libbe/be_access.c ============================================================================== --- stable/11/lib/libbe/be_access.c Thu Dec 12 18:51:32 2019 (r355661) +++ stable/11/lib/libbe/be_access.c Thu Dec 12 18:53:45 2019 (r355662) @@ -31,6 +31,8 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include <sys/mntent.h> + #include "be.h" #include "be_impl.h" Modified: stable/11/lib/libbe/be_info.c ============================================================================== --- stable/11/lib/libbe/be_info.c Thu Dec 12 18:51:32 2019 (r355661) +++ stable/11/lib/libbe/be_info.c Thu Dec 12 18:53:45 2019 (r355662) @@ -30,6 +30,8 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include <sys/zfs_context.h> + #include "be.h" #include "be_impl.h"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912121853.xBCIrjTT081308>