head	1.12;
access;
symbols
	RELENG_8_4:1.12.0.2
	RELENG_9_1_0_RELEASE:1.6.2.1.4.2
	RELENG_9_1:1.6.2.1.0.4
	RELENG_9_1_BP:1.6.2.1
	RELENG_8_3_0_RELEASE:1.4.2.2.2.1
	RELENG_8_3:1.4.2.2.0.2
	RELENG_8_3_BP:1.4.2.2
	RELENG_9_0_0_RELEASE:1.6.2.1.2.1
	RELENG_9_0:1.6.2.1.0.2
	RELENG_9_0_BP:1.6.2.1
	RELENG_9:1.6.0.2
	RELENG_9_BP:1.6
	RELENG_7_4_0_RELEASE:1.3.2.1.8.1
	RELENG_8_2_0_RELEASE:1.4.2.1.6.1
	RELENG_7_4:1.3.2.1.0.8
	RELENG_7_4_BP:1.3.2.1
	RELENG_8_2:1.4.2.1.0.6
	RELENG_8_2_BP:1.4.2.1
	RELENG_8_1_0_RELEASE:1.4.2.1.4.1
	RELENG_8_1:1.4.2.1.0.4
	RELENG_8_1_BP:1.4.2.1
	RELENG_7_3_0_RELEASE:1.3.2.1.6.1
	RELENG_7_3:1.3.2.1.0.6
	RELENG_7_3_BP:1.3.2.1
	RELENG_8_0_0_RELEASE:1.4.2.1.2.1
	RELENG_8_0:1.4.2.1.0.2
	RELENG_8_0_BP:1.4.2.1
	RELENG_8:1.4.0.2
	RELENG_8_BP:1.4
	RELENG_7_2_0_RELEASE:1.3.2.1.4.1
	RELENG_7_2:1.3.2.1.0.4
	RELENG_7_2_BP:1.3.2.1
	RELENG_7_1_0_RELEASE:1.3.2.1.2.1
	RELENG_7_1:1.3.2.1.0.2
	RELENG_7_1_BP:1.3.2.1
	RELENG_7_0_0_RELEASE:1.3
	RELENG_7_0:1.3.0.4
	RELENG_7_0_BP:1.3
	RELENG_7:1.3.0.2
	RELENG_7_BP:1.3;
locks; strict;
comment	@# @;


1.12
date	2013.03.22.02.29.23;	author svnexp;	state Exp;
branches
	1.12.2.1;
next	1.11;

1.11
date	2012.11.17.01.48.40;	author svnexp;	state Exp;
branches;
next	1.10;

1.10
date	2012.09.19.16.20.49;	author bapt;	state Exp;
branches;
next	1.9;

1.9
date	2011.11.21.14.50.17;	author mm;	state Exp;
branches;
next	1.8;

1.8
date	2011.11.18.01.28.52;	author mm;	state Exp;
branches;
next	1.7;

1.7
date	2011.10.30.16.29.04;	author rmh;	state Exp;
branches;
next	1.6;

1.6
date	2011.02.27.19.41.40;	author pjd;	state Exp;
branches
	1.6.2.1;
next	1.5;

1.5
date	2010.03.02.19.04.07;	author uqs;	state Exp;
branches;
next	1.4;

1.4
date	2008.03.27.23.21.24;	author jb;	state Exp;
branches
	1.4.2.1;
next	1.3;

1.3
date	2007.10.01.18.17.23;	author ru;	state Exp;
branches
	1.3.2.1;
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.57;	author pjd;	state Exp;
branches;
next	;

1.12.2.1
date	2013.03.22.02.29.23;	author svnexp;	state dead;
branches;
next	1.12.2.2;

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

1.6.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.6.2.1.2.1
	1.6.2.1.4.1;
next	1.6.2.2;

1.6.2.2
date	2012.09.26.12.36.09;	author mm;	state Exp;
branches;
next	1.6.2.3;

1.6.2.3
date	2012.11.17.11.36.04;	author svnexp;	state Exp;
branches;
next	1.6.2.4;

1.6.2.4
date	2013.02.13.00.03.18;	author svnexp;	state Exp;
branches;
next	1.6.2.5;

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

1.6.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.6.2.1.2.2;

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

1.6.2.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.6.2.1.4.2;

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

1.4.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.4.2.1.2.1
	1.4.2.1.4.1
	1.4.2.1.6.1;
