head	1.14;
access;
symbols
	RELENG_8_4:1.14.0.2
	RELENG_9_1_0_RELEASE:1.9.2.1.4.2
	RELENG_9_1:1.9.2.1.0.4
	RELENG_9_1_BP:1.9.2.1
	RELENG_8_3_0_RELEASE:1.7.2.2.2.1
	RELENG_8_3:1.7.2.2.0.2
	RELENG_8_3_BP:1.7.2.2
	RELENG_9_0_0_RELEASE:1.9.2.1.2.1
	RELENG_9_0:1.9.2.1.0.2
	RELENG_9_0_BP:1.9.2.1
	RELENG_9:1.9.0.2
	RELENG_9_BP:1.9
	RELENG_7_4_0_RELEASE:1.4.2.2.4.1
	RELENG_8_2_0_RELEASE:1.7.2.1.6.1
	RELENG_7_4:1.4.2.2.0.4
	RELENG_7_4_BP:1.4.2.2
	RELENG_8_2:1.7.2.1.0.6
	RELENG_8_2_BP:1.7.2.1
	RELENG_8_1_0_RELEASE:1.7.2.1.4.1
	RELENG_8_1:1.7.2.1.0.4
	RELENG_8_1_BP:1.7.2.1
	RELENG_7_3_0_RELEASE:1.4.2.2.2.1
	RELENG_7_3:1.4.2.2.0.2
	RELENG_7_3_BP:1.4.2.2
	RELENG_8_0_0_RELEASE:1.7.2.1.2.1
	RELENG_8_0:1.7.2.1.0.2
	RELENG_8_0_BP:1.7.2.1
	RELENG_8:1.7.0.2
	RELENG_8_BP:1.7
	RELENG_7_2_0_RELEASE:1.4.2.1.4.1
	RELENG_7_2:1.4.2.1.0.4
	RELENG_7_2_BP:1.4.2.1
	RELENG_7_1_0_RELEASE:1.4.2.1.2.1
	RELENG_7_1:1.4.2.1.0.2
	RELENG_7_1_BP:1.4.2.1
	RELENG_7_0_0_RELEASE:1.4
	RELENG_7_0:1.4.0.4
	RELENG_7_0_BP:1.4
	RELENG_7:1.4.0.2
	RELENG_7_BP:1.4;
locks; strict;
comment	@# @;


1.14
date	2013.03.22.02.29.23;	author svnexp;	state Exp;
branches
	1.14.2.1;
next	1.13;

1.13
date	2012.11.17.01.48.41;	author svnexp;	state Exp;
branches;
next	1.12;

1.12
date	2012.09.12.18.05.43;	author mm;	state Exp;
branches;
next	1.11;

1.11
date	2012.06.11.11.35.22;	author mm;	state Exp;
branches;
next	1.10;

1.10
date	2011.10.30.16.29.04;	author rmh;	state Exp;
branches;
next	1.9;

1.9
date	2011.02.27.19.41.40;	author pjd;	state Exp;
branches
	1.9.2.1;
next	1.8;

1.8
date	2010.03.02.19.04.07;	author uqs;	state Exp;
branches;
next	1.7;

1.7
date	2009.03.14.17.55.16;	author rdivacky;	state Exp;
branches
	1.7.2.1;
next	1.6;

1.6
date	2008.11.17.20.49.29;	author pjd;	state Exp;
branches;
next	1.5;

1.5
date	2008.03.27.23.21.24;	author jb;	state Exp;
branches;
next	1.4;

1.4
date	2007.10.01.18.17.23;	author ru;	state Exp;
branches
	1.4.2.1;
next	1.3;

1.3
date	2007.04.17.15.52.37;	author pjd;	state Exp;
branches;
next	1.2;

1.2
date	2007.04.16.21.20.26;	author ru;	state Exp;
branches;
next	1.1;

