svn commit: r228080 - in user/attilio/vmcontention: bin/sh cddl/contrib/opensolaris/cmd/zdb cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/cmd/zpool cddl/contrib/opensolaris/cmd/zstreamd...

Attilio Rao attilio at FreeBSD.org
Mon Nov 28 17:40:43 UTC 2011


Author: attilio
Date: Mon Nov 28 17:40:42 2011
New Revision: 228080
URL: http://svn.freebsd.org/changeset/base/228080

Log:
  MFC

Added:
  user/attilio/vmcontention/contrib/gperf/configure.ac
     - copied unchanged from r228079, head/contrib/gperf/configure.ac
  user/attilio/vmcontention/contrib/gperf/doc/configure.ac
     - copied unchanged from r228079, head/contrib/gperf/doc/configure.ac
  user/attilio/vmcontention/contrib/gperf/lib/configure.ac
     - copied unchanged from r228079, head/contrib/gperf/lib/configure.ac
  user/attilio/vmcontention/contrib/gperf/lib/getline.cc
     - copied unchanged from r228079, head/contrib/gperf/lib/getline.cc
  user/attilio/vmcontention/contrib/gperf/lib/getline.h
     - copied unchanged from r228079, head/contrib/gperf/lib/getline.h
  user/attilio/vmcontention/contrib/gperf/src/config.h_vms
     - copied unchanged from r228079, head/contrib/gperf/src/config.h_vms
  user/attilio/vmcontention/contrib/gperf/src/configure.ac
     - copied unchanged from r228079, head/contrib/gperf/src/configure.ac
  user/attilio/vmcontention/contrib/gperf/src/input.cc
     - copied unchanged from r228079, head/contrib/gperf/src/input.cc
  user/attilio/vmcontention/contrib/gperf/src/input.h
     - copied unchanged from r228079, head/contrib/gperf/src/input.h
  user/attilio/vmcontention/contrib/gperf/src/keyword-list.cc
     - copied unchanged from r228079, head/contrib/gperf/src/keyword-list.cc
  user/attilio/vmcontention/contrib/gperf/src/keyword-list.h
     - copied unchanged from r228079, head/contrib/gperf/src/keyword-list.h
  user/attilio/vmcontention/contrib/gperf/src/keyword-list.icc
     - copied unchanged from r228079, head/contrib/gperf/src/keyword-list.icc
  user/attilio/vmcontention/contrib/gperf/src/keyword.cc
     - copied unchanged from r228079, head/contrib/gperf/src/keyword.cc
  user/attilio/vmcontention/contrib/gperf/src/keyword.h
     - copied unchanged from r228079, head/contrib/gperf/src/keyword.h
  user/attilio/vmcontention/contrib/gperf/src/keyword.icc
     - copied unchanged from r228079, head/contrib/gperf/src/keyword.icc
  user/attilio/vmcontention/contrib/gperf/src/output.cc
     - copied unchanged from r228079, head/contrib/gperf/src/output.cc
  user/attilio/vmcontention/contrib/gperf/src/output.h
     - copied unchanged from r228079, head/contrib/gperf/src/output.h
  user/attilio/vmcontention/contrib/gperf/src/positions.cc
     - copied unchanged from r228079, head/contrib/gperf/src/positions.cc
  user/attilio/vmcontention/contrib/gperf/src/positions.h
     - copied unchanged from r228079, head/contrib/gperf/src/positions.h
  user/attilio/vmcontention/contrib/gperf/src/positions.icc
     - copied unchanged from r228079, head/contrib/gperf/src/positions.icc
  user/attilio/vmcontention/contrib/gperf/src/search.cc
     - copied unchanged from r228079, head/contrib/gperf/src/search.cc
  user/attilio/vmcontention/contrib/gperf/src/search.h
     - copied unchanged from r228079, head/contrib/gperf/src/search.h
  user/attilio/vmcontention/contrib/libcxxrt/LICENSE
     - copied unchanged from r228079, head/contrib/libcxxrt/LICENSE
  user/attilio/vmcontention/share/man/man4/capsicum.4
     - copied unchanged from r228079, head/share/man/man4/capsicum.4
  user/attilio/vmcontention/sys/sparc64/sparc64/cam_machdep.c
     - copied unchanged from r228079, head/sys/sparc64/sparc64/cam_machdep.c
  user/attilio/vmcontention/tools/regression/bin/sh/builtins/case11.0
     - copied unchanged from r228079, head/tools/regression/bin/sh/builtins/case11.0
  user/attilio/vmcontention/tools/regression/bin/sh/builtins/case12.0
     - copied unchanged from r228079, head/tools/regression/bin/sh/builtins/case12.0
  user/attilio/vmcontention/usr.bin/m4/lib/
     - copied from r228079, head/usr.bin/m4/lib/
  user/attilio/vmcontention/usr.bin/m4/parser.y
     - copied unchanged from r228079, head/usr.bin/m4/parser.y
  user/attilio/vmcontention/usr.bin/m4/tokenizer.l
     - copied unchanged from r228079, head/usr.bin/m4/tokenizer.l
Replaced:
  user/attilio/vmcontention/contrib/gperf/doc/gperf.texi
     - copied unchanged from r228079, head/contrib/gperf/doc/gperf.texi
  user/attilio/vmcontention/contrib/gperf/doc/gpl.texinfo
     - copied unchanged from r228079, head/contrib/gperf/doc/gpl.texinfo
Deleted:
  user/attilio/vmcontention/contrib/gperf/acconfig.h
  user/attilio/vmcontention/contrib/gperf/configure.in
  user/attilio/vmcontention/contrib/gperf/doc/configure.in
  user/attilio/vmcontention/contrib/gperf/doc/texinfo.tex
  user/attilio/vmcontention/contrib/gperf/lib/configure.in
  user/attilio/vmcontention/contrib/gperf/src/configure.in
  user/attilio/vmcontention/contrib/gperf/src/gen-perf.cc
  user/attilio/vmcontention/contrib/gperf/src/gen-perf.h
  user/attilio/vmcontention/contrib/gperf/src/iterator.cc
  user/attilio/vmcontention/contrib/gperf/src/iterator.h
  user/attilio/vmcontention/contrib/gperf/src/key-list.cc
  user/attilio/vmcontention/contrib/gperf/src/key-list.h
  user/attilio/vmcontention/contrib/gperf/src/list-node.cc
  user/attilio/vmcontention/contrib/gperf/src/list-node.h
  user/attilio/vmcontention/contrib/gperf/src/new.cc
  user/attilio/vmcontention/contrib/gperf/src/read-line.cc
  user/attilio/vmcontention/contrib/gperf/src/read-line.h
  user/attilio/vmcontention/contrib/gperf/src/read-line.icc
  user/attilio/vmcontention/contrib/gperf/src/trace.cc
  user/attilio/vmcontention/contrib/gperf/src/trace.h
  user/attilio/vmcontention/contrib/gperf/src/vectors.cc
  user/attilio/vmcontention/contrib/gperf/src/vectors.h
  user/attilio/vmcontention/contrib/gperf/tests/
