From owner-svn-src-all@FreeBSD.ORG  Mon Feb 17 17:46:16 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 8B0CFAEE;
 Mon, 17 Feb 2014 17:46:16 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 757911C24;
 Mon, 17 Feb 2014 17:46:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1HHkGIb068717;
 Mon, 17 Feb 2014 17:46:16 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1HHkGuJ068715;
 Mon, 17 Feb 2014 17:46:16 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201402171746.s1HHkGuJ068715@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Mon, 17 Feb 2014 17:46:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r262101 - in stable/10/cddl:
 contrib/opensolaris/cmd/zinject usr.bin/zinject
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Feb 2014 17:46:16 -0000

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