1.1
date	2007.04.06.01.08.58;	author pjd;	state Exp;
branches;
next	;

1.14.2.1
date	2013.03.22.02.29.23;	author svnexp;	state dead;
branches;
next	1.14.2.2;

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

1.9.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.9.2.1.2.1
	1.9.2.1.4.1;
next	1.9.2.2;

1.9.2.2
date	2012.09.26.12.36.09;	author mm;	state Exp;
branches;
next	1.9.2.3;

1.9.2.3
date	2012.11.17.11.36.04;	author svnexp;	state Exp;
branches;
next	1.9.2.4;

1.9.2.4
date	2012.11.29.14.07.16;	author svnexp;	state Exp;
branches;
next	1.9.2.5;

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

1.9.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.9.2.1.2.2;

1.9.2.1.2.2
date	2012.11.17.08.36.06;	author svnexp;	state Exp;
branches;
next	;

1.9.2.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.9.2.1.4.2;

1.9.2.1.4.2
date	2012.11.17.08.46.54;	author svnexp;	state Exp;
branches;
next	;

1.7.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.7.2.1.2.1
	1.7.2.1.4.1
	1.7.2.1.6.1;
next	1.7.2.2;

1.7.2.2
date	2011.06.06.09.36.46;	author mm;	state Exp;
branches
	1.7.2.2.2.1;
next	1.7.2.3;

1.7.2.3
date	2012.09.26.12.36.22;	author mm;	state Exp;
branches;
next	1.7.2.4;

1.7.2.4
date	2012.11.17.10.35.50;	author svnexp;	state Exp;
branches;
next	1.7.2.5;

1.7.2.5
date	2012.11.30.22.42.18;	author svnexp;	state Exp;
branches;
next	1.7.2.6;

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

1.7.2.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.7.2.1.4.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.7.2.1.6.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.7.2.2.2.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.7.2.2.2.2;

1.7.2.2.2.2
date	2012.11.17.08.24.32;	author svnexp;	state Exp;
branches;
next	;

1.4.2.1
date	2008.04.17.04.59.18;	author jb;	state Exp;
branches
	1.4.2.1.2.1
	1.4.2.1.4.1;
next	1.4.2.2;

1.4.2.2
date	2009.05.20.23.34.59;	author kmacy;	state Exp;
branches
	1.4.2.2.2.1
	1.4.2.2.4.1;
next	1.4.2.3;

1.4.2.3
date	2012.11.17.08.00.53;	author svnexp;	state Exp;
branches;
next	;

1.4.2.1.2.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.4.2.1.4.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.4.2.2.2.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.4.2.2.4.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.4.2.2.4.2;

1.4.2.2.4.2
date	2012.11.17.08.16.32;	author svnexp;	state Exp;
branches;
next	;


desc
@@


1.14
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.bin/ztest/Makefile 248571 2013-03-21 08:38:03Z mm $

.PATH: ${.CURDIR}/../..//contrib/opensolaris/cmd/ztest

PROG=	ztest
NO_MAN=

WARNS?=	0
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/include
CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/lib/libumem
CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libzpool/common
CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libnvpair
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
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}/../../contrib/opensolaris/head
CFLAGS+= -I${.CURDIR}/../../lib/libumem

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

CSTD=	c99

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

.include <bsd.prog.mk>
@


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


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

.PATH: ${.CURDIR}/../..//contrib/opensolaris/cmd/ztest

PROG=	ztest
NO_MAN=

CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/include
CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/lib/libumem
CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libzpool/common
CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libnvpair
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
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}/../../contrib/opensolaris/head
CFLAGS+= -I${.CURDIR}/../../lib/libumem

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

CSTD=	c99

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

.include <bsd.prog.mk>
@


1.13
log
@Switching exporter and resync
@
text
@d1 1
a1 1
# $FreeBSD: head/cddl/usr.bin/ztest/Makefile 240415 2012-09-12 18:05:43Z mm $
d22 3
a24 2
	${LIBPTHREAD} ${LIBAVL} ${LIBZFS} ${LIBUUTIL}