Modified:
  user/attilio/vmcontention/bin/sh/eval.c
  user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zdb/zdb.8
  user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zfs/zfs.8
  user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
  user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zpool/zpool.8
  user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
  user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.1
  user/attilio/vmcontention/cddl/lib/drti/Makefile
  user/attilio/vmcontention/contrib/gperf/AUTHORS
  user/attilio/vmcontention/contrib/gperf/COPYING
  user/attilio/vmcontention/contrib/gperf/ChangeLog
  user/attilio/vmcontention/contrib/gperf/FREEBSD-Xlist
  user/attilio/vmcontention/contrib/gperf/INSTALL
  user/attilio/vmcontention/contrib/gperf/Makefile.devel
  user/attilio/vmcontention/contrib/gperf/Makefile.in
  user/attilio/vmcontention/contrib/gperf/NEWS
  user/attilio/vmcontention/contrib/gperf/README
  user/attilio/vmcontention/contrib/gperf/aclocal.m4
  user/attilio/vmcontention/contrib/gperf/configure
  user/attilio/vmcontention/contrib/gperf/doc/Makefile.in
  user/attilio/vmcontention/contrib/gperf/doc/configure
  user/attilio/vmcontention/contrib/gperf/doc/gperf.1
  user/attilio/vmcontention/contrib/gperf/doc/help2man
  user/attilio/vmcontention/contrib/gperf/lib/Makefile.in
  user/attilio/vmcontention/contrib/gperf/lib/configure
  user/attilio/vmcontention/contrib/gperf/lib/hash.cc
  user/attilio/vmcontention/contrib/gperf/lib/hash.h
  user/attilio/vmcontention/contrib/gperf/src/Makefile.in
  user/attilio/vmcontention/contrib/gperf/src/bool-array.cc
  user/attilio/vmcontention/contrib/gperf/src/bool-array.h
  user/attilio/vmcontention/contrib/gperf/src/bool-array.icc
  user/attilio/vmcontention/contrib/gperf/src/config.h.in
  user/attilio/vmcontention/contrib/gperf/src/configure
  user/attilio/vmcontention/contrib/gperf/src/hash-table.cc
  user/attilio/vmcontention/contrib/gperf/src/hash-table.h
  user/attilio/vmcontention/contrib/gperf/src/main.cc
  user/attilio/vmcontention/contrib/gperf/src/options.cc
  user/attilio/vmcontention/contrib/gperf/src/options.h
  user/attilio/vmcontention/contrib/gperf/src/options.icc
  user/attilio/vmcontention/contrib/gperf/src/version.cc
  user/attilio/vmcontention/contrib/gperf/src/version.h
  user/attilio/vmcontention/contrib/libcxxrt/exception.cc
  user/attilio/vmcontention/contrib/libcxxrt/memory.cc
  user/attilio/vmcontention/gnu/usr.bin/gperf/Makefile
  user/attilio/vmcontention/gnu/usr.bin/gperf/config.h
  user/attilio/vmcontention/lib/libc/gen/_pthread_stubs.c
  user/attilio/vmcontention/lib/libc/sys/cap_enter.2
  user/attilio/vmcontention/lib/libc/sys/cap_new.2
  user/attilio/vmcontention/lib/libcxxrt/Makefile
  user/attilio/vmcontention/lib/libpam/modules/pam_unix/Makefile
  user/attilio/vmcontention/release/doc/en_US.ISO8859-1/hardware/article.sgml
  user/attilio/vmcontention/rescue/rescue/Makefile
  user/attilio/vmcontention/share/man/man4/Makefile
  user/attilio/vmcontention/share/man/man4/netmap.4
  user/attilio/vmcontention/sys/cam/cam_xpt.c
  user/attilio/vmcontention/sys/conf/NOTES
  user/attilio/vmcontention/sys/conf/files.sparc64
  user/attilio/vmcontention/sys/conf/makeLINT.mk
  user/attilio/vmcontention/sys/dev/sfxge/common/efsys.h
  user/attilio/vmcontention/sys/dev/sfxge/common/efx.h   (contents, props changed)
  user/attilio/vmcontention/sys/dev/sfxge/common/efx_bootcfg.c   (contents, props changed)
  user/attilio/vmcontention/sys/dev/sfxge/common/efx_ev.c   (contents, props changed)
  user/attilio/vmcontention/sys/dev/sfxge/common/efx_filter.c   (contents, props changed)
  user/attilio/vmcontention/sys/dev/sfxge/common/efx_impl.h   (contents, props changed)
  user/attilio/vmcontention/sys/dev/sfxge/common/efx_intr.c   (contents, props changed)
  user/attilio/vmcontention/sys/dev/sfxge/common/efx_mac.c   (contents, props changed)
  user/attilio/vmcontention/sys/dev/sfxge/common/efx_mcdi.c   (contents, props changed)
  user/attilio/vmcontention/sys/dev/sfxge/common/efx_mcdi.h   (contents, props changed)
  user/attilio/vmcontention/sys/dev/sfxge/common/efx_mon.c   (contents, props changed)
  user/attilio/vmcontention/sys/dev/sfxge/common/efx_nic.c   (contents, props changed)
  user/attilio/vmcontention/sys/dev/sfxge/common/efx_nvram.c   (contents, props changed)
  user/attilio/vmcontention/sys/dev/sfxge/common/efx_phy.c   (contents, props changed)
  user/attilio/vmcontention/sys/dev/sfxge/common/efx_port.c   (contents, props changed)
  user/attilio/vmcontention/sys/dev/sfxge/common/efx_regs.h   (contents, props changed)
  user/attilio/vmcontention/sys/dev/sfxge/common/efx_regs_ef10.h   (contents, props changed)
  user/attilio/vmcontention/sys/dev/sfxge/common/efx_regs_mcdi.h   (contents, props changed)
  user/attilio/vmcontention/sys/dev/sfxge/common/efx_regs_pci.h   (contents, props changed)
  user/attilio/vmcontention/sys/dev/sfxge/common/efx_rx.c   (contents, props changed)
  user/attilio/vmcontention/sys/dev/sfxge/common/efx_sram.c   (contents, props changed)
  user/attilio/vmcontention/sys/dev/sfxge/common/efx_tx.c   (contents, props changed)
  user/attilio/vmcontention/sys/dev/sfxge/common/efx_types.h   (contents, props changed)
  user/attilio/vmcontention/sys/dev/sfxge/common/efx_vpd.c   (contents, props changed)
  user/attilio/vmcontention/sys/dev/sfxge/common/efx_wol.c   (contents, props changed)
  user/attilio/vmcontention/sys/dev/sfxge/common/siena_flash.h   (contents, props changed)
  user/attilio/vmcontention/sys/dev/sfxge/common/siena_impl.h   (contents, props changed)
  user/attilio/vmcontention/sys/dev/sfxge/common/siena_mac.c   (contents, props changed)
  user/attilio/vmcontention/sys/dev/sfxge/common/siena_mon.c   (contents, props changed)
  user/attilio/vmcontention/sys/dev/sfxge/common/siena_nic.c   (contents, props changed)
  user/attilio/vmcontention/sys/dev/sfxge/common/siena_nvram.c   (contents, props changed)
  user/attilio/vmcontention/sys/dev/sfxge/common/siena_phy.c   (contents, props changed)
  user/attilio/vmcontention/sys/dev/sfxge/common/siena_sram.c   (contents, props changed)
  user/attilio/vmcontention/sys/dev/sfxge/common/siena_vpd.c   (contents, props changed)
  user/attilio/vmcontention/sys/dev/usb/usb_transfer.h
  user/attilio/vmcontention/sys/fs/ntfs/ntfs_subr.c
  user/attilio/vmcontention/sys/fs/ntfs/ntfs_subr.h
  user/attilio/vmcontention/sys/fs/ntfs/ntfs_vnops.c
  user/attilio/vmcontention/sys/geom/part/g_part_apm.c
  user/attilio/vmcontention/sys/i386/conf/PAE
  user/attilio/vmcontention/sys/kern/kern_proc.c
  user/attilio/vmcontention/sys/mips/atheros/ar71xx_chip.c
  user/attilio/vmcontention/sys/mips/atheros/ar71xx_cpudef.h
  user/attilio/vmcontention/sys/mips/atheros/ar724x_chip.c
  user/attilio/vmcontention/sys/mips/atheros/ar91xx_chip.c
  user/attilio/vmcontention/sys/mips/atheros/if_arge.c
  user/attilio/vmcontention/sys/mips/conf/OCTEON1
  user/attilio/vmcontention/sys/modules/cam/Makefile
  user/attilio/vmcontention/sys/net/if_clone.c
  user/attilio/vmcontention/sys/net/if_clone.h
  user/attilio/vmcontention/sys/netinet/in.c
  user/attilio/vmcontention/sys/netinet/sctp_header.h
  user/attilio/vmcontention/sys/netinet/sctp_output.c
  user/attilio/vmcontention/sys/netinet/tcp_reass.c
  user/attilio/vmcontention/sys/netipsec/xform_ah.c
  user/attilio/vmcontention/sys/netipsec/xform_esp.c
  user/attilio/vmcontention/sys/pc98/include/md_var.h
  user/attilio/vmcontention/sys/pc98/pc98/pc98_machdep.h
  user/attilio/vmcontention/sys/sparc64/include/md_var.h
  user/attilio/vmcontention/sys/sparc64/sparc64/ata_machdep.c
  user/attilio/vmcontention/sys/sys/sysctl.h
  user/attilio/vmcontention/tools/tinder.sh
  user/attilio/vmcontention/usr.bin/m4/Makefile
  user/attilio/vmcontention/usr.bin/m4/eval.c
  user/attilio/vmcontention/usr.bin/m4/expr.c
  user/attilio/vmcontention/usr.bin/m4/extern.h
  user/attilio/vmcontention/usr.bin/m4/gnum4.c
  user/attilio/vmcontention/usr.bin/m4/look.c
  user/attilio/vmcontention/usr.bin/m4/m4.1
  user/attilio/vmcontention/usr.bin/m4/main.c
  user/attilio/vmcontention/usr.bin/m4/mdef.h
  user/attilio/vmcontention/usr.bin/m4/misc.c
  user/attilio/vmcontention/usr.bin/m4/pathnames.h
  user/attilio/vmcontention/usr.bin/m4/stdd.h
  user/attilio/vmcontention/usr.bin/m4/trace.c
  user/attilio/vmcontention/usr.bin/procstat/procstat_auxv.c
  user/attilio/vmcontention/usr.sbin/bsdinstall/distextract/distextract.c
  user/attilio/vmcontention/usr.sbin/bsdinstall/distfetch/distfetch.c
  user/attilio/vmcontention/usr.sbin/bsdinstall/partedit/gpart_ops.c
