head	1.4;
access;
symbols
	RELENG_8_4:1.4.0.2
	RELENG_8:1.3.0.4
	RELENG_9:1.3.0.2;
locks; strict;
comment	@# @;


1.4
date	2013.03.22.02.29.23;	author svnexp;	state Exp;
branches
	1.4.2.1;
next	1.3;

1.3
date	2012.11.17.01.48.41;	author svnexp;	state Exp;
branches
	1.3.2.1
	1.3.4.1;
next	1.2;

1.2
date	2012.09.12.18.05.43;	author mm;	state Exp;
branches;
next	1.1;

1.1
date	2012.06.11.11.35.22;	author mm;	state Exp;
branches;
next	;

1.4.2.1
date	2013.03.22.02.29.23;	author svnexp;	state dead;
branches;
next	1.4.2.2;

1.4.2.2
date	2013.03.28.13.00.15;	author svnexp;	state Exp;
branches;
next	;

1.3.2.1
date	2012.11.17.01.48.41;	author svnexp;	state dead;
branches;
next	1.3.2.2;

1.3.2.2
date	2012.11.29.14.07.16;	author svnexp;	state Exp;
branches;
next	1.3.2.3;

1.3.2.3
date	2013.04.19.10.01.46;	author svnexp;	state Exp;
branches;
next	;

1.3.4.1
date	2012.11.17.01.48.41;	author svnexp;	state dead;
branches;
next	1.3.4.2;

1.3.4.2
date	2012.11.30.22.42.18;	author svnexp;	state Exp;
branches;
next	1.3.4.3;

1.3.4.3
date	2013.06.14.20.21.46;	author svnexp;	state Exp;
branches;
next	;


desc
@@


1.4
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248571
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@# $FreeBSD: head/cddl/usr.sbin/zhack/Makefile 248571 2013-03-21 08:38:03Z mm $

.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zhack

PROG=	zhack
NO_MAN=

WARNS?=	0
CSTD=	c99

CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair
CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
CFLAGS+= -I${.CURDIR}/../../lib/libumem