LDADD=	-lgeom -lm -lnvpair -lumem -lzpool -lpthread -lavl -lzfs -luutil
@


1.12
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.11
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
@d27 3
@


1.10
log
@SVN rev 226940 on 2011-10-30 16:29:04Z by rmh

Fix a few gratuitous library dependencies.  Some of the ZFS utilities
are linked with libraries they don't use:

 - zinject doesn't use libavl
 - ztest doesn't use libz
 - zdb uses neither libavl nor libz
 - zfs uses neither libbsdxml nor libm, nor libsbuf
 - zpool uses neither libbsdxml nor libm, nor libsbuf

In addition, libzfs needs libm because it uses pow(), however it isn't
linked with -lm.  This went unnoticed because all its users had -lm before.

Reviewed by:	pjd, mm
Approved by:	kib (mentor)
MFC after:	1 week
@
text
@d14 1
d21 3
a23 3
DPADD=	${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
	${LIBPTHREAD} ${LIBAVL}
LDADD=	-lm -lnvpair -lumem -lzpool -lpthread -lavl
@


1.9
log
@SVN rev 219089 on 2011-02-27 19:41:40Z by pjd

Finally... Import the latest open-source ZFS version - (SPA) 28.

Few new things available from now on:

- Data deduplication.
- Triple parity RAIDZ (RAIDZ3).
- zfs diff.
- zpool split.
- Snapshot holds.
- zpool import -F. Allows to rewind corrupted pool to earlier
  transaction group.
- Possibility to import pool in read-only mode.

MFC after:	1 month
@
text
@d21 2
a22 2
	${LIBPTHREAD} ${LIBZ} ${LIBAVL}
LDADD=	-lm -lnvpair -lumem -lzpool -lpthread -lz -lavl
@


1.9.2.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.9.2.2
log
@SVN rev 240959 on 2012-09-26 12:36:09Z by mm

MFC r226940 (rmh):

Fix a few gratuitous library dependencies. Some of the ZFS utilities
are linked with libraries they don't use:

 - zinject doesn't use libavl
 - ztest doesn't use libz
 - zdb uses neither libavl nor libz
 - zfs uses neither libbsdxml nor libm, nor libsbuf
 - zpool uses neither libbsdxml nor libm, nor libsbuf

In addition, libzfs needs libm because it uses pow(), however it isn't
linked with -lm.  This went unnoticed because all its users had -lm before.
@
text
@d21 2
a22 2
	${LIBPTHREAD} ${LIBAVL}
LDADD=	-lm -lnvpair -lumem -lzpool -lpthread -lavl
@


1.9.2.3
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/cddl/usr.bin/ztest/Makefile 240959 2012-09-26 12:36:09Z mm $
@


1.9.2.4
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
@d1 1
a1 1
# $FreeBSD: stable/9/cddl/usr.bin/ztest/Makefile 243674 2012-11-29 14:05:04Z mm $
a13 1
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
d20 3
a22 3
DPADD=	${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
	${LIBPTHREAD} ${LIBAVL} ${LIBZFS} ${LIBUUTIL}
LDADD=	-lgeom -lm -lnvpair -lumem -lzpool -lpthread -lavl -lzfs -luutil
a25 3
CFLAGS+= -DDEBUG=1
#DEBUG_FLAGS+=	-g

@


1.9.2.5
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.bin/ztest/Makefile 249643 2013-04-19 09:19:10Z mm $
d22 2
a23 3
	${LIBPTHREAD} ${LIBAVL} ${LIBZFS_CORE} ${LIBZFS} ${LIBUUTIL}
LDADD=	-lgeom -lm -lnvpair -lumem -lzpool -lpthread -lavl -lzfs_core -lzfs \
	-luutil
@


1.9.2.1.4.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.9.2.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/cddl/usr.bin/ztest/Makefile 219089 2011-02-27 19:41:40Z pjd $
@


1.9.2.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.9.2.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/cddl/usr.bin/ztest/Makefile 219089 2011-02-27 19:41:40Z pjd $
@


1.8
log
@SVN rev 204597 on 2010-03-02 19:04:07Z by uqs

Remove manual .includes in cddl Makefiles

- Break the dependency on ../Makefile.inc for .PATH, and include
  ../Makefile.inc implicitly. This is required to ...
- Set WARNS?=6 in top-level Makefile.inc
- Remove now redundant WARNS settings, add WARNS?=0 where appropriate
- Remove redundant SHLIB_MAJOR overrides
- Use NO_MAN, not MK_MAN=no
- Remove redundant inclusion of bsd.own.mk
- Order Makefiles more according to style.Makefile(9)
- Reduce diff of cddl Makefiles against each other

No objection:	pjd
Approved by:	ed (co-mentor)
@
text
@d13 1
@


1.7
log
@SVN rev 189801 on 2009-03-14 17:55:16Z by rdivacky

Switch over to gnu99 compilation on default for userland.

Tested by:	make universe
Tested by:	ports exp build (done by pav)
Reviewed by:	ru
Reviewed by:	silence on arch
Approved by:	ed (mentor)
@
text
@d8 1
@


1.7.2.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.7.2.2
log
@SVN rev 222741 on 2011-06-06 09:36:46Z by mm

MFC ZFS version 28 and related revisions:
208682, 211900, 212543, 213791, 216378, 218007, 218725, 219089, 219090,
219092, 219316, 219317, 219320, 219404, 219636, 219703, 219959, 219973,
220447, 220575, 221112, 221177, 221263, 221409, 222050, 222267, 222268

MFC r208682 (pjd):
Fix panic when reading label from provider with non power of 2 sector size.

MFC r211900 (pjd):
Use ZFS_CTLDIR_NAME instead of hardcoding ".zfs".

MFC r212543 (imp):
Simplify atomic selection

MFC r213791 (rpaulo):
Pass a format string to panic() and to taskqueue_start_threads().

Found with:	clang

MFC r216378 (pjd):
Remove redundant semicolon and empty like.

MFC r218007 (jchandra):
CDDL fixes for MIPS n32.

Provide 64 bit atomic ops, and use 32 bit pointer.

MFC r218725 (dim):
When building libzpool on ia64 or sparc64, don't add the .note.GNU-stack
section.

MFC r219089 (pjd):
Finally... Import the latest open-source ZFS version - (SPA) 28.

Few new things available from now on:

- Data deduplication.
- Triple parity RAIDZ (RAIDZ3).
- zfs diff.
- zpool split.
- Snapshot holds.
- zpool import -F. Allows to rewind corrupted pool to earlier
  transaction group.
- Possibility to import pool in read-only mode.

MFC r219090 (pjd):
Commit two more files missed in r219089.

MFC r219092 (pjd):
Use proper lock in assertion.

MFC r219316 (pjd):
Simplify zvol_remove_minors() a bit.

MFC r219317 (pjd):
Make renaming of a ZVOL, ZVOL's parent directory and ZVOL snapshot work.

MFC r219320 (pjd):
Fix libzpool build.

MFC r219404 (pjd):
Correct readdir over ZFS handling.

MFC r219636 (pjd):
Fix potential panic in dbuf_sync_list() relate to spill blocks handling.

MFC r219703 (ae):
The size of zfsboot2 grown up to 64 Kbytes in r219089.
Increase NSECT up to 128 sectors too.

MFC r219959 (pjd):
Properly print characters larger than 127.

MFC r219973 (pjd):
Checking file access on size change is bogus. The checks are done earlier by
VFS where we know if this is truncate(2) or ftruncate(2). If this is the
latter we should depend on the mode the file was opened and not on the current
permission.

MFC r220447 (mm):
Partially fix ZFS compat code for sparc64.
Some endianess bugs still need to be resolved.

MFC r220575 (pjd):
Fix 'zfs list <path>' handling. If the path was found, the 'ret' variable was
uninitialized.

MFC r221112 (marcel):
Fix copy-paste bug.

MFC r221177 (jhb):
Due to space constraints, the UFS boot2 and boot1 use an evil hack where
boot2 calls back into boot1 to perform disk reads.  The ZFS MBR boot blocks
do not have the same space constraints, so remove this hack for ZFS.
While here, remove commented out code to support C/H/S addressing from
zfsldr.  The ZFS and GPT bootstraps always just use EDD LBA addressing.

MFC r221263 (mm):
Fix deduplicated zfs receive
(dmu_recv_stream builds incomplete guid_to_ds_map)

Illumos-gate changeset: 13329:c48b8bf84ab7

MFC r221409 (marius):
Convert the last use of xcopyout() to ddi_copyout() and remove the now
unused xcopyin() as well as xcopyout().

MFC r222050 (mm):
Restore old (v15) behaviour for a recursive snapshot destroy.
(zfs destroy -r pool/dataset@@snapshot)

To destroy all descendent snapshots with the same name the top level
snapshot was not required to exist. So if the top level snapshot does
not exist, check permissions of the parent dataset instead.

Filed as Illumos Bug #1043

MFC r222267 (pjd):
Don't access task structure once we call task function.
The task structure might be no longer available.
This also allows to eliminates the need for two tasks in the zio structure.

MFC r222268 (pjd):
Don't pass pointer to name buffer which is on the stack to another thread,
because the stack might be paged out once the other thread tries to use the
data. Instead, just allocate memory.

Discussed with:		pjd
@
text
@a11 1
CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libnvpair
@


1.7.2.3
log
@SVN rev 240960 on 2012-09-26 12:36:22Z by mm

MFC r226940 (rmh):

Fix a few gratuitous library dependencies. Some of the ZFS utilities
are linked with libraries they don't use:

 - zinject doesn't use libavl
 - ztest doesn't use libz
 - zdb uses neither libavl nor libz
 - zfs uses neither libbsdxml nor libm, nor libsbuf
 - zpool uses neither libbsdxml nor libm, nor libsbuf

In addition, libzfs needs libm because it uses pow(), however it isn't
linked with -lm.  This went unnoticed because all its users had -lm before.
@
text
@d20 2
a21 2
	${LIBPTHREAD} ${LIBAVL}
LDADD=	-lm -lnvpair -lumem -lzpool -lpthread -lavl
@


1.7.2.4
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/8/cddl/usr.bin/ztest/Makefile 240960 2012-09-26 12:36:22Z mm $
@


1.7.2.5
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
@d1 1
a1 1
# $FreeBSD: stable/8/cddl/usr.bin/ztest/Makefile 243717 2012-11-30 22:38:42Z mm $
a12 1
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
d19 3
a21 3
DPADD=	${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
	${LIBPTHREAD} ${LIBAVL} ${LIBZFS} ${LIBUUTIL}
LDADD=	-lgeom -lm -lnvpair -lumem -lzpool -lpthread -lavl -lzfs -luutil
a24 3
CFLAGS+= -DDEBUG=1
#DEBUG_FLAGS+=	-g

@


1.7.2.6
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.bin/ztest/Makefile 251757 2013-06-14 19:26:32Z mm $
d21 2
a22 3
	${LIBPTHREAD} ${LIBAVL} ${LIBZFS_CORE} ${LIBZFS} ${LIBUUTIL}
LDADD=	-lgeom -lm -lnvpair -lumem -lzpool -lpthread -lavl -lzfs_core -lzfs \
	-luutil
@


1.7.2.2.2.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.7.2.2.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/cddl/usr.bin/ztest/Makefile 222741 2011-06-06 09:36:46Z mm $
@


1.7.2.1.6.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.7.2.1.4.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.7.2.1.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.6
log
@SVN rev 185029 on 2008-11-17 20:49:29Z by pjd

Update ZFS from version 6 to 13 and bring some FreeBSD-specific changes.

This bring huge amount of changes, I'll enumerate only user-visible changes:

- Delegated Administration

	Allows regular users to perform ZFS operations, like file system
	creation, snapshot creation, etc.

- L2ARC

	Level 2 cache for ZFS - allows to use additional disks for cache.
	Huge performance improvements mostly for random read of mostly
	static content.

- slog

	Allow to use additional disks for ZFS Intent Log to speed up
	operations like fsync(2).

- vfs.zfs.super_owner

	Allows regular users to perform privileged operations on files stored
	on ZFS file systems owned by him. Very careful with this one.

- chflags(2)

	Not all the flags are supported. This still needs work.

- ZFSBoot

	Support to boot off of ZFS pool. Not finished, AFAIK.

	Submitted by:	dfr

- Snapshot properties

- New failure modes

	Before if write requested failed, system paniced. Now one
	can select from one of three failure modes:
	- panic - panic on write error
	- wait - wait for disk to reappear
	- continue - serve read requests if possible, block write requests

- Refquota, refreservation properties

	Just quota and reservation properties, but don't count space consumed
	by children file systems, clones and snapshots.

- Sparse volumes

	ZVOLs that don't reserve space in the pool.

- External attributes

	Compatible with extattr(2).

- NFSv4-ACLs

	Not sure about the status, might not be complete yet.

	Submitted by:	trasz

- Creation-time properties

- Regression tests for zpool(8) command.

Obtained from:	OpenSolaris
@
text
@a7 2
CFLAGS+= -std=c99

d22 2
@


1.5
log
@The sources covered by Sun's CDDL have been repo copied below the
src/cddl and src/sys/cddl directories per the core@@ decision following
the license review.

This change modifies the affected Makefiles to reference the sources
in their new location.
@
text
@d3 1
a3 1
.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/ztest
d8 2
d11 3
a13 3
CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
d17 1
a17 1
CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
@


1.4
log
@Fixed static linkage (build with -DNO_SHARED).

Approved by:	re (kensmith)
@
text
@d3 1
a3 1
.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/ztest
d8 8
a15 8
CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris
CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include
CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem
CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common
CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
@


1.4.2.1
log
@MFC. Step 2 of the big CDDL file move. Use the files in their new
locations. The next step will be to remove the files from their
old locations.
@
text
@d3 1
a3 1
.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/ztest
d8 8
a15 8
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/libzpool/common
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}/../../../cddl/contrib/opensolaris/head
@


1.4.2.2
log
@SVN rev 192498 on 2009-05-20 23:34:59Z by kmacy

MFC ZFS version 13. This includes the changes by pjd (see original message
below) as well as the following:

- the recurring deadlock was fixed by deferring vinactive to a dedicated thread

- zfs boot for all pool types now works
      Submitted by: dfr

- kmem now goes up to 512GB so arc is now limited by physmem

- the arc now experiences backpressure from the vm (which can be too
much - but this allows ZFS to work without any tunables on amd64)

- frequently recurring LOR in the ARC fixed

- zfs send coredump fix

- fixes for various PRs

Supported by: Barrett Lyon, BitGravity

Revision 185029 - (view) (annotate) - [select for diffs]
Modified Mon Nov 17 20:49:29 2008 UTC (6 months ago) by pjd
File length: 38244 byte(s)
Diff to previous 177698

Update ZFS from version 6 to 13 and bring some FreeBSD-specific changes.

This bring huge amount of changes, I'll enumerate only user-visible changes:

- Delegated Administration

       Allows regular users to perform ZFS operations, like file system
       creation, snapshot creation, etc.

- L2ARC

       Level 2 cache for ZFS - allows to use additional disks for cache.
       Huge performance improvements mostly for random read of mostly
       static content.

- slog

       Allow to use additional disks for ZFS Intent Log to speed up
       operations like fsync(2).

- vfs.zfs.super_owner

       Allows regular users to perform privileged operations on files stored
       on ZFS file systems owned by him. Very careful with this one.

- chflags(2)

       Not all the flags are supported. This still needs work.

- ZFSBoot

       Support to boot off of ZFS pool. Not finished, AFAIK.

       Submitted by:   dfr

- Snapshot properties

- New failure modes

       Before if write requested failed, system paniced. Now one
       can select from one of three failure modes:

       Before if write requested failed, system paniced. Now one
       can select from one of three failure modes:
       - panic - panic on write error
       - wait - wait for disk to reappear
       - continue - serve read requests if possible, block write requests

- Refquota, refreservation properties

       Just quota and reservation properties, but don't count space consumed
       by children file systems, clones and snapshots.

 - Sparse volumes

       ZVOLs that don't reserve space in the pool.

 - External attributes

       Compatible with extattr(2).

 - NFSv4-ACLs

       Not sure about the status, might not be complete yet.

       Submitted by:   trasz

 - Creation-time properties

 - Regression tests for zpool(8) command.

 Obtained from:        OpenSolaris
@
text
@d3 1
a3 1
.PATH: ${.CURDIR}/../..//contrib/opensolaris/cmd/ztest
d9 3
a11 3
CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/include
CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/lib/libumem
CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libzpool/common
d15 1
a15 1
CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head
a21 2
CSTD=	c99

@


1.4.2.3
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/cddl/usr.bin/ztest/Makefile 192498 2009-05-20 23:34:59Z kmacy $
@


1.4.2.2.4.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.4.2.2.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/cddl/usr.bin/ztest/Makefile 192498 2009-05-20 23:34:59Z kmacy $
@


1.4.2.2.2.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.4.2.1.4.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.4.2.1.2.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


1.3
log
@Link libzpool, ztest and zdb against libpthread.

Requested by:	ru
@
text
@d18 3
a20 2
DPADD=	${LIBAVL} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} ${LIBZPOOL}
LDADD=	-lavl -lm -lnvpair -lpthread -lumem -lzpool
@


1.2
log
@Apply a set of style.Makefile(5) changes to src/cddl/ makefiles.
There are some insignificant non-style changes as well.

Not fixed: makefiles use ${LIBTHR} that doesn't exist, thus
breaking "make checkdpadd" and not tracking dependencies
properly.

Approved by:	pjd
@
text
@d18 2
a19 2
DPADD=	${LIBAVL} ${LIBM} ${LIBNVPAIR} ${LIBTHR} ${LIBUMEM} ${LIBZPOOL}
LDADD=	-lavl -lm -lnvpair -lthr -lumem -lzpool
@


1.1
log
@Please welcome ZFS - The last word in file systems.

ZFS file system was ported from OpenSolaris operating system. The code in under
CDDL license.

I'd like to thank all SUN developers that created this great piece of software.

Supported by:	Wheel LTD (http://www.wheel.pl/)
Supported by:	The FreeBSD Foundation (http://www.freebsdfoundation.org/)
Supported by:	Sentex (http://www.sentex.net/)
@
text
@d3 1
a3 1
.PATH:	${.CURDIR}/../../../contrib/opensolaris/cmd/ztest
d6 1
d8 9
a16 10
CFLAGS+=-I${.CURDIR}/../../../sys/compat/opensolaris
CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/include
CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/lib/libumem
CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common
CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/head
CFLAGS+=-I${.CURDIR}/../../lib/libumem
CFLAGS+=-I${.CURDIR}/../../../sys
a20 2
NO_MAN=

@

