diff options
| author | Kyle Evans <kevans@FreeBSD.org> | 2019-12-06 19:33:39 +0000 |
|---|---|---|
| committer | Kyle Evans <kevans@FreeBSD.org> | 2019-12-06 19:33:39 +0000 |
| commit | 485172f537e195e3d5ca9467192f73c1893ab537 (patch) | |
| tree | 83f2cbc16499bf4a189b954e6c442dae78e6cc6f /lib/libbe | |
| parent | d3cf9f3c1fa32d662cbfbad822519b22940857f9 (diff) | |
| download | src-test-485172f537e195e3d5ca9467192f73c1893ab537.tar.gz src-test-485172f537e195e3d5ca9467192f73c1893ab537.zip | |
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.
Notes
Notes:
svn path=/head/; revision=355460
Diffstat (limited to 'lib/libbe')
| -rw-r--r-- | lib/libbe/be.c | 5 | ||||
| -rw-r--r-- | lib/libbe/be_access.c | 2 | ||||
| -rw-r--r-- | lib/libbe/be_info.c | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/lib/libbe/be.c b/lib/libbe/be.c index fd7d05c408eb9..6f56999a8b9d9 100644 --- a/lib/libbe/be.c +++ b/lib/libbe/be.c @@ -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; /* diff --git a/lib/libbe/be_access.c b/lib/libbe/be_access.c index 9c267bd2f9a6d..72ee48b1ca7a3 100644 --- a/lib/libbe/be_access.c +++ b/lib/libbe/be_access.c @@ -31,6 +31,8 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include <sys/mntent.h> + #include "be.h" #include "be_impl.h" diff --git a/lib/libbe/be_info.c b/lib/libbe/be_info.c index 1b49fe89044e8..b1625e68fc15d 100644 --- a/lib/libbe/be_info.c +++ b/lib/libbe/be_info.c @@ -30,6 +30,8 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include <sys/zfs_context.h> + #include "be.h" #include "be_impl.h" |