From c38e50a6384f2ef87c50d19ce910475d6e24236f Mon Sep 17 00:00:00 2001 From: Andriy Gapon Date: Thu, 16 Jan 2014 12:21:21 +0000 Subject: zinject must use ioctl(2) compatibility wrapper MFC after: 8 days Sponsored by: HybridCluster --- cddl/contrib/opensolaris/cmd/zinject/zinject.c | 1 + cddl/usr.bin/zinject/Makefile | 1 + 2 files changed, 2 insertions(+) (limited to 'cddl') diff --git a/cddl/contrib/opensolaris/cmd/zinject/zinject.c b/cddl/contrib/opensolaris/cmd/zinject/zinject.c index 994d6878cc85..ddcdb1ffd564 100644 --- a/cddl/contrib/opensolaris/cmd/zinject/zinject.c +++ b/cddl/contrib/opensolaris/cmd/zinject/zinject.c @@ -148,6 +148,7 @@ #include #include +#include #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 8c5c141e582e..56251490bbda 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 -- cgit v1.2.3 From df217ba9ba150dd0308639cc543f2191ca1d3b85 Mon Sep 17 00:00:00 2001 From: Andriy Gapon Date: Fri, 17 Jan 2014 10:18:45 +0000 Subject: zdb -R: do not treat numeric parameters to a flag as more flags Reviewed by: Matthew Ahrens MFC after: 1 week --- cddl/contrib/opensolaris/cmd/zdb/zdb.c | 1 + 1 file changed, 1 insertion(+) (limited to 'cddl') diff --git a/cddl/contrib/opensolaris/cmd/zdb/zdb.c b/cddl/contrib/opensolaris/cmd/zdb/zdb.c index 4192812d512c..932687a8e33f 100644 --- a/cddl/contrib/opensolaris/cmd/zdb/zdb.c +++ b/cddl/contrib/opensolaris/cmd/zdb/zdb.c @@ -3012,6 +3012,7 @@ zdb_read_block(char *thing, spa_t *spa) free(dup); return; } + i += p - &flagstr[i + 1]; /* skip over the number */ } } -- cgit v1.2.3