Directory Properties:
  user/attilio/vmcontention/   (props changed)
  user/attilio/vmcontention/cddl/contrib/opensolaris/   (props changed)
  user/attilio/vmcontention/contrib/bind9/   (props changed)
  user/attilio/vmcontention/contrib/binutils/   (props changed)
  user/attilio/vmcontention/contrib/bzip2/   (props changed)
  user/attilio/vmcontention/contrib/com_err/   (props changed)
  user/attilio/vmcontention/contrib/compiler-rt/   (props changed)
  user/attilio/vmcontention/contrib/dialog/   (props changed)
  user/attilio/vmcontention/contrib/ee/   (props changed)
  user/attilio/vmcontention/contrib/expat/   (props changed)
  user/attilio/vmcontention/contrib/file/   (props changed)
  user/attilio/vmcontention/contrib/gcc/   (props changed)
  user/attilio/vmcontention/contrib/gdb/   (props changed)
  user/attilio/vmcontention/contrib/gdtoa/   (props changed)
  user/attilio/vmcontention/contrib/gnu-sort/   (props changed)
  user/attilio/vmcontention/contrib/groff/   (props changed)
  user/attilio/vmcontention/contrib/less/   (props changed)
  user/attilio/vmcontention/contrib/libcxxrt/   (props changed)
  user/attilio/vmcontention/contrib/libpcap/   (props changed)
  user/attilio/vmcontention/contrib/libstdc++/   (props changed)
  user/attilio/vmcontention/contrib/llvm/   (props changed)
  user/attilio/vmcontention/contrib/llvm/tools/clang/   (props changed)
  user/attilio/vmcontention/contrib/ncurses/   (props changed)
  user/attilio/vmcontention/contrib/netcat/   (props changed)
  user/attilio/vmcontention/contrib/ntp/   (props changed)
  user/attilio/vmcontention/contrib/one-true-awk/   (props changed)
  user/attilio/vmcontention/contrib/openbsm/   (props changed)
  user/attilio/vmcontention/contrib/openpam/   (props changed)
  user/attilio/vmcontention/contrib/openresolv/   (props changed)
  user/attilio/vmcontention/contrib/pf/   (props changed)
  user/attilio/vmcontention/contrib/sendmail/   (props changed)
  user/attilio/vmcontention/contrib/tcpdump/   (props changed)
  user/attilio/vmcontention/contrib/tcsh/   (props changed)
  user/attilio/vmcontention/contrib/tnftp/   (props changed)
  user/attilio/vmcontention/contrib/top/   (props changed)
  user/attilio/vmcontention/contrib/top/install-sh   (props changed)
  user/attilio/vmcontention/contrib/tzcode/stdtime/   (props changed)
  user/attilio/vmcontention/contrib/tzcode/zic/   (props changed)
  user/attilio/vmcontention/contrib/tzdata/   (props changed)
  user/attilio/vmcontention/contrib/wpa/   (props changed)
  user/attilio/vmcontention/contrib/xz/   (props changed)
  user/attilio/vmcontention/crypto/heimdal/   (props changed)
  user/attilio/vmcontention/crypto/openssh/   (props changed)
  user/attilio/vmcontention/crypto/openssl/   (props changed)
  user/attilio/vmcontention/gnu/lib/   (props changed)
  user/attilio/vmcontention/gnu/usr.bin/binutils/   (props changed)
  user/attilio/vmcontention/gnu/usr.bin/cc/cc_tools/   (props changed)
  user/attilio/vmcontention/gnu/usr.bin/gdb/   (props changed)
  user/attilio/vmcontention/lib/libc/   (props changed)
  user/attilio/vmcontention/lib/libc/stdtime/   (props changed)
  user/attilio/vmcontention/lib/libutil/   (props changed)
  user/attilio/vmcontention/lib/libz/   (props changed)
  user/attilio/vmcontention/sbin/   (props changed)
  user/attilio/vmcontention/sbin/ipfw/   (props changed)
  user/attilio/vmcontention/share/mk/bsd.arch.inc.mk   (props changed)
  user/attilio/vmcontention/share/zoneinfo/   (props changed)
  user/attilio/vmcontention/sys/   (props changed)
  user/attilio/vmcontention/sys/amd64/include/xen/   (props changed)
  user/attilio/vmcontention/sys/boot/   (props changed)
  user/attilio/vmcontention/sys/boot/i386/efi/   (props changed)
  user/attilio/vmcontention/sys/boot/ia64/efi/   (props changed)
  user/attilio/vmcontention/sys/boot/ia64/ski/   (props changed)
  user/attilio/vmcontention/sys/boot/powerpc/boot1.chrp/   (props changed)
  user/attilio/vmcontention/sys/boot/powerpc/ofw/   (props changed)
  user/attilio/vmcontention/sys/cddl/contrib/opensolaris/   (props changed)
  user/attilio/vmcontention/sys/conf/   (props changed)
  user/attilio/vmcontention/sys/contrib/dev/acpica/   (props changed)
  user/attilio/vmcontention/sys/contrib/octeon-sdk/   (props changed)
  user/attilio/vmcontention/sys/contrib/pf/   (props changed)
  user/attilio/vmcontention/sys/contrib/x86emu/   (props changed)
  user/attilio/vmcontention/usr.bin/calendar/   (props changed)
  user/attilio/vmcontention/usr.bin/csup/   (props changed)
  user/attilio/vmcontention/usr.bin/procstat/   (props changed)
  user/attilio/vmcontention/usr.sbin/ndiscvt/   (props changed)
  user/attilio/vmcontention/usr.sbin/rtadvctl/   (props changed)
  user/attilio/vmcontention/usr.sbin/rtadvd/   (props changed)
  user/attilio/vmcontention/usr.sbin/rtsold/   (props changed)
  user/attilio/vmcontention/usr.sbin/zic/   (props changed)

