summaryrefslogtreecommitdiffstats
path: root/cddl
diff options
context:
space:
mode:
authoravg <avg@FreeBSD.org>2014-01-16 12:21:21 +0000
committeravg <avg@FreeBSD.org>2014-01-16 12:21:21 +0000
commitf9bc6dc89c596d9c742b7f12fbbaad8656b640fe (patch)
treea9c950131886ba3267b7103eb2b7f4be8e664fd2 /cddl
parent479797d59ed717d502233535790a85aa1711028f (diff)
downloadFreeBSD-src-f9bc6dc89c596d9c742b7f12fbbaad8656b640fe.zip
FreeBSD-src-f9bc6dc89c596d9c742b7f12fbbaad8656b640fe.tar.gz
zinject must use ioctl(2) compatibility wrapper
MFC after: 8 days Sponsored by: HybridCluster
Diffstat (limited to 'cddl')
-rw-r--r--cddl/contrib/opensolaris/cmd/zinject/zinject.c1
-rw-r--r--cddl/usr.bin/zinject/Makefile1
2 files changed, 2 insertions, 0 deletions
diff --git a/cddl/contrib/opensolaris/cmd/zinject/zinject.c b/cddl/contrib/opensolaris/cmd/zinject/zinject.c
index 994d687..ddcdb1f 100644
--- a/cddl/contrib/opensolaris/cmd/zinject/zinject.c
+++ b/cddl/contrib/opensolaris/cmd/zinject/zinject.c
@@ -148,6 +148,7 @@
#include <sys/mount.h>
#include <libzfs.h>
+#include <libzfs_compat.h>
#undef verify /* both libzfs.h and zfs_context.h want to define this */
diff --git a/cddl/usr.bin/zinject/Makefile b/cddl/usr.bin/zinject/Makefile
index 8c5c141..5625149 100644
--- a/cddl/usr.bin/zinject/Makefile
+++ b/cddl/usr.bin/zinject/Makefile
@@ -16,6 +16,7 @@ CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libnvpair
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs/
CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head
CFLAGS+= -I${.CURDIR}/../../lib/libumem
OpenPOWER on IntegriCloud