svn commit: r262101 - in stable/10/cddl: contrib/opensolaris/cmd/zinject usr.bin/zinject

[Andriy Gapon]

Author: avg
Date: Mon Feb 17 17:46:15 2014
New Revision: 262101
URL: http://svnweb.freebsd.org/changeset/base/262101

Log:
  MFC r260703: zinject must use ioctl(2) compatibility wrapper

Modified:
  stable/10/cddl/contrib/opensolaris/cmd/zinject/zinject.c
  stable/10/cddl/usr.bin/zinject/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/cddl/contrib/opensolaris/cmd/zinject/zinject.c
==============================================================================
--- stable/10/cddl/contrib/opensolaris/cmd/zinject/zinject.c	Mon Feb 17 17:43:13 2014	(r262100)
+++ stable/10/cddl/contrib/opensolaris/cmd/zinject/zinject.c	Mon Feb 17 17:46:15 2014	(r262101)
@@ -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 */
 

Modified: stable/10/cddl/usr.bin/zinject/Makefile
==============================================================================
--- stable/10/cddl/usr.bin/zinject/Makefile	Mon Feb 17 17:43:13 2014	(r262100)
+++ stable/10/cddl/usr.bin/zinject/Makefile	Mon Feb 17 17:46:15 2014	(r262101)
@@ -16,6 +16,7 @@ CFLAGS+= -I${.CURDIR}/../../contrib/open
 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