Modified: user/attilio/vmcontention/bin/sh/eval.c
==============================================================================
--- user/attilio/vmcontention/bin/sh/eval.c	Mon Nov 28 17:26:19 2011	(r228079)
+++ user/attilio/vmcontention/bin/sh/eval.c	Mon Nov 28 17:40:42 2011	(r228080)
@@ -89,7 +89,7 @@ int oexitstatus;		/* saved exit status *
 
 static void evalloop(union node *, int);
 static void evalfor(union node *, int);
-static void evalcase(union node *, int);
+static union node *evalcase(union node *, int);
 static void evalsubshell(union node *, int);
 static void evalredir(union node *, int);
 static void expredir(union node *);
@@ -256,7 +256,7 @@ evaltree(union node *n, int flags)
 			evalfor(n, flags & ~EV_EXIT);
 			break;
 		case NCASE:
-			evalcase(n, flags);
+			next = evalcase(n, flags);
 			break;
 		case NDEFUN:
 			defun(n->narg.text, n->narg.next);
@@ -343,8 +343,6 @@ evalfor(union node *n, int flags)
 	for (argp = n->nfor.args ; argp ; argp = argp->narg.next) {
 		oexitstatus = exitstatus;
 		expandarg(argp, &arglist, EXP_FULL | EXP_TILDE);
-		if (evalskip)
-			goto out;
 	}
 	*arglist.lastp = NULL;
 
@@ -364,13 +362,12 @@ evalfor(union node *n, int flags)
 		}
 	}
 	loopnest--;
-out:
 	popstackmark(&smark);
 }
 
 
 
-static void
+static union node *
 evalcase(union node *n, int flags)
 {
 	union node *cp;
@@ -383,26 +380,24 @@ evalcase(union node *n, int flags)
 	oexitstatus = exitstatus;
 	exitstatus = 0;
 	expandarg(n->ncase.expr, &arglist, EXP_TILDE);
-	for (cp = n->ncase.cases ; cp && evalskip == 0 ; cp = cp->nclist.next) {
+	for (cp = n->ncase.cases ; cp ; cp = cp->nclist.next) {
 		for (patp = cp->nclist.pattern ; patp ; patp = patp->narg.next) {
 			if (casematch(patp, arglist.list->text)) {
+				popstackmark(&smark);
 				while (cp->nclist.next &&
 				    cp->type == NCLISTFALLTHRU) {
-					if (evalskip != 0)
-						break;
 					evaltree(cp->nclist.body,
 					    flags & ~EV_EXIT);
+					if (evalskip != 0)
+						return (NULL);
 					cp = cp->nclist.next;
 				}
-				if (evalskip == 0) {
-					evaltree(cp->nclist.body, flags);
-				}
-				goto out;
+				return (cp->nclist.body);
 			}
 		}
 	}
-out:
 	popstackmark(&smark);
+	return (NULL);
 }
 
 

Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zdb/zdb.8
==============================================================================
--- user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zdb/zdb.8	Mon Nov 28 17:26:19 2011	(r228079)
+++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zdb/zdb.8	Mon Nov 28 17:40:42 2011	(r228080)
@@ -1,65 +1,79 @@
 '\" te
+.\" Copyright (c) 2011, Martin Matuska <mm at FreeBSD.org>.
+.\" All Rights Reserved.
+.\"
+.\" The contents of this file are subject to the terms of the
+.\" Common Development and Distribution License (the "License").
+.\" You may not use this file except in compliance with the License.
+.\"
+.\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+.\" or http://www.opensolaris.org/os/licensing.
+.\" See the License for the specific language governing permissions
+.\" and limitations under the License.
+.\"
+.\" When distributing Covered Code, include this CDDL HEADER in each
+.\" file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+.\" If applicable, add the following below this CDDL HEADER, with the
+.\" fields enclosed by brackets "[]" replaced with your own identifying
+.\" information: Portions Copyright [yyyy] [name of copyright owner]
+.\"
 .\" Copyright (c) 2004, Sun Microsystems, Inc. All Rights Reserved.
-.\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
-.\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
-.\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.\" Portions Copyright 2011 Martin Matuska <mm at FreeBSD.org>
-.TH ZDB 8 "Oct 31, 2005"
-.SH NAME
-zdb \- ZFS debugger
-.SH SYNOPSIS
-.LP
-.nf
-\fBzdb\fR \fIpool\fR
-.fi
-
-.SH DESCRIPTION
-.sp
-.LP
-The \fBzdb\fR command is used by support engineers to diagnose failures and
-gather statistics. Since the \fBZFS\fR file system is always consistent on disk
-and is self-repairing, \fBzdb\fR should only be run under the direction by a
-support engineer.
-.sp
-.LP
-If no arguments are specified, \fBzdb\fR, performs basic consistency checks on
-the pool and associated datasets, and report any problems detected.
-.sp
-.LP
+.\"
+.\" $FreeBSD$
+.\"
+.Dd November 26, 2011
+.Dt ZDB 8
+.Os
+.Sh NAME
+.Nm zdb
+.Nd ZFS debugger
+.Sh SYNOPSIS
+.Nm
+.Ar pool
+.Sh DESCRIPTION
+The
+.Nm
+command is used by support engineers to diagnose failures and
+gather statistics. Since the
+.Tn ZFS
+file system is always consistent on disk and is self-repairing,
+.Nm
+should only be run under the direction by a support engineer.
+.Pp
+If no arguments are specified,
+.Nm
+performs basic consistency checks on the pool and associated datasets, and
+report any problems detected.
+.Nm
 Any options supported by this command are internal to Sun and subject to change
 at any time.
-.SH EXIT STATUS
-.sp
-.LP
+.Sh EXIT STATUS
 The following exit values are returned:
-.sp
-.ne 2
-.na
-\fB\fB0\fR\fR
-.ad
-.RS 5n
+.Bl -tag -offset 2n -width 2n
+.It 0
 The pool is consistent.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB1\fR\fR
-.ad
-.RS 5n
+.It 1
 An error was detected.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB2\fR\fR
-.ad
-.RS 5n
+.It 2
 Invalid command line options were specified.
-.RE
-
-.SH SEE ALSO
-.sp
-.LP
-zfs(8), zpool(8)
+.El
+.Sh SEE ALSO
+.Xr zfs 8 ,
+.Xr zpool 8
+.Sh AUTHORS
+This manual page is a
+.Xr mdoc 7
+reimplementation of the
+.Tn OpenSolaris
+manual page
+.Em zdb(1M) ,
+modified and customized for
+.Fx
+and licensed under the
+.Tn Common Development and Distribution License
+.Pq Tn CDDL .
+.Pp
+The
+.Xr mdoc 7
+implementation of this manual page was initially written by
+.An Martin Matuska Aq mm at FreeBSD.org .

Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zfs/zfs.8
==============================================================================
--- user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Mon Nov 28 17:26:19 2011	(r228079)
+++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Mon Nov 28 17:40:42 2011	(r228080)
@@ -1,561 +1,528 @@
 '\" te
-.\" Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved.
-.\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
-.\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with
-.\" the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
-.\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with
-.\" the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
+.\" Copyright (c) 2011, Martin Matuska <mm at FreeBSD.org>.
+.\" All Rights Reserved.
+.\"
+.\" The contents of this file are subject to the terms of the
+.\" Common Development and Distribution License (the "License").
+.\" You may not use this file except in compliance with the License.
+.\"
+.\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+.\" or http://www.opensolaris.org/os/licensing.
+.\" See the License for the specific language governing permissions
+.\" and limitations under the License.
+.\"
+.\" When distributing Covered Code, include this CDDL HEADER in each
+.\" file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+.\" If applicable, add the following below this CDDL HEADER, with the
+.\" fields enclosed by brackets "[]" replaced with your own identifying
+.\" information: Portions Copyright [yyyy] [name of copyright owner]
+.\"
+.\" Copyright (c) 2010, Sun Microsystems, Inc. All Rights Reserved.
 .\" Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
-.\" Copyright 2011 by Delphix.  All rights reserved.
-.\" Portions Copyright 2011 Pawel Jakub Dawidek <pjd at FreeBSD.org>
-.\" Portions Copyright 2011 Martin Matuska <mm at FreeBSD.org>
-.TH ZFS 8 "September 24, 2009" FreeBSD
-.SH NAME
-zfs \- configures ZFS file systems
-.SH SYNOPSIS
-.LP
-.nf
-\fBzfs\fR [\fB-?\fR]
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBcreate\fR [\fB-p\fR] [\fB-o\fR \fIproperty\fR=\fIvalue\fR] ... \fIfilesystem\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBcreate\fR [\fB-ps\fR] [\fB-b\fR \fIblocksize\fR] [\fB-o\fR \fIproperty\fR=\fIvalue\fR] ... \fB-V\fR \fIsize\fR \fIvolume\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBdestroy\fR [\fB-rRf\fR] \fIfilesystem\fR|\fIvolume\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBdestroy\fR [\fB-rRd\fR] \fIsnapshot\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBsnapshot\fR [\fB-r\fR] [\fB-o\fR \fIproperty\fR=\fIvalue\fR]...
-      \fIfilesystem at snapname\fR|\fIvolume at snapname\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBrollback\fR [\fB-rRf\fR] \fIsnapshot\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBclone\fR [\fB-p\fR] [\fB-o\fR \fIproperty\fR=\fIvalue\fR] ... \fIsnapshot\fR \fIfilesystem\fR|\fIvolume\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBpromote\fR \fIclone-filesystem\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBrename\fR \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR
-     \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBrename\fR [\fB-p\fR] \fIfilesystem\fR|\fIvolume\fR \fIfilesystem\fR|\fIvolume\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBrename\fR \fB-r\fR \fIsnapshot\fR \fIsnapshot\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBrename\fR \fB-u\fR [\fB-p\fR] \fIfilesystem\fR \fIfilesystem\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBlist\fR [\fB-r\fR|\fB-d\fR \fIdepth\fR][\fB-H\fR][\fB-o\fR \fIproperty\fR[,...]] [\fB-t\fR \fItype\fR[,...]]
-     [\fB-s\fR \fIproperty\fR] ... [\fB-S\fR \fIproperty\fR] ... [\fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR] ...
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBset\fR \fIproperty\fR=\fIvalue\fR \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR ...
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBget\fR [\fB-r\fR|\fB-d\fR \fIdepth\fR][\fB-Hp\fR][\fB-o\fR \fIfield\fR[,...]] [\fB-s\fR \fIsource\fR[,...]]
-     "\fIall\fR" | \fIproperty\fR[,...] \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR ...
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBinherit\fR [\fB-r\fR] \fIproperty\fR \fIfilesystem\fR|\fIvolume|snapshot\fR ...
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBupgrade\fR [\fB-v\fR]
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBupgrade\fR [\fB-r\fR] [\fB-V\fR \fIversion\fR] \fB-a\fR | \fIfilesystem\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBuserspace\fR [\fB-niHp\fR] [\fB-o\fR \fIfield\fR[,...]] [\fB-sS\fR \fIfield\fR] ...
-     [\fB-t\fR \fItype\fR [,...]] \fIfilesystem\fR|\fIsnapshot\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBgroupspace\fR [\fB-niHp\fR] [\fB-o\fR \fIfield\fR[,...]] [\fB-sS\fR \fIfield\fR] ...
-     [\fB-t\fR \fItype\fR [,...]] \fIfilesystem\fR|\fIsnapshot\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBmount\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBmount\fR [\fB-vO\fR] [\fB-o \fIoptions\fR\fR] \fB-a\fR | \fIfilesystem\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBunmount\fR [\fB-f\fR] \fB-a\fR | \fIfilesystem\fR|\fImountpoint\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBshare\fR \fB-a\fR | \fIfilesystem\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBunshare\fR \fB-a\fR \fIfilesystem\fR|\fImountpoint\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBsend\fR [\fB-vR\fR] [\fB-\fR[\fBiI\fR] \fIsnapshot\fR] \fIsnapshot\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBreceive\fR [\fB-vnFu\fR] \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBreceive\fR [\fB-vnFu\fR] \fB-d\fR \fIfilesystem\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBallow\fR \fIfilesystem\fR|\fIvolume\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBallow\fR [\fB-ldug\fR] "\fIeveryone\fR"|\fIuser\fR|\fIgroup\fR[,...] \fIperm\fR|\fI at setname\fR[,...]
-     \fIfilesystem\fR|\fIvolume\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBallow\fR [\fB-ld\fR] \fB-e\fR \fIperm\fR|@\fIsetname\fR[,...] \fIfilesystem\fR|\fIvolume\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBallow\fR \fB-c\fR \fIperm\fR|@\fIsetname\fR[,...] \fIfilesystem\fR|\fIvolume\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBallow\fR \fB-s\fR @\fIsetname\fR \fIperm\fR|@\fIsetname\fR[,...] \fIfilesystem\fR|\fIvolume\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBunallow\fR [\fB-rldug\fR] "\fIeveryone\fR"|\fIuser\fR|\fIgroup\fR[,...] [\fIperm\fR|@\fIsetname\fR[,... ]]
-     \fIfilesystem\fR|\fIvolume\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBunallow\fR [\fB-rld\fR] \fB-e\fR [\fIperm\fR|@\fIsetname\fR[,... ]] \fIfilesystem\fR|\fIvolume\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBunallow\fR [\fB-r\fR] \fB-c\fR [\fIperm\fR|@\fIsetname\fR[ ... ]] \fIfilesystem\fR|\fIvolume\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBunallow\fR [\fB-r\fR] \fB-s\fR @\fIsetname\fR [\fIperm\fR|@\fIsetname\fR[,... ]] \fIfilesystem\fR|\fIvolume\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBhold\fR [\fB-r\fR] \fItag\fR \fIsnapshot\fR...
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBholds\fR [\fB-r\fR] \fIsnapshot\fR...
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBrelease\fR [\fB-r\fR] \fItag\fR \fIsnapshot\fR...
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBjail\fR \fIjailid\fR \fIfilesystem\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBunjail\fR \fIjailid\fR \fIfilesystem\fR
-.fi
-
-.SH DESCRIPTION
-.sp
-.LP
-The \fBzfs\fR command configures \fBZFS\fR datasets within a \fBZFS\fR storage
-pool, as described in \fBzpool\fR(8). A dataset is identified by a unique path
-within the \fBZFS\fR namespace. For example:
-.sp
-.in +2
-.nf
-pool/{filesystem,volume,snapshot}
-.fi
-.in -2
-.sp
-
-.sp
-.LP
-where the maximum length of a dataset name is \fBMAXNAMELEN\fR (256 bytes).
-.sp
-.LP
+.\" Copyright (c) 2011 by Delphix. All rights reserved.
+.\" Copyright (c) 2011, Pawel Jakub Dawidek <pjd at FreeBSD.org>
+.\"
+.\" $FreeBSD$
+.\"
+.Dd November 26, 2011
+.Dt ZFS 8
+.Os
+.Sh NAME
+.Nm zfs
+.Nd configures ZFS file systems
+.Sh SYNOPSIS
+.Nm
+.Op Fl \&?
+.Nm
+.Cm create
+.Op Fl p
+.Op Fl o Ar property Ns = Ns Ar value
+.Ar ... filesystem
+.Nm
+.Cm create
+.Op Fl ps
+.Op Fl b Ar blocksize
+.Op Fl o Ar property Ns = Ns Ar value
+.Ar ...
+.Fl V
+.Ar size volume
+.Nm
+.Cm destroy
+.Op Fl rRf
+.Ar filesystem Ns | Ns Ar volume
+.Nm
+.Cm destroy
+.Op Fl rRd
+.Ar snapshot
+.Nm
+.Cm snapshot
+.Op Fl r
+.Op Fl o Ar property Ns = Ns Ar value
+.Ar ... filesystem at snapname Ns | Ns Ar volume at snapname
+.Nm
+.Cm rollback
+.Op Fl rRf
+.Ar snapshot
+.Nm
+.Cm clone
+.Op Fl p
+.Op Fl o Ar property Ns = Ns Ar value
+.Ar ... snapshot filesystem Ns | Ns Ar volume
+.Nm
+.Cm promote
+.Ar clone-filesystem
+.Nm
+.Cm rename
+.Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot
+.Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot
+.Nm
+.Cm rename
+.Fl p
+.Ar filesystem Ns | Ns Ar volume
+.Ar filesystem Ns | Ns Ar volume
+.Nm
+.Cm rename
+.Fl r
+.Ar snapshot snapshot
+.Nm
+.Cm rename
+.Fl u
+.Op Fl p
+.Ar filesystem filesystem
+.Nm
+.Cm list
+.Op Fl r Ns | Ns Fl d Ar depth
+.Op Fl H
+.Op Fl o Ar property Ns Op , Ns Ar ...
+.Op Fl t Ar type Ns Op , Ns Ar ...
+.Op Fl s Ar property
+.Ar ...
+.Op Fl S Ar property
+.Ar ...
+.Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot
+.Nm
+.Cm set
+.Ar property Ns = Ns Ar value
+.Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot
+.Nm
+.Cm get
+.Op Fl r Ns | Ns Fl d Ar depth
+.Op Fl Hp
+.Op Fl o Ar all | field Ns Op , Ns Ar ...
+.Op Fl s Ar source Ns Op , Ns Ar ...
+.Ar all | property Ns Op , Ns Ar ...
+.Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot
+.Nm
+.Cm inherit
+.Op Fl rS
+.Ar property
+.Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot
+.Nm
+.Cm upgrade
+.Op Fl v
+.Nm
+.Cm upgrade
+.Op Fl r
+.Op Fl V Ar version
+.Fl a | Ar filesystem
+.Nm
+.Cm userspace
+.Op Fl niHp
+.Op Fl o Ar field Ns Op , Ns Ar ...
+.Op Fl sS Ar field
+.Ar ...
+.Op Fl t Ar type Ns Op , Ns Ar ...
+.Ar filesystem Ns | Ns Ar snapshot
+.Nm
+.Cm groupspace
+.Op Fl niHp
+.Op Fl o Ar field Ns Op , Ns Ar ...
+.Op Fl sS Ar field
+.Ar ...
+.Op Fl t Ar type Ns Op , Ns Ar ...
+.Ar filesystem Ns | Ns Ar snapshot
+.Nm
+.Cm mount
+.Nm
+.Cm mount
+.Op Fl vO
+.Op Fl o Ar property Ns Op , Ns Ar ...
+.Fl a | Ar filesystem
+.Nm
+.Cm unmount
+.Op Fl f
+.Fl a | Ar filesystem Ns | Ns Ar mountpoint
+.Nm
+.Cm share
+.Fl a | Ar filesystem
+.Nm
+.Cm unshare
+.Fl a | Ar filesystem Ns | Ns Ar mountpoint
+.Nm
+.Cm send
+.Op Fl DvRp
+.Op Fl i Ar snapshot | Fl I Ar snapshot
+.Ar snapshot
+.Nm
+.Cm receive
+.Op Fl vnFu
+.Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot
+.Nm
+.Cm receive
+.Op Fl vnFu
+.Op Fl d | e
+.Ar filesystem
+.Nm
+.Cm allow
+.Ar filesystem Ns | Ns Ar volume
+.Nm
+.Cm allow
+.Op Fl ldug
+.Cm everyone Ns | Ns Ar user Ns | Ns Ar group Ns Op , Ns Ar ...
+.Ar perm Ns | Ns Ar @setname Ns Op , Ns Ar ...
+.Ar filesystem Ns | Ns Ar volume
+.Nm
+.Cm allow
+.Op Fl ld
+.Fl e
+.Ar perm Ns | Ns Ar @setname Ns Op , Ns Ar ...
+.Ar filesystem Ns | Ns Ar volume
+.Nm
+.Cm allow
+.Fl c
+.Ar perm Ns | Ns Ar @setname Ns Op , Ns Ar ...
+.Ar filesystem Ns | Ns Ar volume
+.Nm
+.Cm allow
+.Fl s
+.Ar @setname
+.Ar perm Ns | Ns Ar @setname Ns Op , Ns Ar ...
+.Ar filesystem Ns | Ns Ar volume
+.Nm
+.Cm unallow
+.Op Fl rldug
+.Cm everyone Ns | Ns Ar user Ns | Ns Ar group Ns Op , Ns Ar ...
+.Op Ar perm Ns | Ns Ar @setname Ns Op , Ns Ar ...
+.Ar filesystem Ns | Ns Ar volume
+.Nm
+.Cm unallow
+.Op Fl rld
+.Fl e
+.Op Ar perm Ns | Ns Ar @setname Ns Op , Ns Ar ...
+.Ar filesystem Ns | Ns Ar volume
+.Nm
+.Cm unallow
+.Op Fl r
+.Fl c
+.Op Ar perm Ns | Ns Ar @setname Ns Op , Ns Ar ...
+.Ar filesystem Ns | Ns Ar volume
+.Nm
+.Cm unallow
+.Op Fl r
+.Fl s
+.Ar @setname
+.Ar perm Ns | Ns Ar @setname Ns Op , Ns Ar ...
+.Ar filesystem Ns | Ns Ar volume
+.Nm
+.Cm hold
+.Op Fl r
+.Ar tag snapshot ...
+.Nm
+.Cm holds
+.Op Fl r
+.Ar snapshot ...
+.Nm
+.Cm release
+.Op Fl r
+.Ar tag snapshot ...
+.Nm
+.Cm diff
+.Op Fl FHt
+.Ar snapshot
+.Op Ar snapshot Ns | Ns Ar filesystem
+.Nm
+.Cm jail
+.Ar jailid filesystem
+.Nm
+.Cm unjail
+.Ar jailid filesystem
+.Sh DESCRIPTION
+The
+.Nm
+command configures
+.Tn ZFS
+datasets within a
+.Tn ZFS
+storage pool, as described in
+.Xr zpool 8 .
+A dataset is identified by a unique path within the
+.Tn ZFS
+namespace. For example:
+.Bd -ragged -offset 4n
+.No pool/ Ns Brq filesystem,volume,snapshot
+.Ed
+.Pp
+where the maximum length of a dataset name is
+.Dv MAXNAMELEN
+(256 bytes).
+.Pp
 A dataset can be one of the following:
-.sp
-.ne 2
-.na
-\fB\fIfile system\fR\fR
-.ad
-.sp .6
-.RS 4n
-A \fBZFS\fR dataset of type \fBfilesystem\fR can be mounted within the standard
-system namespace and behaves like other file systems. While \fBZFS\fR file
-systems are designed to be \fBPOSIX\fR compliant, known issues exist that
-prevent compliance in some cases. Applications that depend on standards
-conformance might fail due to nonstandard behavior when checking file system
-free space.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fIvolume\fR\fR
-.ad
-.sp .6
-.RS 4n
+.Bl -hang -width 12n
+.It Sy file system
+A
+.Tn ZFS
+dataset of type
+.Em filesystem
+can be mounted within the standard system namespace and behaves like other file
+systems. While
+.Tn ZFS
+file systems are designed to be
+.Tn POSIX
+compliant, known issues exist that prevent compliance in some cases.
+Applications that depend on standards conformance might fail due to nonstandard
+behavior when checking file system free space.
+.It Sy volume
 A logical volume exported as a raw or block device. This type of dataset should
 only be used under special circumstances. File systems are typically used in
 most environments.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fIsnapshot\fR\fR
-.ad
-.sp .6
-.RS 4n
+.It Sy snapshot
 A read-only version of a file system or volume at a given point in time. It is
-specified as \fIfilesystem at name\fR or \fIvolume at name\fR.
-.RE
-
-.SS "ZFS File System Hierarchy"
-.sp
-.LP
-A \fBZFS\fR storage pool is a logical collection of devices that provide space
-for datasets. A storage pool is also the root of the \fBZFS\fR file system
-hierarchy.
-.sp
-.LP
+specified as
+.Em filesystem at name
+or
+.Em volume at name .
+.El
+.Ss ZFS File System Hierarchy
+A
+.Tn ZFS
+storage pool is a logical collection of devices that provide space for
+datasets. A storage pool is also the root of the
+.Tn ZFS
+file system hierarchy.
+.Pp
 The root of the pool can be accessed as a file system, such as mounting and
 unmounting, taking snapshots, and setting properties. The physical storage
-characteristics, however, are managed by the \fBzpool\fR(8) command.
-.sp
-.LP
-See \fBzpool\fR(8) for more information on creating and administering pools.
-.SS "Snapshots"
-.sp
-.LP
+characteristics, however, are managed by the
+.Xr zpool 8
+command.
+.Pp
+See
+.Xr zpool 8
+for more information on creating and administering pools.
+.Ss Snapshots
 A snapshot is a read-only copy of a file system or volume. Snapshots can be
 created extremely quickly, and initially consume no additional space within the
 pool. As data within the active dataset changes, the snapshot consumes more
 data than would otherwise be shared with the active dataset.
-.sp
-.LP
+.Pp
 Snapshots can have arbitrary names. Snapshots of volumes can be cloned or
 rolled back, but cannot be accessed independently.
-.sp
-.LP
-File system snapshots can be accessed under the \fB\&.zfs/snapshot\fR directory
-in the root of the file system. Snapshots are automatically mounted on demand
-and may be unmounted at regular intervals. The visibility of the \fB\&.zfs\fR
-directory can be controlled by the \fBsnapdir\fR property.
-.SS "Clones"
-.sp
-.LP
+.Pp
+File system snapshots can be accessed under the
+.Pa \&.zfs/snapshot
+directory in the root of the file system. Snapshots are automatically mounted
+on demand and may be unmounted at regular intervals. The visibility of the
+.Pa \&.zfs
+directory can be controlled by the
+.Sy snapdir
+property.
+.Ss Clones
 A clone is a writable volume or file system whose initial contents are the same
 as another dataset. As with snapshots, creating a clone is nearly
 instantaneous, and initially consumes no additional space.
-.sp
-.LP
+.Pp
 Clones can only be created from a snapshot. When a snapshot is cloned, it
 creates an implicit dependency between the parent and child. Even though the
 clone is created somewhere else in the dataset hierarchy, the original snapshot
-cannot be destroyed as long as a clone exists. The \fBorigin\fR property
-exposes this dependency, and the \fBdestroy\fR command lists any such
-dependencies, if they exist.
-.sp
-.LP
+cannot be destroyed as long as a clone exists. The
+.Sy origin
+property exposes this dependency, and the
+.Cm destroy
+command lists any such dependencies, if they exist.
+.Pp
 The clone parent-child dependency relationship can be reversed by using the
-\fBpromote\fR subcommand. This causes the "origin" file system to become a
-clone of the specified file system, which makes it possible to destroy the file
-system that the clone was created from.
-.SS "Mount Points"
-.sp
-.LP
-Creating a \fBZFS\fR file system is a simple operation, so the number of file
-systems per system is likely to be numerous. To cope with this, \fBZFS\fR
+.Cm promote
+subcommand. This causes the "origin" file system to become a clone of the
+specified file system, which makes it possible to destroy the file system that
+the clone was created from.
+.Ss Mount Points
+Creating a
+.Tn ZFS
+file system is a simple operation, so the number of file systems per system is
+likely to be numerous. To cope with this,
+.Tn ZFS
 automatically manages mounting and unmounting file systems without the need to
-edit the \fB/etc/fstab\fR file. All automatically managed file systems are
-mounted by \fBZFS\fR at boot time.
-.sp
-.LP
-By default, file systems are mounted under \fB/\fIpath\fR\fR, where \fIpath\fR
-is the name of the file system in the \fBZFS\fR namespace. Directories are
-created and destroyed as needed.
-.sp
-.LP
-A file system can also have a mount point set in the \fBmountpoint\fR property.
-This directory is created as needed, and \fBZFS\fR automatically mounts the
-file system when the \fBzfs mount -a\fR command is invoked (without editing
-\fB/etc/fstab\fR). The \fBmountpoint\fR property can be inherited, so if
-\fBpool/home\fR has a mount point of \fB/export/stuff\fR, then
-\fBpool/home/user\fR automatically inherits a mount point of
-\fB/export/stuff/user\fR.
-.sp
-.LP
-A file system \fBmountpoint\fR property of \fBnone\fR prevents the file system
-from being mounted.
-.sp
-.LP
-If needed, \fBZFS\fR file systems can also be managed with traditional tools
-(\fBmount\fR, \fBumount\fR, \fB/etc/fstab\fR). If a file system's mount point
-is set to \fBlegacy\fR, \fBZFS\fR makes no attempt to manage the file system,
-and the administrator is responsible for mounting and unmounting the file
-system.
-.SS "Jails"
-.sp
-.LP
-A \fBZFS\fR dataset can be attached to a jail by using the \fBzfs\fR
-\fBjail\fR subcommand. You cannot attach a dataset to one jail and the
-children of the same dataset to another jails. To allow managment of the
-dataset from within a jail, the "\fBjailed\fR" property has to be set.
-The \fBquota\fR property cannot be changed from within a jail.
-.sp
-.LP
-A \fBZFS\fR dataset can be detached from a jail using the \fBzfs\fR
-\fBunjail\fR subcommand.
-.sp
-.LP
-After a dataset is attached to a jail and the \fBjailed\fR property is set,
-a jailed file system cannot be mounted outside the jail, since the jail
-administrator might have set the mount point to an unacceptable value.
-.SS "Native Properties"
-.sp
-.LP
+edit the
+.Pa /etc/fstab
+file. All automatically managed file systems are mounted by
+.Tn ZFS
+at boot time.
+.Pp
+By default, file systems are mounted under
+.Pa /path ,
+where
+.Ar path
+is the name of the file system in the
+.Tn ZFS
+namespace. Directories are created and destroyed as needed.
+.Pp
+A file system can also have a mount point set in the
+.Sy mountpoint
+property. This directory is created as needed, and
+.Tn ZFS
+automatically mounts the file system when the
+.Qq Nm Cm mount Fl a
+command is invoked (without editing
+.Pa /etc/fstab Ns ).
+The
+.Sy mountpoint
+property can be inherited, so if
+.Em pool/home
+has a mount point of
+.Pa /home ,
+then
+.Em pool/home/user
+automatically inherits a mount point of
+.Pa /home/user .
+.Pp
+A file system
+.Sy mountpoint
+property of
+.Cm none
+prevents the file system from being mounted.
+.Pp
+If needed,
+.Tn ZFS
+file systems can also be managed with traditional tools
+.Pq Xr mount 8 , Xr umount 8 , Xr fstab 5 .
+If a file system's mount point is set to
+.Cm legacy ,
+.Tn ZFS
+makes no attempt to manage the file system, and the administrator is
+responsible for mounting and unmounting the file system.
+.Ss Jails

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***


More information about the svn-src-user mailing list