diff options
| author | kaiw <kaiw@FreeBSD.org> | 2014-01-20 19:38:44 +0000 |
|---|---|---|
| committer | kaiw <kaiw@FreeBSD.org> | 2014-01-20 19:38:44 +0000 |
| commit | e9c152dbc2e572c490d3035d77f142253b674ded (patch) | |
| tree | ae65253d09d5b1583a6bb647cd383e77be00e687 /cddl | |
| parent | cb3a8568bd4e3f2bf20a1c342c6957d1a568a5df (diff) | |
| parent | 681dcc3c572a6831f4cb5f341c90ea4f9278bc81 (diff) | |
| download | FreeBSD-src-e9c152dbc2e572c490d3035d77f142253b674ded.zip FreeBSD-src-e9c152dbc2e572c490d3035d77f142253b674ded.tar.gz | |
MFH@260917.
Diffstat (limited to 'cddl')
| -rw-r--r-- | cddl/contrib/opensolaris/cmd/zdb/zdb.c | 1 | ||||
| -rw-r--r-- | cddl/contrib/opensolaris/cmd/zinject/zinject.c | 1 | ||||
| -rw-r--r-- | cddl/usr.bin/zinject/Makefile | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/cddl/contrib/opensolaris/cmd/zdb/zdb.c b/cddl/contrib/opensolaris/cmd/zdb/zdb.c index 4192812..932687a 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 */ } } 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 |