DPADD=	${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \
	${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS} ${LIBZPOOL}
LDADD=	-lgeom -lm -lnvpair -lpthread -lumem -luutil -lzfs_core -lzfs -lzpool

CFLAGS+=	-DDEBUG=1
#DEBUG_FLAGS+=	-g

.include <bsd.prog.mk>
@


1.4.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:00:15 +0000
@
text
@d1 32
@


1.4.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 32
# $FreeBSD: releng/8.4/cddl/usr.sbin/zhack/Makefile 243717 2012-11-30 22:38:42Z mm $

.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zhack

PROG=	zhack
NO_MAN=

WARNS?=	0
CSTD=	c99

CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair
CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
CFLAGS+= -I${.CURDIR}/../../lib/libumem

DPADD=	${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \
	${LIBUUTIL} ${LIBZFS} ${LIBZPOOL}
LDADD=	-lgeom -lm -lnvpair -lpthread -lumem -luutil -lzfs -lzpool

CFLAGS+=	-DDEBUG=1
#DEBUG_FLAGS+=	-g

.include <bsd.prog.mk>
@


1.3
log
@Switching exporter and resync
@
text
@d1 1
a1 1
# $FreeBSD: head/cddl/usr.sbin/zhack/Makefile 240415 2012-09-12 18:05:43Z mm $
d26 2
a27 2
	${LIBUUTIL} ${LIBZFS} ${LIBZPOOL}
LDADD=	-lgeom -lm -lnvpair -lpthread -lumem -luutil -lzfs -lzpool
@


1.3.4.1
log
@file Makefile was added on branch RELENG_8 on 2012-11-30 22:42:18 +0000
@
text
@d1 32
@


1.3.4.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/243717
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r243717 | mm | 2012-11-30 22:38:42 +0000 (Fri, 30 Nov 2012) | 223 lines
## SVN ##
## SVN ## Merge ZFS feature flags support and related bugfixes:
## SVN ## 236884, 237001, 237119, 237458, 237972, 238113, 238391, 238422, 238926,
## SVN ## 238950, 238951, 239389, 239394, 239620, 239774, 239953, 239958, 239967,
## SVN ## 239968, 240063, 240133, 240153, 240303, 240345, 240415, 240955, 241655,
## SVN ## 243014, 243505, 243506
## SVN ##
## SVN ## MFC r236884:
## SVN ## Introduce "feature flags" for ZFS pools (bump SPA version to 5000).
## SVN ## Add first feature "com.delphix:async_destroy" (asynchronous destroy
## SVN ## of ZFS datasets).
## SVN ## Implement features support in ZFS boot code.
## SVN ##
## SVN ## Illumos revisions merged:
## SVN ## 13700:2889e2596bd6
## SVN ## 13701:1949b688d5fb
## SVN ## 2619 asynchronous destruction of ZFS file systems
## SVN ## 2747 SPA versioning with zfs feature flags
## SVN ##
## SVN ## References:
## SVN ##   https://www.illumos.org/issues/2619
## SVN ##   https://www.illumos.org/issues/2747
## SVN ##
## SVN ## MFC r237001:
## SVN ## Fix ZFS boot with pre-features pools (version <= 28) broken in r236884
## SVN ##
## SVN ## MFC r237119 [1]:
## SVN ## Do not remount ZFS dataset if changing canmount property to "on" and
## SVN ## dataset is already mounted.
## SVN ##
## SVN ## MFC r237458:
## SVN ## Import Illumos revision 13736:9f1d48e1681f
## SVN ## 2901 ZFS receive fails for exabyte sparse files
## SVN ##
## SVN ## References:
## SVN ##   https://www.illumos.org/issues/2901
## SVN ##
## SVN ## MFC r237972:
## SVN ## Expose scrub and resilver tunables.
## SVN ## This allows the user to tune the priority trade-off between scrub/resilver
## SVN ## and other ZFS I/O.
## SVN ##
## SVN ## MFC r238113 (pjd):
## SVN ## vdev_io_done stage is not used for ioctls.
## SVN ##
## SVN ## MFC r238391:
## SVN ## Change behavior introduced in r237119 to vendor solution
## SVN ##
## SVN ## References:
## SVN ##   https://www.illumos.org/issues/2883
## SVN ##
## SVN ## MFC r238422:
## SVN ## Merge illumos commit 13749:df4cd82e2b60
## SVN ##
## SVN ## 1796 "ZFS HOLD" should not be used when doing "ZFS SEND" froma read-only pool
## SVN ## 2871 support for __ZFS_POOL_RESTRICT used by ZFS test suite
## SVN ## 2903 zfs destroy -d does not work
## SVN ## 2957 zfs destroy -R/r sometimes fails when removing defer-destroyed snapshot
## SVN ##
## SVN ## References:
## SVN ##   https://www.illumos.org/issues/1796
## SVN ##   https://www.illumos.org/issues/2871
## SVN ##   https://www.illumos.org/issues/2903
## SVN ##   https://www.illumos.org/issues/2957
## SVN ##
## SVN ## MFC r238926:
## SVN ## Partial MFV (illumos-gate 13753:2aba784c276b)
## SVN ## 2762 zpool command should have better support for feature flags
## SVN ##
## SVN ## References:
## SVN ##   https://www.illumos.org/issues/2762
## SVN ##
## SVN ## MFC r238950:
## SVN ## Fix reporting of root pool upgrade notice.
## SVN ##
## SVN ## MFC r238951:
## SVN ## Fix wrong indent according to style(9)
## SVN ##
## SVN ## MFC r239389:
## SVN ## Backport fix for vendor issue #3085
## SVN ## 3085 zfs diff panics, then panics in a loop on booting
## SVN ##
## SVN ## References:
## SVN ##   https://www.illumos.org/issues/3085
## SVN ##
## SVN ## MFC r239394:
## SVN ## Update zfs(8) manpage with illumos version of "zfs diff"
## SVN ##
## SVN ## Illumos issue:
## SVN ##   2399 zfs manual page does not document use of "zfs diff"
## SVN ##
## SVN ## References:
## SVN ##   https://www.illumos.org/issues/2399
## SVN ##
## SVN ## MFC r239620 [2]:
## SVN ## Merge recent vendor changes:
## SVN ## 3086 unnecessarily setting DS_FLAG_INCONSISTENT on async destroyed datasets
## SVN ## 3090 vdev_reopen() during reguid causes vdev to be treated as corrupt
## SVN ## 3102 vdev_uberblock_load() and vdev_validate() may read the wrong label
## SVN ##
## SVN ## Referenes:
## SVN ##   https://www.illumos.org/issues/3086
## SVN ##   https://www.illumos.org/issues/3090
## SVN ##   https://www.illumos.org/issues/3102
## SVN ##
## SVN ## MFC r239774:
## SVN ## Merge recent vendor changes:
## SVN ## 3100 zvol rename fails with EBUSY when dirty
## SVN ## 3104 eliminate empty bpobjs
## SVN ## 3120 zinject hangs in zfsdev_ioctl() due to uninitialized zc
## SVN ##
## SVN ## References:
## SVN ##   https://www.illumos.org/issues/3100
## SVN ##   https://www.illumos.org/issues/3104
## SVN ##   https://www.illumos.org/issues/3120
## SVN ##
## SVN ## MFC r239953 (joel):
## SVN ## Mdoc fixes.
## SVN ##
## SVN ## MFC r239958 (joel):
## SVN ## Minor mdoc fixes.
## SVN ##
## SVN ## MFC r239967 (joel):
## SVN ## Mdoc fixes.
## SVN ##
## SVN ## MFC r239968 (joel):
## SVN ## Remove trailing whitespace.
## SVN ##
## SVN ## MFC r240063 (gjb):
## SVN ## Add myself to copyright sections, per CDDL license.
## SVN ##
## SVN ## MFC r240133:
## SVN ## Merge recent vendor changes and sync code:
## SVN ## 1862 incremental zfs receive fails for sparse file > 8PB
## SVN ## 3112 ztest does not honor ZFS_DEBUG
## SVN ## 3122 zfs destroy filesystem should prefetch blocks
## SVN ## 3129 'zpool reopen' restarts resilvers
## SVN ## 3130 ztest failure: Assertion failed:
## SVN ##        0 == dmu_objset_destroy(name, B_FALSE) (0x0 == 0x10)
## SVN ##
## SVN ## References:
## SVN ##   https://www.illumos.org/issues/1862
## SVN ##   https://www.illumos.org/issues/3112
## SVN ##   https://www.illumos.org/issues/3122
## SVN ##   https://www.illumos.org/issues/3129
## SVN ##   https://www.illumos.org/issues/3130
## SVN ##
## SVN ## MFC r240153 (gjb) [3]:
## SVN ## Typo fix and minor word swap.
## SVN ##
## SVN ## MFC r240303:
## SVN ## Add assfail() and assfail3() to the opensolaris module.
## SVN ## Remove obsoleted intermediate cddl/compat/opensolaris/sys/debug.h.
## SVN ##
## SVN ## MFC r240345 (avg):
## SVN ## zfs: fix sa_modify_attrs handling of variable-sized attributes
## SVN ##
## SVN ## - skip length_idx index for a replaced variable-sized attribute
## SVN ## - skip length_idx index for a removed variable-sized attribute
## SVN ## - also re-arranged code to make sure that length_idx is always
## SVN ##   incremented for variable-sized attributes
## SVN ## - additionally add an assertion that the number of actually produced
## SVN ##   attributes is the same as the expected number of resulting
## SVN ##   attributes
## SVN ##
## SVN ## MFC r240415:
## SVN ## Merge recent zfs vendor changes, sync code and adjust userland DEBUG.
## SVN ##
## SVN ## Illumos issued covered:
## SVN ## 1884 Empty "used" field for zfs *space commands
## SVN ## 3006 VERIFY[S,U,P] and ASSERT[S,U,P] frequently check if first argument
## SVN ##      is zero
## SVN ## 3028 zfs {group,user}space -n prints (null) instead of numeric GID/UID
## SVN ## 3048 zfs {user,group}space [-s|-S] is broken
## SVN ## 3049 zfs {user,group}space -t doesn't really filter the results
## SVN ## 3060 zfs {user,group}space -H output isn't tab-delimited
## SVN ## 3061 zfs {user,group}space -o doesn't use specified fields order
## SVN ## 3064 usr/src/cmd/zpool/zpool_main.c misspells "successful"
## SVN ## 3093 zfs {user,group}space's -i is noop
## SVN ## 3098 zfs userspace/groupspace fail without saying why when run as non-root
## SVN ##
## SVN ## References:
## SVN ##   https://www.illumos.org/issues/ + [issue_id]
## SVN ##
## SVN ## MFC r240955 (partial):
## SVN ## Merge recent vendor changes in ZFS.
## SVN ##
## SVN ## Illumos issued covered:
## SVN ## 3139 zdb dies when it tries to determine path of unlinked file
## SVN ## 3189 kernel panic in ZFS test suite during hotspare_onoffline_004_neg
## SVN ## 3208 moving zpool cross-endian results in incorrect user/group accounting
## SVN ##
## SVN ## References:
## SVN ##   https://www.illumos.org/issues/ + [issue_id]
## SVN ##
## SVN ## MFC r241655:
## SVN ## Add missing initialization for do_prefix.
## SVN ## Corrects porting error in r238391
## SVN ##
## SVN ## Vendor issue and changeset reference:
## SVN ## 2883 changing "canmount" property to "on" should not always remount dataset
## SVN ## https://www.illumos.org/issues/2883
## SVN ## Changeset 13743:95aba6e49b9f
## SVN ##
## SVN ## MFC r243014:
## SVN ## Move zpool-features manual page from section 5 to section 7
## SVN ## and fix references
## SVN ##
## SVN ## Reported by:	pluknet
## SVN ##
## SVN ## MFC r243505:
## SVN ## Illumos 13886:e3261d03efbf
## SVN ##
## SVN ## 3349 zpool upgrade -V bumps the on disk version number, but leaves
## SVN ##      the in core version
## SVN ##
## SVN ## References:
## SVN ##   https://www.illumos.org/issues/3349
## SVN ##
## SVN ## MFC r243506:
## SVN ## zfs sha256 checksum is missing in zfs.8 manpage
## SVN ##
## SVN ## PR:	kern/167905 [1], kern/170912 [2], kern/170914 [2], doc/171356 [3]
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@a0 32
# $FreeBSD: stable/8/cddl/usr.sbin/zhack/Makefile 243717 2012-11-30 22:38:42Z mm $

.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zhack

PROG=	zhack
NO_MAN=

WARNS?=	0
CSTD=	c99

CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair
CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
CFLAGS+= -I${.CURDIR}/../../lib/libumem

DPADD=	${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \
	${LIBUUTIL} ${LIBZFS} ${LIBZPOOL}
LDADD=	-lgeom -lm -lnvpair -lpthread -lumem -luutil -lzfs -lzpool

CFLAGS+=	-DDEBUG=1
#DEBUG_FLAGS+=	-g

.include <bsd.prog.mk>
@


1.3.4.3
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/251757
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d1 1
a1 1
# $FreeBSD: stable/8/cddl/usr.sbin/zhack/Makefile 251757 2013-06-14 19:26:32Z mm $
d26 2
a27 2
	${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS} ${LIBZPOOL}
LDADD=	-lgeom -lm -lnvpair -lpthread -lumem -luutil -lzfs_core -lzfs -lzpool
@


1.3.2.1
log
@file Makefile was added on branch RELENG_9 on 2012-11-29 14:07:16 +0000
@
text
@d1 32
@


1.3.2.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/243674
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r243674 | mm | 2012-11-29 14:05:04 +0000 (Thu, 29 Nov 2012) | 223 lines
## SVN ##
## SVN ## Merge ZFS feature flags support and related bugfixes:
## SVN ## 236884, 237001, 237119, 237458, 237972, 238113, 238391, 238422, 238926,
## SVN ## 238950, 238951, 239389, 239394, 239620, 239774, 239953, 239958, 239967,
## SVN ## 239968, 240063, 240133, 240153, 240303, 240345, 240415, 240955, 241655,
## SVN ## 243014, 243505, 243506
## SVN ##
## SVN ## MFC r236884:
## SVN ## Introduce "feature flags" for ZFS pools (bump SPA version to 5000).
## SVN ## Add first feature "com.delphix:async_destroy" (asynchronous destroy
## SVN ## of ZFS datasets).
## SVN ## Implement features support in ZFS boot code.
## SVN ##
## SVN ## Illumos revisions merged:
## SVN ## 13700:2889e2596bd6
## SVN ## 13701:1949b688d5fb
## SVN ## 2619 asynchronous destruction of ZFS file systems
## SVN ## 2747 SPA versioning with zfs feature flags
## SVN ##
## SVN ## References:
## SVN ##   https://www.illumos.org/issues/2619
## SVN ##   https://www.illumos.org/issues/2747
## SVN ##
## SVN ## MFC r237001:
## SVN ## Fix ZFS boot with pre-features pools (version <= 28) broken in r236884
## SVN ##
## SVN ## MFC r237119 [1]:
## SVN ## Do not remount ZFS dataset if changing canmount property to "on" and
## SVN ## dataset is already mounted.
## SVN ##
## SVN ## MFC r237458:
## SVN ## Import Illumos revision 13736:9f1d48e1681f
## SVN ## 2901 ZFS receive fails for exabyte sparse files
## SVN ##
## SVN ## References:
## SVN ##   https://www.illumos.org/issues/2901
## SVN ##
## SVN ## MFC r237972:
## SVN ## Expose scrub and resilver tunables.
## SVN ## This allows the user to tune the priority trade-off between scrub/resilver
## SVN ## and other ZFS I/O.
## SVN ##
## SVN ## MFC r238113 (pjd):
## SVN ## vdev_io_done stage is not used for ioctls.
## SVN ##
## SVN ## MFC r238391:
## SVN ## Change behavior introduced in r237119 to vendor solution
## SVN ##
## SVN ## References:
## SVN ##   https://www.illumos.org/issues/2883
## SVN ##
## SVN ## MFC r238422:
## SVN ## Merge illumos commit 13749:df4cd82e2b60
## SVN ##
## SVN ## 1796 "ZFS HOLD" should not be used when doing "ZFS SEND" froma read-only pool
## SVN ## 2871 support for __ZFS_POOL_RESTRICT used by ZFS test suite
## SVN ## 2903 zfs destroy -d does not work
## SVN ## 2957 zfs destroy -R/r sometimes fails when removing defer-destroyed snapshot
## SVN ##
## SVN ## References:
## SVN ##   https://www.illumos.org/issues/1796
## SVN ##   https://www.illumos.org/issues/2871
## SVN ##   https://www.illumos.org/issues/2903
## SVN ##   https://www.illumos.org/issues/2957
## SVN ##
## SVN ## MFC r238926:
## SVN ## Partial MFV (illumos-gate 13753:2aba784c276b)
## SVN ## 2762 zpool command should have better support for feature flags
## SVN ##
## SVN ## References:
## SVN ##   https://www.illumos.org/issues/2762
## SVN ##
## SVN ## MFC r238950:
## SVN ## Fix reporting of root pool upgrade notice.
## SVN ##
## SVN ## MFC r238951:
## SVN ## Fix wrong indent according to style(9)
## SVN ##
## SVN ## MFC r239389:
## SVN ## Backport fix for vendor issue #3085
## SVN ## 3085 zfs diff panics, then panics in a loop on booting
## SVN ##
## SVN ## References:
## SVN ##   https://www.illumos.org/issues/3085
## SVN ##
## SVN ## MFC r239394:
## SVN ## Update zfs(8) manpage with illumos version of "zfs diff"
## SVN ##
## SVN ## Illumos issue:
## SVN ##   2399 zfs manual page does not document use of "zfs diff"
## SVN ##
## SVN ## References:
## SVN ##   https://www.illumos.org/issues/2399
## SVN ##
## SVN ## MFC r239620 [2]:
## SVN ## Merge recent vendor changes:
## SVN ## 3086 unnecessarily setting DS_FLAG_INCONSISTENT on async destroyed datasets
## SVN ## 3090 vdev_reopen() during reguid causes vdev to be treated as corrupt
## SVN ## 3102 vdev_uberblock_load() and vdev_validate() may read the wrong label
## SVN ##
## SVN ## Referenes:
## SVN ##   https://www.illumos.org/issues/3086
## SVN ##   https://www.illumos.org/issues/3090
## SVN ##   https://www.illumos.org/issues/3102
## SVN ##
## SVN ## MFC r239774:
## SVN ## Merge recent vendor changes:
## SVN ## 3100 zvol rename fails with EBUSY when dirty
## SVN ## 3104 eliminate empty bpobjs
## SVN ## 3120 zinject hangs in zfsdev_ioctl() due to uninitialized zc
## SVN ##
## SVN ## References:
## SVN ##   https://www.illumos.org/issues/3100
## SVN ##   https://www.illumos.org/issues/3104
## SVN ##   https://www.illumos.org/issues/3120
## SVN ##
## SVN ## MFC r239953 (joel):
## SVN ## Mdoc fixes.
## SVN ##
## SVN ## MFC r239958 (joel):
## SVN ## Minor mdoc fixes.
## SVN ##
## SVN ## MFC r239967 (joel):
## SVN ## Mdoc fixes.
## SVN ##
## SVN ## MFC r239968 (joel):
## SVN ## Remove trailing whitespace.
## SVN ##
## SVN ## MFC r240063 (gjb):
## SVN ## Add myself to copyright sections, per CDDL license.
## SVN ##
## SVN ## MFC r240133:
## SVN ## Merge recent vendor changes and sync code:
## SVN ## 1862 incremental zfs receive fails for sparse file > 8PB
## SVN ## 3112 ztest does not honor ZFS_DEBUG
## SVN ## 3122 zfs destroy filesystem should prefetch blocks
## SVN ## 3129 'zpool reopen' restarts resilvers
## SVN ## 3130 ztest failure: Assertion failed:
## SVN ##        0 == dmu_objset_destroy(name, B_FALSE) (0x0 == 0x10)
## SVN ##
## SVN ## References:
## SVN ##   https://www.illumos.org/issues/1862
## SVN ##   https://www.illumos.org/issues/3112
## SVN ##   https://www.illumos.org/issues/3122
## SVN ##   https://www.illumos.org/issues/3129
## SVN ##   https://www.illumos.org/issues/3130
## SVN ##
## SVN ## MFC r240153 (gjb) [3]:
## SVN ## Typo fix and minor word swap.
## SVN ##
## SVN ## MFC r240303:
## SVN ## Add assfail() and assfail3() to the opensolaris module.
## SVN ## Remove obsoleted intermediate cddl/compat/opensolaris/sys/debug.h.
## SVN ##
## SVN ## MFC r240345 (avg):
## SVN ## zfs: fix sa_modify_attrs handling of variable-sized attributes
## SVN ##
## SVN ## - skip length_idx index for a replaced variable-sized attribute
## SVN ## - skip length_idx index for a removed variable-sized attribute
## SVN ## - also re-arranged code to make sure that length_idx is always
## SVN ##   incremented for variable-sized attributes
## SVN ## - additionally add an assertion that the number of actually produced
## SVN ##   attributes is the same as the expected number of resulting
## SVN ##   attributes
## SVN ##
## SVN ## MFC r240415:
## SVN ## Merge recent zfs vendor changes, sync code and adjust userland DEBUG.
## SVN ##
## SVN ## Illumos issued covered:
## SVN ## 1884 Empty "used" field for zfs *space commands
## SVN ## 3006 VERIFY[S,U,P] and ASSERT[S,U,P] frequently check if first argument
## SVN ##      is zero
## SVN ## 3028 zfs {group,user}space -n prints (null) instead of numeric GID/UID
## SVN ## 3048 zfs {user,group}space [-s|-S] is broken
## SVN ## 3049 zfs {user,group}space -t doesn't really filter the results
## SVN ## 3060 zfs {user,group}space -H output isn't tab-delimited
## SVN ## 3061 zfs {user,group}space -o doesn't use specified fields order
## SVN ## 3064 usr/src/cmd/zpool/zpool_main.c misspells "successful"
## SVN ## 3093 zfs {user,group}space's -i is noop
## SVN ## 3098 zfs userspace/groupspace fail without saying why when run as non-root
## SVN ##
## SVN ## References:
## SVN ##   https://www.illumos.org/issues/ + [issue_id]
## SVN ##
## SVN ## MFC r240955 (partial):
## SVN ## Merge recent vendor changes in ZFS.
## SVN ##
## SVN ## Illumos issued covered:
## SVN ## 3139 zdb dies when it tries to determine path of unlinked file
## SVN ## 3189 kernel panic in ZFS test suite during hotspare_onoffline_004_neg
## SVN ## 3208 moving zpool cross-endian results in incorrect user/group accounting
## SVN ##
## SVN ## References:
## SVN ##   https://www.illumos.org/issues/ + [issue_id]
## SVN ##
## SVN ## MFC r241655:
## SVN ## Add missing initialization for do_prefix.
## SVN ## Corrects porting error in r238391
## SVN ##
## SVN ## Vendor issue and changeset reference:
## SVN ## 2883 changing "canmount" property to "on" should not always remount dataset
## SVN ## https://www.illumos.org/issues/2883
## SVN ## Changeset 13743:95aba6e49b9f
## SVN ##
## SVN ## MFC r243014:
## SVN ## Move zpool-features manual page from section 5 to section 7
## SVN ## and fix references
## SVN ##
## SVN ## Reported by:	pluknet
## SVN ##
## SVN ## MFC r243505:
## SVN ## Illumos 13886:e3261d03efbf
## SVN ##
## SVN ## 3349 zpool upgrade -V bumps the on disk version number, but leaves
## SVN ##      the in core version
## SVN ##
## SVN ## References:
## SVN ##   https://www.illumos.org/issues/3349
## SVN ##
## SVN ## MFC r243506:
## SVN ## zfs sha256 checksum is missing in zfs.8 manpage
## SVN ##
## SVN ## PR:	kern/167905 [1], kern/170912 [2], kern/170914 [2], doc/171356 [3]
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@a0 32
# $FreeBSD: stable/9/cddl/usr.sbin/zhack/Makefile 243674 2012-11-29 14:05:04Z mm $

.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zhack

PROG=	zhack
NO_MAN=

WARNS?=	0
CSTD=	c99

CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair
CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
CFLAGS+= -I${.CURDIR}/../../lib/libumem

DPADD=	${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \
	${LIBUUTIL} ${LIBZFS} ${LIBZPOOL}
LDADD=	-lgeom -lm -lnvpair -lpthread -lumem -luutil -lzfs -lzpool

CFLAGS+=	-DDEBUG=1
#DEBUG_FLAGS+=	-g

.include <bsd.prog.mk>
@


1.3.2.3
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/249643
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/cddl/usr.sbin/zhack/Makefile 249643 2013-04-19 09:19:10Z mm $
d26 2
a27 2
	${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS} ${LIBZPOOL}
LDADD=	-lgeom -lm -lnvpair -lpthread -lumem -luutil -lzfs_core -lzfs -lzpool
@


1.2
log
@SVN rev 240415 on 2012-09-12 18:05:43Z by mm

Merge recent zfs vendor changes, sync code and adjust userland DEBUG.

Illumos issued covered:
1884 Empty "used" field for zfs *space commands
3006 VERIFY[S,U,P] and ASSERT[S,U,P] frequently check if first argument
     is zero
3028 zfs {group,user}space -n prints (null) instead of numeric GID/UID
3048 zfs {user,group}space [-s|-S] is broken
3049 zfs {user,group}space -t doesn't really filter the results
3060 zfs {user,group}space -H output isn't tab-delimited
3061 zfs {user,group}space -o doesn't use specified fields order
3064 usr/src/cmd/zpool/zpool_main.c misspells "successful"
3093 zfs {user,group}space's -i is noop
3098 zfs userspace/groupspace fail without saying why when run as non-root

References:
  https://www.illumos.org/issues/ + [issue_id]

Obtained from:	illumos (vendor/illumos, vendor/illumos-sys)
MFC after:	2 weeks
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.1
log
@SVN rev 236884 on 2012-06-11 11:35:22Z by mm

Introduce "feature flags" for ZFS pools (bump SPA version to 5000).
Add first feature "com.delphix:async_destroy" (asynchronous destroy
of ZFS datasets).
Implement features support in ZFS boot code.

Illumos revisions merged:
13700:2889e2596bd6
13701:1949b688d5fb
2619 asynchronous destruction of ZFS file systems
2747 SPA versioning with zfs feature flags

References:
https://www.illumos.org/issues/2619
https://www.illumos.org/issues/2747

Obtained from:	illumos (issue #2619, #2747)
MFC after:	1 month
@
text
@d29 3
@