next	1.4.2.2;

1.4.2.2
date	2011.06.06.09.36.46;	author mm;	state Exp;
branches
	1.4.2.2.2.1;
next	1.4.2.3;

1.4.2.3
date	2012.09.26.12.36.22;	author mm;	state Exp;
branches;
next	1.4.2.4;

1.4.2.4
date	2012.11.17.10.35.50;	author svnexp;	state Exp;
branches;
next	1.4.2.5;

1.4.2.5
date	2013.02.13.07.22.14;	author svnexp;	state Exp;
branches;
next	1.4.2.6;

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

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

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

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

1.4.2.2.2.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.4.2.2.2.2;

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

1.3.2.1
date	2008.04.17.04.59.17;	author jb;	state Exp;
branches
	1.3.2.1.2.1
	1.3.2.1.4.1
	1.3.2.1.6.1
	1.3.2.1.8.1;
next	1.3.2.2;

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

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

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

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

1.3.2.1.8.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.3.2.1.8.2;

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


desc
@@


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

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

PROG=	zfs
MAN=	zfs.8
SRCS=	zfs_main.c zfs_iter.c

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

DPADD=	${LIBGEOM} ${LIBJAIL} ${LIBNVPAIR} ${LIBUMEM} \
	${LIBUTIL} ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS}
LDADD=	-lgeom -ljail -lnvpair -lumem -lutil -luutil -lzfs_core -lzfs

.include <bsd.prog.mk>
@


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


1.12.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 27
# $FreeBSD: releng/8.4/cddl/sbin/zfs/Makefile 246750 2013-02-13 06:46:53Z bapt $

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

PROG=	zfs
MAN=	zfs.8
SRCS=	zfs_main.c zfs_iter.c

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

DPADD=	${LIBGEOM} ${LIBJAIL} ${LIBNVPAIR} ${LIBUMEM} \
	${LIBUTIL} ${LIBUUTIL} ${LIBZFS}
LDADD=	-lgeom -ljail -lnvpair -lumem -lutil -luutil -lzfs

.include <bsd.prog.mk>
@


1.11
log
@Switching exporter and resync
@
text
@d1 1
a1 1
# $FreeBSD: head/cddl/sbin/zfs/Makefile 240696 2012-09-19 16:20:49Z bapt $
d17 1
d26 2
a27 2
	${LIBUTIL} ${LIBUUTIL} ${LIBZFS}
LDADD=	-lgeom -ljail -lnvpair -lumem -lutil -luutil -lzfs
@


1.10
log
@SVN rev 240696 on 2012-09-19 16:20:49Z by bapt

Allow zfs jail and zfs unjail to use both jailnames and jailid

Reviewed by:	pjd
MFC after:	1 month
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.9
log
@SVN rev 227793 on 2011-11-21 14:50:17Z by mm

For now, remove MANFILTER from ZFS manpages (bad effect on html output).

MFC after:	4 days
@
text
@d24 1
a24 1
DPADD=	${LIBGEOM} ${LIBNVPAIR} ${LIBUMEM} \
d26 1
a26 1
LDADD=	-lgeom -lnvpair -lumem -lutil -luutil -lzfs
@


1.8
log
@SVN rev 227646 on 2011-11-18 01:28:52Z by mm

Update and desolarization of zfs(8) and zpool(8) manual pages:
- synchronized to match new vendor code (Illumos rev. 13513) [1]
- removed references to sun commands (replaced with FreeBSD commands)
- removed ATTRIBUTES sections
- updated SEE ALSO sections
- properly updated copyright information (required by CDDL)
- remove empty lines via MANFILTER

zfs(8) only:
- replaced "Zones" section with new "Jails" section
- removed misleading "ZFS Volumes as Swap or Dump Devices" section
- updated shareiscsi and sharesmb option information (not supported on FreeBSD)
- replace zoned property with jailed property

zpool(8) only:
- updated device names in examples

Obtained from:	Illumos (as of rev. 13513:f84d4672fdbd) [1]
MFC after:	1 week
@
text
@a27 2
MANFILTER=	sed -e '/^$$/d'

@


1.7
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
@d28 2
@


1.6
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
@d24 1
a24 1
DPADD=	${LIBBSDXML} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} ${LIBUMEM} \
d26 1
a26 1
LDADD=	-lbsdxml -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs
@


