diff options
| author | Kai Wang <kaiw@FreeBSD.org> | 2014-01-20 19:38:44 +0000 |
|---|---|---|
| committer | Kai Wang <kaiw@FreeBSD.org> | 2014-01-20 19:38:44 +0000 |
| commit | 945a2095f6c9abce445127bfde3e4faf87c6c0de (patch) | |
| tree | ae65253d09d5b1583a6bb647cd383e77be00e687 /cddl | |
| parent | d32f01493934979c77f54c1179e9cd1f8d3fcf6a (diff) | |
| parent | 7ebba1f8ffcf440c4cd2d4f7dc8b2e7ee4b876ba (diff) | |
| download | src-945a2095f6c9abce445127bfde3e4faf87c6c0de.tar.gz src-945a2095f6c9abce445127bfde3e4faf87c6c0de.zip | |
MFH@260917.
Notes
Notes:
svn path=/projects/elftoolchain/; revision=260920
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 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 */ } } 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 <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 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 |