1.6.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.6.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
@d24 1
a24 1
DPADD=	${LIBGEOM} ${LIBNVPAIR} ${LIBUMEM} \
d26 1
a26 1
LDADD=	-lgeom -lnvpair -lumem -lutil -luutil -lzfs
@


1.6.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/sbin/zfs/Makefile 240959 2012-09-26 12:36:09Z mm $
@


1.6.2.4
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/246723
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/cddl/sbin/zfs/Makefile 246723 2013-02-12 23:01:21Z bapt $
d24 1
a24 1
DPADD=	${LIBGEOM} ${LIBJAIL} ${LIBNVPAIR} ${LIBUMEM} \
d26 1
a26 1
LDADD=	-lgeom -ljail -lnvpair -lumem -lutil -luutil -lzfs
@


1.6.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/sbin/zfs/Makefile 249643 2013-04-19 09:19:10Z mm $
a16 1
CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common
d25 2
a26 2
	${LIBUTIL} ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS}
LDADD=	-lgeom -ljail -lnvpair -lumem -lutil -luutil -lzfs_core -lzfs
@


1.6.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.6.2.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/cddl/sbin/zfs/Makefile 219089 2011-02-27 19:41:40Z pjd $
@


1.6.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.6.2.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/cddl/sbin/zfs/Makefile 219089 2011-02-27 19:41:40Z pjd $
@


1.5
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
@d22 1
d24 3
a26 4
DPADD=	${LIBZFS} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} \
	${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL}
LDADD=	-lzfs -lgeom -lbsdxml -lsbuf \
	-lm -lnvpair -luutil -lutil
@


1.4
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
@d9 1
@


1.4.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.4.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
@a20 1
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
d22 4
a25 3
DPADD=	${LIBBSDXML} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} ${LIBUMEM} \
	${LIBUTIL} ${LIBUUTIL} ${LIBZFS}
LDADD=	-lbsdxml -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs
@


1.4.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
@d23 1
a23 1
DPADD=	${LIBGEOM} ${LIBNVPAIR} ${LIBUMEM} \
d25 1
a25 1
LDADD=	-lgeom -lnvpair -lumem -lutil -luutil -lzfs
@


1.4.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/sbin/zfs/Makefile 240960 2012-09-26 12:36:22Z mm $
@


1.4.2.5
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/246750
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d1 1
a1 1
# $FreeBSD: stable/8/cddl/sbin/zfs/Makefile 246750 2013-02-13 06:46:53Z bapt $
d23 1
a23 1
DPADD=	${LIBGEOM} ${LIBJAIL} ${LIBNVPAIR} ${LIBUMEM} \
d25 1
a25 1
LDADD=	-lgeom -ljail -lnvpair -lumem -lutil -luutil -lzfs
@


1.4.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/sbin/zfs/Makefile 251757 2013-06-14 19:26:32Z mm $
a15 1
CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common
d24 2
a25 2
	${LIBUTIL} ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS}
LDADD=	-lgeom -ljail -lnvpair -lumem -lutil -luutil -lzfs_core -lzfs
@


1.4.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.4.2.2.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/cddl/sbin/zfs/Makefile 222741 2011-06-06 09:36:46Z mm $
@


1.4.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.4.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.4.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.3
log
@Fixed static linkage (build with -DNO_SHARED).

Approved by:	re (kensmith)
@
text
@d3 1
a3 1
.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zfs
d9 12
a20 12
CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common
CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include
CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem
CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris
CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common
CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common
CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libumem/common
CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair
CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
@


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


1.3.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/cddl/sbin/zfs/Makefile 178275 2008-04-17 04:59:18Z jb $
@


1.3.2.1.8.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.3.2.1.8.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/cddl/sbin/zfs/Makefile 178275 2008-04-17 04:59:18Z jb $
@


1.3.2.1.6.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.3.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.3.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.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
@d22 4
a25 2
DPADD=	${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBZFS}
LDADD=	-lgeom -lm -lnvpair -luutil -lzfs
@


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/zfs
d7 1
a7 2
SRCS=	zfs_main.c
SRCS+=	zfs_iter.c
d9 12
a20 13
CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common
CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/include
CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/lib/libumem
CFLAGS+=-I${.CURDIR}/../../../sys/compat/opensolaris
CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/head
CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common
CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common
CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libumem/common
CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair
CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
CFLAGS+=-I${.CURDIR}/../../../sys
@

