From owner-svn-src-user@FreeBSD.ORG Mon Nov 28 17:26:19 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6120D106566C; Mon, 28 Nov 2011 17:26:19 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5136A8FC08; Mon, 28 Nov 2011 17:26:19 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pASHQJLc001121; Mon, 28 Nov 2011 17:26:19 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pASHQJ5c001119; Mon, 28 Nov 2011 17:26:19 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201111281726.pASHQJ5c001119@svn.freebsd.org> From: Attilio Rao Date: Mon, 28 Nov 2011 17:26:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r228079 - user/attilio/vmcontention/sys/vm X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Nov 2011 17:26:19 -0000 Author: attilio Date: Mon Nov 28 17:26:19 2011 New Revision: 228079 URL: http://svn.freebsd.org/changeset/base/228079 Log: Improve the diagnostic in the remove case. Modified: user/attilio/vmcontention/sys/vm/vm_radix.c Modified: user/attilio/vmcontention/sys/vm/vm_radix.c ============================================================================== --- user/attilio/vmcontention/sys/vm/vm_radix.c Mon Nov 28 17:19:05 2011 (r228078) +++ user/attilio/vmcontention/sys/vm/vm_radix.c Mon Nov 28 17:26:19 2011 (r228079) @@ -648,11 +648,11 @@ vm_radix_remove(struct vm_radix *rtree, while (level && rnode) { stack[level] = rnode; slot = vm_radix_slot(index, level); - rnode = rnode->rn_child[slot]; CTR6(KTR_VM, "remove: tree %p, index %p, level %d, slot %d, rnode %p, child %p", rtree, (void *)index, level, slot, rnode, (rnode != NULL) ? rnode->rn_child[slot] : NULL); + rnode = rnode->rn_child[slot]; level--; } KASSERT(rnode != NULL, @@ -663,6 +663,12 @@ vm_radix_remove(struct vm_radix *rtree, ("vm_radix_remove: index %jd not present in the tree.\n", index)); for (;;) { + CTR6(KTR_VM, +"remove: resetting tree %p, index %p, level %d, slot %d, rnode %p, child %p", + rtree, (void *)index, level, slot, rnode, + (rnode != NULL) ? rnode->rn_child[slot] : NULL); + CTR3(KTR_VM, "remove: rnode %p, count %p, color %d", + rnode, (rnode != NULL) ? rnode->rn_count : NULL, color); rnode->rn_child[slot] = NULL; /* * Use atomics for the last level since red and black From owner-svn-src-user@FreeBSD.ORG Mon Nov 28 17:40:43 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8327E106566B; Mon, 28 Nov 2011 17:40:43 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6E5EB8FC12; Mon, 28 Nov 2011 17:40:43 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pASHehPX001658; Mon, 28 Nov 2011 17:40:43 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pASHehIW001653; Mon, 28 Nov 2011 17:40:43 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201111281740.pASHehIW001653@svn.freebsd.org> From: Attilio Rao Date: Mon, 28 Nov 2011 17:40:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: 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... X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Nov 2011 17:40:43 -0000 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 . +.\" 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 -.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@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 . +.\" 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 -.\" Portions Copyright 2011 Martin Matuska -.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@snapname\fR|\fIvolume@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@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 +.\" +.\" $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@snapname Ns | Ns Ar volume@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@name\fR or \fIvolume@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@name +or +.Em volume@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 *** From owner-svn-src-user@FreeBSD.ORG Mon Nov 28 19:14:39 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1A6AE1065672; Mon, 28 Nov 2011 19:14:39 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0A6198FC15; Mon, 28 Nov 2011 19:14:39 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pASJEcQ4004866; Mon, 28 Nov 2011 19:14:38 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pASJEcUq004864; Mon, 28 Nov 2011 19:14:38 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201111281914.pASJEcUq004864@svn.freebsd.org> From: Attilio Rao Date: Mon, 28 Nov 2011 19:14:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r228087 - user/attilio/vmcontention/sys/vm X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Nov 2011 19:14:39 -0000 Author: attilio Date: Mon Nov 28 19:14:38 2011 New Revision: 228087 URL: http://svn.freebsd.org/changeset/base/228087 Log: Fix compile. Submitted by: flo Modified: user/attilio/vmcontention/sys/vm/vm_radix.c Modified: user/attilio/vmcontention/sys/vm/vm_radix.c ============================================================================== --- user/attilio/vmcontention/sys/vm/vm_radix.c Mon Nov 28 19:03:59 2011 (r228086) +++ user/attilio/vmcontention/sys/vm/vm_radix.c Mon Nov 28 19:14:38 2011 (r228087) @@ -667,8 +667,8 @@ vm_radix_remove(struct vm_radix *rtree, "remove: resetting tree %p, index %p, level %d, slot %d, rnode %p, child %p", rtree, (void *)index, level, slot, rnode, (rnode != NULL) ? rnode->rn_child[slot] : NULL); - CTR3(KTR_VM, "remove: rnode %p, count %p, color %d", - rnode, (rnode != NULL) ? rnode->rn_count : NULL, color); + CTR3(KTR_VM, "remove: rnode %p, count %d, color %d", + rnode, (rnode != NULL) ? rnode->rn_count : -1, color); rnode->rn_child[slot] = NULL; /* * Use atomics for the last level since red and black From owner-svn-src-user@FreeBSD.ORG Tue Nov 29 02:07:07 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A3750106564A; Tue, 29 Nov 2011 02:07:07 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 927E38FC12; Tue, 29 Nov 2011 02:07:07 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pAT277qS018976; Tue, 29 Nov 2011 02:07:07 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pAT277RO018974; Tue, 29 Nov 2011 02:07:07 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201111290207.pAT277RO018974@svn.freebsd.org> From: Attilio Rao Date: Tue, 29 Nov 2011 02:07:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r228111 - user/attilio/vmcontention/sys/vm X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Nov 2011 02:07:07 -0000 Author: attilio Date: Tue Nov 29 02:07:07 2011 New Revision: 228111 URL: http://svn.freebsd.org/changeset/base/228111 Log: - Remove unnecessary checks on rnode in KTR prints - Track rn_count in KTR prints - Improve KTR in a way it best fits rn_count tracking Modified: user/attilio/vmcontention/sys/vm/vm_radix.c Modified: user/attilio/vmcontention/sys/vm/vm_radix.c ============================================================================== --- user/attilio/vmcontention/sys/vm/vm_radix.c Mon Nov 28 23:36:48 2011 (r228110) +++ user/attilio/vmcontention/sys/vm/vm_radix.c Tue Nov 29 02:07:07 2011 (r228111) @@ -316,33 +316,37 @@ vm_radix_insert(struct vm_radix *rtree, if (rnode->rn_child[slot] == NULL) { rnode->rn_child[slot] = vm_radix_node_get(); if (rnode->rn_child[slot] == NULL) { - CTR6(KTR_VM, -"insert: tree %p, index %jd, level %d, slot %d, rnode %p, child %p ENOMEM", - rtree, index, level, slot, rnode, - (rnode != NULL) ? rnode->rn_child[slot] : - NULL); + CTR5(KTR_VM, + "insert: tree %p, index %jd, level %d, slot %d, rnode %p ENOMEM", + rtree, index, level, slot, rnode); + CTR4(KTR_VM, + "insert: tree %p, rnode %p, child %p, count %u ENOMEM", + rtree, rnode, rnode->rn_child[slot], + rnode->rn_count); return (ENOMEM); } rnode->rn_count++; } - CTR6(KTR_VM, - "insert: tree %p, index %p, level %d, slot %d, rnode %p, child %p", - rtree, (void *)index, level, slot, rnode, - (rnode != NULL) ? rnode->rn_child[slot] : NULL); + CTR5(KTR_VM, + "insert: tree %p, index %p, level %d, slot %d, rnode %p", + rtree, (void *)index, level, slot, rnode); + CTR4(KTR_VM, + "insert: tree %p, rnode %p, child %p, count %u", + rtree, rnode, rnode->rn_child[slot], rnode->rn_count); rnode = rnode->rn_child[slot]; } slot = vm_radix_slot(index, 0); - CTR6(KTR_VM, - "insert: tree %p, index %p, level %d, slot %d, rnode %p, child %p", - rtree, (void *)index, level, slot, rnode, - (rnode != NULL) ? rnode->rn_child[slot] : NULL); + MPASS(rnode != NULL); KASSERT(rnode->rn_child[slot] == NULL, ("vm_radix_insert: Duplicate value %p at index: %lu\n", rnode->rn_child[slot], (u_long)index)); val = (void *)((uintptr_t)val | VM_RADIX_BLACK); rnode->rn_child[slot] = val; atomic_add_int((volatile int *)&rnode->rn_count, 1); + CTR6(KTR_VM, + "insert: tree %p, index %p, level %d, slot %d, rnode %p, count %u", + rtree, (void *)index, level, slot, rnode, rnode->rn_count); return 0; } @@ -367,7 +371,7 @@ vm_radix_lookup(struct vm_radix *rtree, CTR6(KTR_VM, "lookup: tree %p, index %p, level %d, slot %d, rnode %p, child %p", rtree, (void *)index, level, slot, rnode, - (rnode != NULL) ? rnode->rn_child[slot] : NULL); + rnode->rn_child[slot]); if (level == 0) return vm_radix_match(rnode->rn_child[slot], color); rnode = rnode->rn_child[slot]; @@ -395,7 +399,7 @@ vm_radix_color(struct vm_radix *rtree, v CTR6(KTR_VM, "color: tree %p, index %p, level %d, slot %d, rnode %p, child %p", rtree, (void *)index, level, slot, rnode, - (rnode != NULL) ? rnode->rn_child[slot] : NULL); + rnode->rn_child[slot]); if (level == 0) break; rnode = rnode->rn_child[slot]; @@ -579,7 +583,7 @@ restart: CTR6(KTR_VM, "lookup_le: tree %p, index %p, level %d, slot %d, rnode %p, child %p", rtree, (void *)index, level, slot, rnode, - (rnode != NULL) ? rnode->rn_child[slot] : NULL); + rnode->rn_child[slot]); if (level == 0) break; /* @@ -648,10 +652,11 @@ vm_radix_remove(struct vm_radix *rtree, while (level && rnode) { stack[level] = rnode; slot = vm_radix_slot(index, level); - CTR6(KTR_VM, - "remove: tree %p, index %p, level %d, slot %d, rnode %p, child %p", - rtree, (void *)index, level, slot, rnode, - (rnode != NULL) ? rnode->rn_child[slot] : NULL); + CTR5(KTR_VM, + "remove: tree %p, index %p, level %d, slot %d, rnode %p", + rtree, (void *)index, level, slot, rnode); + CTR4(KTR_VM, "remove: tree %p, rnode %p, child %p, count %u", + rtree, rnode, rnode->rn_child[slot], rnode->rn_count); rnode = rnode->rn_child[slot]; level--; } @@ -663,12 +668,14 @@ vm_radix_remove(struct vm_radix *rtree, ("vm_radix_remove: index %jd not present in the tree.\n", index)); for (;;) { - CTR6(KTR_VM, -"remove: resetting tree %p, index %p, level %d, slot %d, rnode %p, child %p", - rtree, (void *)index, level, slot, rnode, - (rnode != NULL) ? rnode->rn_child[slot] : NULL); - CTR3(KTR_VM, "remove: rnode %p, count %d, color %d", - rnode, (rnode != NULL) ? rnode->rn_count : -1, color); + CTR5(KTR_VM, + "remove: resetting tree %p, index %p, level %d, slot %d, rnode %p", + rtree, (void *)index, level, slot, rnode); + CTR4(KTR_VM, + "remove: resetting tree %p, rnode %p, child %p, count %u", + rtree, rnode, + (rnode != NULL) ? rnode->rn_child[slot] : NULL, + (rnode != NULL) ? rnode->rn_count : 0); rnode->rn_child[slot] = NULL; /* * Use atomics for the last level since red and black From owner-svn-src-user@FreeBSD.ORG Wed Nov 30 17:36:01 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D39CF1065672; Wed, 30 Nov 2011 17:36:01 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id AA5788FC27; Wed, 30 Nov 2011 17:36:01 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pAUHa1ur007274; Wed, 30 Nov 2011 17:36:01 GMT (envelope-from sbruno@svn.freebsd.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pAUHa1G2007271; Wed, 30 Nov 2011 17:36:01 GMT (envelope-from sbruno@svn.freebsd.org) Message-Id: <201111301736.pAUHa1G2007271@svn.freebsd.org> From: Sean Bruno Date: Wed, 30 Nov 2011 17:36:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r228155 - user/sbruno/1394dev/firewire X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Nov 2011 17:36:01 -0000 Author: sbruno Date: Wed Nov 30 17:36:01 2011 New Revision: 228155 URL: http://svn.freebsd.org/changeset/base/228155 Log: Merge to HEAD Modified: user/sbruno/1394dev/firewire/firewire.c user/sbruno/1394dev/firewire/fwohci_pci.c Directory Properties: user/sbruno/1394dev/firewire/ (props changed) Modified: user/sbruno/1394dev/firewire/firewire.c ============================================================================== --- user/sbruno/1394dev/firewire/firewire.c Wed Nov 30 14:17:20 2011 (r228154) +++ user/sbruno/1394dev/firewire/firewire.c Wed Nov 30 17:36:01 2011 (r228155) @@ -30,11 +30,11 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ - * */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include @@ -128,9 +128,8 @@ static device_method_t firewire_methods[ /* Bus interface */ DEVMETHOD(bus_add_child, firewire_add_child), - DEVMETHOD(bus_print_child, bus_generic_print_child), - { 0, 0 } + DEVMETHOD_END }; char *linkspeed[] = { "S100", "S200", "S400", "S800", Modified: user/sbruno/1394dev/firewire/fwohci_pci.c ============================================================================== --- user/sbruno/1394dev/firewire/fwohci_pci.c Wed Nov 30 14:17:20 2011 (r228154) +++ user/sbruno/1394dev/firewire/fwohci_pci.c Wed Nov 30 17:36:01 2011 (r228155) @@ -30,10 +30,11 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #define BOUNCE_BUFFER_TEST 0 #include @@ -536,9 +537,8 @@ static device_method_t fwohci_methods[] /* Bus interface */ DEVMETHOD(bus_add_child, fwohci_pci_add_child), - DEVMETHOD(bus_print_child, bus_generic_print_child), - { 0, 0 } + DEVMETHOD_END }; static driver_t fwohci_driver = { From owner-svn-src-user@FreeBSD.ORG Wed Nov 30 20:43:39 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 799E81065676; Wed, 30 Nov 2011 20:43:39 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 500CC8FC16; Wed, 30 Nov 2011 20:43:39 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pAUKhdOB013305; Wed, 30 Nov 2011 20:43:39 GMT (envelope-from sbruno@svn.freebsd.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pAUKhdGc013304; Wed, 30 Nov 2011 20:43:39 GMT (envelope-from sbruno@svn.freebsd.org) Message-Id: <201111302043.pAUKhdGc013304@svn.freebsd.org> From: Sean Bruno Date: Wed, 30 Nov 2011 20:43:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r228164 - user/sbruno/1394dev/fwcontrol X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Nov 2011 20:43:39 -0000 Author: sbruno Date: Wed Nov 30 20:43:39 2011 New Revision: 228164 URL: http://svn.freebsd.org/changeset/base/228164 Log: Branch the userland tool into the 1394dev tree as well Added: - copied from r228163, head/usr.sbin/fwcontrol/ Directory Properties: user/sbruno/1394dev/fwcontrol/ (props changed) From owner-svn-src-user@FreeBSD.ORG Thu Dec 1 19:57:14 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 09E2E106566B; Thu, 1 Dec 2011 19:57:14 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EE1A18FC0A; Thu, 1 Dec 2011 19:57:13 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pB1JvDtJ059643; Thu, 1 Dec 2011 19:57:13 GMT (envelope-from sbruno@svn.freebsd.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pB1JvDjL059641; Thu, 1 Dec 2011 19:57:13 GMT (envelope-from sbruno@svn.freebsd.org) Message-Id: <201112011957.pB1JvDjL059641@svn.freebsd.org> From: Sean Bruno Date: Thu, 1 Dec 2011 19:57:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r228186 - user/sbruno/1394dev/fwcontrol X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Dec 2011 19:57:14 -0000 Author: sbruno Date: Thu Dec 1 19:57:13 2011 New Revision: 228186 URL: http://svn.freebsd.org/changeset/base/228186 Log: Open the device before calling detect_recv_fn() Modified: user/sbruno/1394dev/fwcontrol/fwcontrol.c Modified: user/sbruno/1394dev/fwcontrol/fwcontrol.c ============================================================================== --- user/sbruno/1394dev/fwcontrol/fwcontrol.c Thu Dec 1 18:46:28 2011 (r228185) +++ user/sbruno/1394dev/fwcontrol/fwcontrol.c Thu Dec 1 19:57:13 2011 (r228186) @@ -1063,9 +1063,15 @@ main(int argc, char **argv) #define CHANNEL 63 if (recv_data != NULL){ if (recvfn == NULL) { /* guess... */ - recvfn = detect_recv_fn(fd, TAG | CHANNEL); - close(fd); - fd = -1; + snprintf(devbase, sizeof(devbase), "%s%d.0", device_string, current_board); + if (open_dev(&fd, devbase) < 0) { + err(EX_IOERR, "%s: Error opening firewire controller #%d %s in recv_data detect\n", + __func__, current_board, devbase); + } else { + recvfn = detect_recv_fn(fd, TAG | CHANNEL); + close(fd); + fd = -1; + } } snprintf(devbase, sizeof(devbase), "%s%d.0", device_string, current_board); if (open_dev(&fd, devbase) < 0) From owner-svn-src-user@FreeBSD.ORG Fri Dec 2 21:45:46 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D67E3106566B; Fri, 2 Dec 2011 21:45:46 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C27E38FC13; Fri, 2 Dec 2011 21:45:46 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pB2LjkdN010177; Fri, 2 Dec 2011 21:45:46 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pB2LjkLk010170; Fri, 2 Dec 2011 21:45:46 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201112022145.pB2LjkLk010170@svn.freebsd.org> From: Attilio Rao Date: Fri, 2 Dec 2011 21:45:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r228210 - in user/attilio/vmcontention: . cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/cmd/zpool cddl/contrib/opensolaris/cmd/ztest cddl/contrib/opensolaris/lib/libzfs/comm... X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Dec 2011 21:45:46 -0000 Author: attilio Date: Fri Dec 2 21:45:46 2011 New Revision: 228210 URL: http://svn.freebsd.org/changeset/base/228210 Log: MFC Added: user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_iter.c - copied unchanged from r228209, head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_iter.c user/attilio/vmcontention/share/man/man4/ffclock.4 - copied unchanged from r228209, head/share/man/man4/ffclock.4 user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/aslrestype2s.c - copied unchanged from r228209, head/sys/contrib/dev/acpica/compiler/aslrestype2s.c user/attilio/vmcontention/sys/contrib/dev/acpica/disassembler/dmresrcl2.c - copied unchanged from r228209, head/sys/contrib/dev/acpica/disassembler/dmresrcl2.c user/attilio/vmcontention/sys/contrib/dev/acpica/include/actbl3.h - copied unchanged from r228209, head/sys/contrib/dev/acpica/include/actbl3.h user/attilio/vmcontention/sys/contrib/dev/acpica/os_specific/ - copied from r228209, head/sys/contrib/dev/acpica/os_specific/ user/attilio/vmcontention/sys/contrib/dev/acpica/resources/rsserial.c - copied unchanged from r228209, head/sys/contrib/dev/acpica/resources/rsserial.c user/attilio/vmcontention/sys/contrib/dev/acpica/utilities/utxfmutex.c - copied unchanged from r228209, head/sys/contrib/dev/acpica/utilities/utxfmutex.c user/attilio/vmcontention/tools/build/options/WITH_CTF - copied unchanged from r228209, head/tools/build/options/WITH_CTF user/attilio/vmcontention/tools/build/options/WITH_LIBCPLUSPLUS - copied unchanged from r228209, head/tools/build/options/WITH_LIBCPLUSPLUS user/attilio/vmcontention/tools/regression/pipe/pipe-ino.c - copied unchanged from r228209, head/tools/regression/pipe/pipe-ino.c user/attilio/vmcontention/tools/regression/usr.bin/make/execution/ - copied from r228209, head/tools/regression/usr.bin/make/execution/ Deleted: user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c user/attilio/vmcontention/sys/contrib/dev/acpica/osunixxf.c user/attilio/vmcontention/sys/contrib/dev/acpica/tools/ Modified: user/attilio/vmcontention/Makefile.inc1 user/attilio/vmcontention/UPDATING 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/ztest/ztest.c user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c user/attilio/vmcontention/cddl/lib/libzfs/Makefile user/attilio/vmcontention/etc/rc.d/kld user/attilio/vmcontention/kerberos5/usr.bin/kadmin/Makefile user/attilio/vmcontention/kerberos5/usr.sbin/ktutil/Makefile user/attilio/vmcontention/lib/libc/gen/syslog.c user/attilio/vmcontention/lib/libc/locale/duplocale.3 user/attilio/vmcontention/lib/libc/locale/freelocale.3 user/attilio/vmcontention/lib/libc/locale/localeconv.3 user/attilio/vmcontention/lib/libc/locale/newlocale.3 user/attilio/vmcontention/lib/libc/locale/querylocale.3 user/attilio/vmcontention/lib/libc/locale/uselocale.3 user/attilio/vmcontention/lib/libc/locale/xlocale.3 user/attilio/vmcontention/lib/libc/string/strcasecmp.c user/attilio/vmcontention/lib/libc/string/strcmp.c user/attilio/vmcontention/lib/libc/string/strcoll.c user/attilio/vmcontention/lib/libc/string/strncmp.c user/attilio/vmcontention/lib/libedit/edit/readline/Makefile user/attilio/vmcontention/lib/libedit/edit/readline/readline.h user/attilio/vmcontention/rescue/rescue/Makefile user/attilio/vmcontention/sbin/camcontrol/fwdownload.c user/attilio/vmcontention/sbin/sysctl/sysctl.c user/attilio/vmcontention/share/man/man4/Makefile user/attilio/vmcontention/share/man/man4/ahci.4 user/attilio/vmcontention/share/man/man4/bge.4 user/attilio/vmcontention/share/man/man5/src.conf.5 user/attilio/vmcontention/share/mk/bsd.lib.mk user/attilio/vmcontention/share/mk/bsd.own.mk user/attilio/vmcontention/share/mk/bsd.prog.mk user/attilio/vmcontention/share/mk/sys.mk user/attilio/vmcontention/sys/amd64/conf/NOTES user/attilio/vmcontention/sys/arm/mv/common.c user/attilio/vmcontention/sys/arm/mv/mv_machdep.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.h user/attilio/vmcontention/sys/cddl/contrib/opensolaris/common/zfs/zpool_prop.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deadlist.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_deleg.h user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent/eventdefs.h user/attilio/vmcontention/sys/conf/files user/attilio/vmcontention/sys/conf/files.amd64 user/attilio/vmcontention/sys/conf/kern.mk user/attilio/vmcontention/sys/conf/kern.post.mk user/attilio/vmcontention/sys/conf/kern.pre.mk user/attilio/vmcontention/sys/conf/kmod.mk user/attilio/vmcontention/sys/conf/newvers.sh user/attilio/vmcontention/sys/contrib/dev/acpica/acpica_prep.sh user/attilio/vmcontention/sys/contrib/dev/acpica/changes.txt user/attilio/vmcontention/sys/contrib/dev/acpica/common/adisasm.c user/attilio/vmcontention/sys/contrib/dev/acpica/common/adwalk.c user/attilio/vmcontention/sys/contrib/dev/acpica/common/dmrestag.c user/attilio/vmcontention/sys/contrib/dev/acpica/common/dmtable.c user/attilio/vmcontention/sys/contrib/dev/acpica/common/dmtbdump.c user/attilio/vmcontention/sys/contrib/dev/acpica/common/dmtbinfo.c user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/aslanalyze.c user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/aslcodegen.c user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/aslcompile.c user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/aslcompiler.h user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/aslcompiler.l user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/aslcompiler.y user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/asldefine.h user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/aslerror.c user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/aslfiles.c user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/aslglobal.h user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/asllisting.c user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/aslload.c user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/asllookup.c user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/aslmain.c user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/aslmap.c user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/aslmessages.h user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/aslopcodes.c user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/asloperands.c user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/aslpredef.c user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/aslresource.c user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/aslrestype1.c user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/aslrestype1i.c user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/aslrestype2.c user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/aslrestype2d.c user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/aslrestype2e.c user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/aslrestype2q.c user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/aslrestype2w.c user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/aslstubs.c user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/asltransform.c user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/asltree.c user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/asltypes.h user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/aslutils.c user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/aslwalks.c user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/dtcompile.c user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/dtcompiler.h user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/dtfield.c user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/dtsubtable.c user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/dttable.c user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/dttemplate.h user/attilio/vmcontention/sys/contrib/dev/acpica/compiler/dtutils.c user/attilio/vmcontention/sys/contrib/dev/acpica/debugger/dbcmds.c user/attilio/vmcontention/sys/contrib/dev/acpica/debugger/dbdisply.c user/attilio/vmcontention/sys/contrib/dev/acpica/debugger/dbfileio.c user/attilio/vmcontention/sys/contrib/dev/acpica/debugger/dbinput.c user/attilio/vmcontention/sys/contrib/dev/acpica/debugger/dbutils.c user/attilio/vmcontention/sys/contrib/dev/acpica/disassembler/dmbuffer.c user/attilio/vmcontention/sys/contrib/dev/acpica/disassembler/dmopcode.c user/attilio/vmcontention/sys/contrib/dev/acpica/disassembler/dmresrc.c user/attilio/vmcontention/sys/contrib/dev/acpica/disassembler/dmresrcl.c user/attilio/vmcontention/sys/contrib/dev/acpica/disassembler/dmresrcs.c user/attilio/vmcontention/sys/contrib/dev/acpica/disassembler/dmutils.c user/attilio/vmcontention/sys/contrib/dev/acpica/disassembler/dmwalk.c user/attilio/vmcontention/sys/contrib/dev/acpica/dispatcher/dsargs.c user/attilio/vmcontention/sys/contrib/dev/acpica/dispatcher/dsfield.c user/attilio/vmcontention/sys/contrib/dev/acpica/events/evevent.c user/attilio/vmcontention/sys/contrib/dev/acpica/events/evglock.c user/attilio/vmcontention/sys/contrib/dev/acpica/events/evregion.c user/attilio/vmcontention/sys/contrib/dev/acpica/executer/exconfig.c user/attilio/vmcontention/sys/contrib/dev/acpica/executer/excreate.c user/attilio/vmcontention/sys/contrib/dev/acpica/executer/exdump.c user/attilio/vmcontention/sys/contrib/dev/acpica/executer/exfield.c user/attilio/vmcontention/sys/contrib/dev/acpica/executer/exfldio.c user/attilio/vmcontention/sys/contrib/dev/acpica/executer/exprep.c user/attilio/vmcontention/sys/contrib/dev/acpica/executer/exutils.c user/attilio/vmcontention/sys/contrib/dev/acpica/hardware/hwvalid.c user/attilio/vmcontention/sys/contrib/dev/acpica/include/acapps.h user/attilio/vmcontention/sys/contrib/dev/acpica/include/acconfig.h user/attilio/vmcontention/sys/contrib/dev/acpica/include/acdebug.h user/attilio/vmcontention/sys/contrib/dev/acpica/include/acdisasm.h user/attilio/vmcontention/sys/contrib/dev/acpica/include/acevents.h user/attilio/vmcontention/sys/contrib/dev/acpica/include/acglobal.h user/attilio/vmcontention/sys/contrib/dev/acpica/include/acinterp.h user/attilio/vmcontention/sys/contrib/dev/acpica/include/aclocal.h user/attilio/vmcontention/sys/contrib/dev/acpica/include/acnames.h user/attilio/vmcontention/sys/contrib/dev/acpica/include/acobject.h user/attilio/vmcontention/sys/contrib/dev/acpica/include/acopcode.h user/attilio/vmcontention/sys/contrib/dev/acpica/include/acpixf.h user/attilio/vmcontention/sys/contrib/dev/acpica/include/acpredef.h user/attilio/vmcontention/sys/contrib/dev/acpica/include/acresrc.h user/attilio/vmcontention/sys/contrib/dev/acpica/include/acrestyp.h user/attilio/vmcontention/sys/contrib/dev/acpica/include/actbl.h user/attilio/vmcontention/sys/contrib/dev/acpica/include/actbl1.h user/attilio/vmcontention/sys/contrib/dev/acpica/include/actypes.h user/attilio/vmcontention/sys/contrib/dev/acpica/include/acutils.h user/attilio/vmcontention/sys/contrib/dev/acpica/include/amlcode.h user/attilio/vmcontention/sys/contrib/dev/acpica/include/amlresrc.h user/attilio/vmcontention/sys/contrib/dev/acpica/include/platform/acenv.h user/attilio/vmcontention/sys/contrib/dev/acpica/namespace/nspredef.c user/attilio/vmcontention/sys/contrib/dev/acpica/namespace/nsrepair.c user/attilio/vmcontention/sys/contrib/dev/acpica/namespace/nsrepair2.c user/attilio/vmcontention/sys/contrib/dev/acpica/parser/psargs.c user/attilio/vmcontention/sys/contrib/dev/acpica/parser/psopcode.c user/attilio/vmcontention/sys/contrib/dev/acpica/parser/pstree.c user/attilio/vmcontention/sys/contrib/dev/acpica/resources/rscalc.c user/attilio/vmcontention/sys/contrib/dev/acpica/resources/rscreate.c user/attilio/vmcontention/sys/contrib/dev/acpica/resources/rsdump.c user/attilio/vmcontention/sys/contrib/dev/acpica/resources/rsinfo.c user/attilio/vmcontention/sys/contrib/dev/acpica/resources/rsirq.c user/attilio/vmcontention/sys/contrib/dev/acpica/resources/rslist.c user/attilio/vmcontention/sys/contrib/dev/acpica/resources/rsmisc.c user/attilio/vmcontention/sys/contrib/dev/acpica/resources/rsutils.c user/attilio/vmcontention/sys/contrib/dev/acpica/resources/rsxface.c user/attilio/vmcontention/sys/contrib/dev/acpica/tables/tbfadt.c user/attilio/vmcontention/sys/contrib/dev/acpica/tables/tbutils.c user/attilio/vmcontention/sys/contrib/dev/acpica/utilities/utdecode.c user/attilio/vmcontention/sys/contrib/dev/acpica/utilities/utmutex.c user/attilio/vmcontention/sys/contrib/dev/acpica/utilities/utresrc.c user/attilio/vmcontention/sys/contrib/pf/net/pf.c user/attilio/vmcontention/sys/dev/ahci/ahci.c user/attilio/vmcontention/sys/dev/ata/chipsets/ata-ati.c user/attilio/vmcontention/sys/dev/ata/chipsets/ata-nvidia.c user/attilio/vmcontention/sys/dev/fdt/fdt_common.c user/attilio/vmcontention/sys/dev/fdt/fdt_powerpc.c user/attilio/vmcontention/sys/dev/fdt/fdtbus.c user/attilio/vmcontention/sys/dev/hwpmc/hwpmc_core.c user/attilio/vmcontention/sys/dev/ofw/ofw_fdt.c user/attilio/vmcontention/sys/dev/ofw/openfirm.c user/attilio/vmcontention/sys/dev/pci/pcireg.h user/attilio/vmcontention/sys/dev/uart/uart_bus_fdt.c user/attilio/vmcontention/sys/dev/usb/wlan/if_urtw.c user/attilio/vmcontention/sys/dev/vr/if_vr.c user/attilio/vmcontention/sys/dev/vr/if_vrreg.h user/attilio/vmcontention/sys/fs/nfsclient/nfs_clbio.c user/attilio/vmcontention/sys/fs/nfsserver/nfs_nfsdport.c user/attilio/vmcontention/sys/fs/nwfs/nwfs_io.c user/attilio/vmcontention/sys/fs/smbfs/smbfs_io.c user/attilio/vmcontention/sys/geom/geom_vfs.c user/attilio/vmcontention/sys/kern/kern_ffclock.c user/attilio/vmcontention/sys/kern/kern_resource.c user/attilio/vmcontention/sys/kern/kern_tc.c user/attilio/vmcontention/sys/kern/subr_bus.c user/attilio/vmcontention/sys/kern/sys_pipe.c user/attilio/vmcontention/sys/kern/uipc_shm.c user/attilio/vmcontention/sys/kern/vfs_bio.c user/attilio/vmcontention/sys/mips/cavium/octeon_machdep.c user/attilio/vmcontention/sys/mips/mips/db_trace.c user/attilio/vmcontention/sys/modules/acpi/acpi/Makefile user/attilio/vmcontention/sys/net/bpf.c user/attilio/vmcontention/sys/net/bpf.h user/attilio/vmcontention/sys/net/if_vlan.c user/attilio/vmcontention/sys/netinet/sctp_pcb.c user/attilio/vmcontention/sys/nfsclient/nfs_bio.c user/attilio/vmcontention/sys/nfsserver/nfs_serv.c user/attilio/vmcontention/sys/powerpc/booke/platform_bare.c user/attilio/vmcontention/sys/powerpc/powermac/platform_powermac.c user/attilio/vmcontention/sys/sparc64/sparc64/ofw_machdep.c user/attilio/vmcontention/sys/sparc64/sparc64/vm_machdep.c user/attilio/vmcontention/sys/sys/timeffc.h user/attilio/vmcontention/sys/vm/vm_page.c user/attilio/vmcontention/sys/vm/vm_page.h user/attilio/vmcontention/sys/vm/vm_radix.c user/attilio/vmcontention/sys/vm/vm_radix.h user/attilio/vmcontention/sys/vm/vnode_pager.c user/attilio/vmcontention/sys/xen/evtchn/evtchn_dev.c user/attilio/vmcontention/tools/regression/bin/test/regress.sh user/attilio/vmcontention/usr.bin/grep/Makefile user/attilio/vmcontention/usr.bin/grep/util.c user/attilio/vmcontention/usr.bin/make/Makefile user/attilio/vmcontention/usr.bin/make/job.c user/attilio/vmcontention/usr.bin/procstat/procstat.1 user/attilio/vmcontention/usr.sbin/acpi/Makefile.inc user/attilio/vmcontention/usr.sbin/acpi/acpidb/Makefile user/attilio/vmcontention/usr.sbin/acpi/acpidb/acpidb.c user/attilio/vmcontention/usr.sbin/acpi/iasl/Makefile user/attilio/vmcontention/usr.sbin/bsdinstall/scripts/auto user/attilio/vmcontention/usr.sbin/bsdinstall/scripts/services user/attilio/vmcontention/usr.sbin/config/mkmakefile.c user/attilio/vmcontention/usr.sbin/mergemaster/mergemaster.sh user/attilio/vmcontention/usr.sbin/mfiutil/mfi_config.c user/attilio/vmcontention/usr.sbin/sade/misc.c user/attilio/vmcontention/usr.sbin/tzsetup/tzsetup.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/tools/build/options/WITHOUT_GPIO (props changed) user/attilio/vmcontention/tools/build/options/WITH_OFED (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/Makefile.inc1 ============================================================================== --- user/attilio/vmcontention/Makefile.inc1 Fri Dec 2 21:19:14 2011 (r228209) +++ user/attilio/vmcontention/Makefile.inc1 Fri Dec 2 21:45:46 2011 (r228210) @@ -59,8 +59,6 @@ SUBDIR+=games .endif .if ${MK_CDDL} != "no" SUBDIR+=cddl -.else -NO_CTF=1 .endif SUBDIR+=gnu include .if ${MK_KERBEROS} != "no" @@ -239,7 +237,7 @@ BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \ BOOTSTRAPPING=${OSRELDATE} \ SSP_CFLAGS= \ -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \ - -DNO_PIC -DWITHOUT_PROFILE -DNO_SHARED \ + -DNO_PIC -DNO_PROFILE -DNO_SHARED \ -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF # build-tools stage @@ -438,7 +436,7 @@ _libraries: @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; \ ${WMAKE} -DNO_FSCHG -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT \ - -DWITHOUT_MAN -DWITHOUT_PROFILE libraries + -DWITHOUT_MAN -DNO_PROFILE libraries _depend: @echo @echo "--------------------------------------------------------------" @@ -1321,8 +1319,8 @@ ${_lib}__PL: .PHONY cd ${.CURDIR}/${_lib}; \ ${MAKE} DIRPRFX=${_lib}/ obj; \ ${MAKE} DIRPRFX=${_lib}/ depend; \ - ${MAKE} -DWITHOUT_PROFILE -DNO_PIC DIRPRFX=${_lib}/ all; \ - ${MAKE} -DWITHOUT_PROFILE -DNO_PIC DIRPRFX=${_lib}/ install + ${MAKE} -DNO_PROFILE -DNO_PIC DIRPRFX=${_lib}/ all; \ + ${MAKE} -DNO_PROFILE -DNO_PIC DIRPRFX=${_lib}/ install .endif .endfor @@ -1555,7 +1553,7 @@ XDEV_CPUTYPE?=${TARGET_CPUTYPE} .endif NOFUN=-DNO_FSCHG -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT \ - -DWITHOUT_MAN -DWITHOUT_NLS -DWITHOUT_PROFILE \ + -DWITHOUT_MAN -DWITHOUT_NLS -DNO_PROFILE \ -DWITHOUT_KERBEROS -DWITHOUT_RESCUE -DNO_WARNS \ TARGET=${XDEV} TARGET_ARCH=${XDEV_ARCH} \ CPUTYPE=${XDEV_CPUTYPE} Modified: user/attilio/vmcontention/UPDATING ============================================================================== --- user/attilio/vmcontention/UPDATING Fri Dec 2 21:19:14 2011 (r228209) +++ user/attilio/vmcontention/UPDATING Fri Dec 2 21:45:46 2011 (r228210) @@ -22,6 +22,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 machines to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20111122: + The acpi_wmi(4) status device /dev/wmistat has been renamed to + /dev/wmistat0. + 20111108: The option VFS_ALLOW_NONMPSAFE option has been added in order to explicitely support non-MPSAFE filesystems. Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zfs/zfs.8 ============================================================================== --- user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Fri Dec 2 21:19:14 2011 (r228209) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Fri Dec 2 21:45:46 2011 (r228210) @@ -48,12 +48,16 @@ .Ar size volume .Nm .Cm destroy -.Op Fl rRf +.Op Fl fnpRrv .Ar filesystem Ns | Ns Ar volume .Nm .Cm destroy -.Op Fl rRd +.Op Fl dnpRrv +.Sm off .Ar snapshot +.Ns Op % Ns Ar snapname +.Ns Op , Ns Ar ... +.Sm on .Nm .Cm snapshot .Op Fl r @@ -160,7 +164,7 @@ .Fl a | Ar filesystem Ns | Ns Ar mountpoint .Nm .Cm send -.Op Fl DvRp +.Op Fl DnPpRrv .Op Fl i Ar snapshot | Fl I Ar snapshot .Ar snapshot .Nm @@ -487,6 +491,17 @@ The default value is .Cm off . .It Sy creation The time this dataset was created. +.It Sy clones +For snapshots, this property is a comma-separated list of filesystems or +volumes which are clones of this snapshot. The clones' +.Sy origin +property is this snapshot. If the +.Sy clones +property is not empty, then this snapshot can not be destroyed (even with the +.Fl r +or +.Fl f +options). .It Sy defer_destroy This property is .Cm on @@ -644,6 +659,28 @@ power of 2 from 512 bytes to 128 Kbytes .Pp This property can also be referred to by its shortened column name, .Sy volblock . +.It Sy written +The amount of +.Sy referenced +space written to this dataset since the previous snapshot. +.It Sy written@ Ns Ar snapshot +The amount of +.Sy referenced +space written to this dataset since the specified snapshot. This is the space +that is referenced by this dataset but was not referenced by the specified +snapshot. +.Pp +The +.Ar snapshot +may be specified as a short snapshot name (just the part after the +.Sy @ Ns ), +in which case it will be interpreted as a snapshot in the same filesystem as +this dataset. The +.Ar snapshot +may be a full snapshot name +.Pq Em filesystem@snapshot , +which for clones may be a snapshot in the origin's filesystem (or the origin of +the origin's filesystem, etc). .El .Pp The following native properties can be used to change the behavior of a @@ -1403,7 +1440,7 @@ options. .It Xo .Nm .Cm destroy -.Op Fl rRf +.Op Fl fnpRrv .Ar filesystem Ns | Ns Ar volume .Xc .Pp @@ -1422,6 +1459,17 @@ Force an unmount of any file systems usi .Qq Nm Cm unmount Fl f command. This option has no effect on non-file systems or unmounted file systems. +.It Fl n +Do a dry-run ("No-op") deletion. No data will be deleted. This is useful in +conjunction with the +.Fl v +or +.Fl p +flags to determine what data would be deleted. +.It Fl p +Print machine-parsable verbose information about the deleted data. +.It Fl v +Print verbose information about the deleted data. .El .Pp Extreme care should be taken when applying either the @@ -1433,11 +1481,15 @@ behavior for mounted file systems in use .It Xo .Nm .Cm destroy -.Op Fl rRd +.Op Fl dnpRrv +.Sm off .Ar snapshot +.Ns Op % Ns Ar snapname +.Ns Op , Ns Ar ... +.Sm on .Xc .Pp -The given snapshot is destroyed immediately if and only if the +The given snapshots are destroyed immediately if and only if the .Qq Nm Cm destroy command without the .Fl d @@ -1445,15 +1497,41 @@ option would have destroyed it. Such imm example, if the snapshot had no clones and the user-initiated reference count were zero. .Pp -If the snapshot does not qualify for immediate destruction, it is marked for +If a snapshot does not qualify for immediate destruction, it is marked for deferred deletion. In this state, it exists as a usable, visible snapshot until both of the preconditions listed above are met, at which point it is destroyed. +.Pp +An inclusive range of snapshots may be specified by separating the +first and last snapshots with a percent sign +.Pq Sy % . +The first and/or last snapshots may be left blank, in which case the +filesystem's oldest or newest snapshot will be implied. +.Pp +Multiple snapshots +(or ranges of snapshots) of the same filesystem or volume may be specified +in a comma-separated list of snapshots. +Only the snapshot's short name (the +part after the +.Sy @ ) +should be specified when using a range or comma-separated list to identify +multiple snapshots. .Bl -tag -width indent .It Fl r Destroy (or mark for deferred deletion) all snapshots with this name in descendent file systems. .It Fl R Recursively destroy all dependents. +.It Fl n +Do a dry-run ("No-op") deletion. No data will be deleted. This is useful in +conjunction with the +.Fl v +or +.Fl p +flags to determine what data would be deleted. +.It Fl p +Print machine-parsable verbose information about the deleted data. +.It Fl v +Print verbose information about the deleted data. .It Fl d Defer snapshot deletion. .El @@ -2080,7 +2158,7 @@ file system shared on the system. .It Xo .Nm .Cm send -.Op Fl DvRp +.Op Fl DnPpRrv .Op Fl i Ar snapshot | Fl I Ar snapshot .Ar snapshot .Xc @@ -2120,7 +2198,7 @@ Generate a stream package that sends all .Ar snapshot . For example, .Ic -I @a fs@d is similar to -.Ic -i @a fs@b; -i @b fs@c; -i @c fs@d Ns . +.Ic -i @a fs@b; -i @b fs@c; -i @c fs@d . The incremental source snapshot may be specified as with the .Fl i option. @@ -2151,10 +2229,26 @@ be used regardless of the dataset's property, but performance will be much better if the filesystem uses a dedup-capable checksum (eg. .Sy sha256 Ns ). +.It Fl r +Recursively send all descendant snapshots. This is similar to the +.Fl R +flag, but information about deleted and renamed datasets is not included, and +property information is only included if the +.Fl p +flag is specified. .It Fl p Include the dataset's properties in the stream. This flag is implicit when .Fl R is specified. The receiving system must also support this feature. +.It Fl n +Do a dry-run ("No-op") send. Do not generate any actual send data. This is +useful in conjunction with the +.Fl v +or +.Fl P +flags to determine what data will be sent. +.It Fl P +Print machine-parsable verbose information about the stream package generated. .It Fl v Print verbose information about the stream package generated. .El @@ -2320,7 +2414,7 @@ may be specified as a comma-separated li .Tn ZFS subcommand and property names. See the property list below. Property set names, which begin with an at sign -.Pq Sy @ Ns , +.Pq Sy @ , may be specified. See the .Fl s form below for details. @@ -2442,7 +2536,7 @@ commands for the specified file system a dynamically, so changes to a set are immediately reflected. Permission sets follow the same naming restrictions as ZFS file systems, but the name must begin with an "at sign" -.Pq Sy @ Ns , +.Pq Sy @ , and can be no more than 64 characters long. .It Xo .Nm Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c ============================================================================== --- user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Fri Dec 2 21:19:14 2011 (r228209) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Fri Dec 2 21:45:46 2011 (r228210) @@ -22,8 +22,9 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2011 Nexenta Systems, Inc. All rights reserved. + * Copyright (c) 2011 by Delphix. All rights reserved. * Copyright (c) 2011 Pawel Jakub Dawidek . - * All rights reserved. + * Copyright (c) 2011 Martin Matuska . All rights reserved. */ #include @@ -145,7 +146,7 @@ typedef enum { HELP_HOLD, HELP_HOLDS, HELP_RELEASE, - HELP_DIFF + HELP_DIFF, } zfs_help_t; typedef struct zfs_command { @@ -220,8 +221,9 @@ get_usage(zfs_help_t idx) "\tcreate [-ps] [-b blocksize] [-o property=value] ... " "-V \n")); case HELP_DESTROY: - return (gettext("\tdestroy [-rRf] \n" - "\tdestroy [-rRd] \n")); + return (gettext("\tdestroy [-fnpRrv] \n" + "\tdestroy [-dnpRrv] " + "[%][,...]\n")); case HELP_GET: return (gettext("\tget [-rHp] [-d max] " "[-o \"all\" | field[,...]] [-s source[,...]]\n" @@ -260,7 +262,7 @@ get_usage(zfs_help_t idx) case HELP_ROLLBACK: return (gettext("\trollback [-rRf] \n")); case HELP_SEND: - return (gettext("\tsend [-DvRp] " + return (gettext("\tsend [-DnPpRrv] " "[-i snapshot | -I snapshot] \n")); case HELP_SET: return (gettext("\tset " @@ -440,6 +442,8 @@ usage(boolean_t requested) (void) fprintf(fp, "YES NO | none\n"); (void) fprintf(fp, "\t%-15s ", "groupquota@..."); (void) fprintf(fp, "YES NO | none\n"); + (void) fprintf(fp, "\t%-15s ", "written@"); + (void) fprintf(fp, " NO NO \n"); (void) fprintf(fp, gettext("\nSizes are specified in bytes " "with standard units such as K, M, G, etc.\n")); @@ -885,15 +889,23 @@ badusage: */ typedef struct destroy_cbdata { boolean_t cb_first; - int cb_force; - int cb_recurse; - int cb_error; - int cb_needforce; - int cb_doclones; - boolean_t cb_closezhp; + boolean_t cb_force; + boolean_t cb_recurse; + boolean_t cb_error; + boolean_t cb_doclones; zfs_handle_t *cb_target; - char *cb_snapname; boolean_t cb_defer_destroy; + boolean_t cb_verbose; + boolean_t cb_parsable; + boolean_t cb_dryrun; + nvlist_t *cb_nvl; + + /* first snap in contiguous run */ + zfs_handle_t *cb_firstsnap; + /* previous snap in contiguous run */ + zfs_handle_t *cb_prevsnap; + int64_t cb_snapused; + char *cb_snapspec; } destroy_cbdata_t; /* @@ -923,7 +935,7 @@ destroy_check_dependent(zfs_handle_t *zh (void) fprintf(stderr, gettext("use '-r' to destroy " "the following datasets:\n")); cbp->cb_first = B_FALSE; - cbp->cb_error = 1; + cbp->cb_error = B_TRUE; } (void) fprintf(stderr, "%s\n", zfs_get_name(zhp)); @@ -944,7 +956,8 @@ destroy_check_dependent(zfs_handle_t *zh (void) fprintf(stderr, gettext("use '-R' to destroy " "the following datasets:\n")); cbp->cb_first = B_FALSE; - cbp->cb_error = 1; + cbp->cb_error = B_TRUE; + cbp->cb_dryrun = B_TRUE; } (void) fprintf(stderr, "%s\n", zfs_get_name(zhp)); @@ -958,7 +971,20 @@ out: static int destroy_callback(zfs_handle_t *zhp, void *data) { - destroy_cbdata_t *cbp = data; + destroy_cbdata_t *cb = data; + const char *name = zfs_get_name(zhp); + + if (cb->cb_verbose) { + if (cb->cb_parsable) { + (void) printf("destroy\t%s\n", name); + } else if (cb->cb_dryrun) { + (void) printf(gettext("would destroy %s\n"), + name); + } else { + (void) printf(gettext("will destroy %s\n"), + name); + } + } /* * Ignore pools (which we've already flagged as an error before getting @@ -970,13 +996,12 @@ destroy_callback(zfs_handle_t *zhp, void return (0); } - /* - * Bail out on the first error. - */ - if (zfs_unmount(zhp, NULL, cbp->cb_force ? MS_FORCE : 0) != 0 || - zfs_destroy(zhp, cbp->cb_defer_destroy) != 0) { - zfs_close(zhp); - return (-1); + if (!cb->cb_dryrun) { + if (zfs_unmount(zhp, NULL, cb->cb_force ? MS_FORCE : 0) != 0 || + zfs_destroy(zhp, cb->cb_defer_destroy) != 0) { + zfs_close(zhp); + return (-1); + } } zfs_close(zhp); @@ -984,39 +1009,142 @@ destroy_callback(zfs_handle_t *zhp, void } static int -destroy_snap_clones(zfs_handle_t *zhp, void *arg) +destroy_print_cb(zfs_handle_t *zhp, void *arg) { - destroy_cbdata_t *cbp = arg; - char thissnap[MAXPATHLEN]; - zfs_handle_t *szhp; - boolean_t closezhp = cbp->cb_closezhp; - int rv; + destroy_cbdata_t *cb = arg; + const char *name = zfs_get_name(zhp); + int err = 0; - (void) snprintf(thissnap, sizeof (thissnap), - "%s@%s", zfs_get_name(zhp), cbp->cb_snapname); + if (nvlist_exists(cb->cb_nvl, name)) { + if (cb->cb_firstsnap == NULL) + cb->cb_firstsnap = zfs_handle_dup(zhp); + if (cb->cb_prevsnap != NULL) + zfs_close(cb->cb_prevsnap); + /* this snap continues the current range */ + cb->cb_prevsnap = zfs_handle_dup(zhp); + if (cb->cb_verbose) { + if (cb->cb_parsable) { + (void) printf("destroy\t%s\n", name); + } else if (cb->cb_dryrun) { + (void) printf(gettext("would destroy %s\n"), + name); + } else { + (void) printf(gettext("will destroy %s\n"), + name); + } + } + } else if (cb->cb_firstsnap != NULL) { + /* end of this range */ + uint64_t used = 0; + err = zfs_get_snapused_int(cb->cb_firstsnap, + cb->cb_prevsnap, &used); + cb->cb_snapused += used; + zfs_close(cb->cb_firstsnap); + cb->cb_firstsnap = NULL; + zfs_close(cb->cb_prevsnap); + cb->cb_prevsnap = NULL; + } + zfs_close(zhp); + return (err); +} - libzfs_print_on_error(g_zfs, B_FALSE); - szhp = zfs_open(g_zfs, thissnap, ZFS_TYPE_SNAPSHOT); - libzfs_print_on_error(g_zfs, B_TRUE); - if (szhp) { - /* - * Destroy any clones of this snapshot - */ - if (zfs_iter_dependents(szhp, B_FALSE, destroy_callback, - cbp) != 0) { - zfs_close(szhp); - if (closezhp) - zfs_close(zhp); - return (-1); +static int +destroy_print_snapshots(zfs_handle_t *fs_zhp, destroy_cbdata_t *cb) +{ + int err; + assert(cb->cb_firstsnap == NULL); + assert(cb->cb_prevsnap == NULL); + err = zfs_iter_snapshots_sorted(fs_zhp, destroy_print_cb, cb); + if (cb->cb_firstsnap != NULL) { + uint64_t used = 0; + if (err == 0) { + err = zfs_get_snapused_int(cb->cb_firstsnap, + cb->cb_prevsnap, &used); } - zfs_close(szhp); + cb->cb_snapused += used; + zfs_close(cb->cb_firstsnap); + cb->cb_firstsnap = NULL; + zfs_close(cb->cb_prevsnap); + cb->cb_prevsnap = NULL; } + return (err); +} - cbp->cb_closezhp = B_TRUE; - rv = zfs_iter_filesystems(zhp, destroy_snap_clones, arg); - if (closezhp) - zfs_close(zhp); - return (rv); +static int +snapshot_to_nvl_cb(zfs_handle_t *zhp, void *arg) +{ + destroy_cbdata_t *cb = arg; + int err = 0; + + /* Check for clones. */ + if (!cb->cb_doclones) { + cb->cb_target = zhp; + cb->cb_first = B_TRUE; + err = zfs_iter_dependents(zhp, B_TRUE, + destroy_check_dependent, cb); + } + + if (err == 0) { + if (nvlist_add_boolean(cb->cb_nvl, zfs_get_name(zhp))) + nomem(); + } + zfs_close(zhp); + return (err); +} + +static int +gather_snapshots(zfs_handle_t *zhp, void *arg) +{ + destroy_cbdata_t *cb = arg; + int err = 0; + + err = zfs_iter_snapspec(zhp, cb->cb_snapspec, snapshot_to_nvl_cb, cb); + if (err == ENOENT) + err = 0; + if (err != 0) + goto out; + + if (cb->cb_verbose) { + err = destroy_print_snapshots(zhp, cb); + if (err != 0) + goto out; + } + + if (cb->cb_recurse) + err = zfs_iter_filesystems(zhp, gather_snapshots, cb); + +out: + zfs_close(zhp); + return (err); +} + +static int +destroy_clones(destroy_cbdata_t *cb) +{ + nvpair_t *pair; + for (pair = nvlist_next_nvpair(cb->cb_nvl, NULL); + pair != NULL; + pair = nvlist_next_nvpair(cb->cb_nvl, pair)) { + zfs_handle_t *zhp = zfs_open(g_zfs, nvpair_name(pair), + ZFS_TYPE_SNAPSHOT); + if (zhp != NULL) { + boolean_t defer = cb->cb_defer_destroy; + int err; + + /* + * We can't defer destroy non-snapshots, so set it to + * false while destroying the clones. + */ + cb->cb_defer_destroy = B_FALSE; + err = zfs_iter_dependents(zhp, B_FALSE, + destroy_callback, cb); + cb->cb_defer_destroy = defer; + zfs_close(zhp); + if (err != 0) + return (err); + } + } + return (0); } static int @@ -1025,25 +1153,35 @@ zfs_do_destroy(int argc, char **argv) destroy_cbdata_t cb = { 0 }; int c; zfs_handle_t *zhp; - char *cp; + char *at; zfs_type_t type = ZFS_TYPE_DATASET; /* check options */ - while ((c = getopt(argc, argv, "dfrR")) != -1) { + while ((c = getopt(argc, argv, "vpndfrR")) != -1) { switch (c) { + case 'v': + cb.cb_verbose = B_TRUE; + break; + case 'p': + cb.cb_verbose = B_TRUE; + cb.cb_parsable = B_TRUE; + break; + case 'n': + cb.cb_dryrun = B_TRUE; + break; case 'd': cb.cb_defer_destroy = B_TRUE; type = ZFS_TYPE_SNAPSHOT; break; case 'f': - cb.cb_force = 1; + cb.cb_force = B_TRUE; break; case 'r': - cb.cb_recurse = 1; + cb.cb_recurse = B_TRUE; break; case 'R': - cb.cb_recurse = 1; - cb.cb_doclones = 1; + cb.cb_recurse = B_TRUE; + cb.cb_doclones = B_TRUE; break; case '?': default: @@ -1058,7 +1196,7 @@ zfs_do_destroy(int argc, char **argv) /* check number of arguments */ if (argc == 0) { - (void) fprintf(stderr, gettext("missing path argument\n")); + (void) fprintf(stderr, gettext("missing dataset argument\n")); usage(B_FALSE); } if (argc > 1) { @@ -1066,91 +1204,117 @@ zfs_do_destroy(int argc, char **argv) usage(B_FALSE); } - /* - * If we are doing recursive destroy of a snapshot, then the - * named snapshot may not exist. Go straight to libzfs. - */ - if (cb.cb_recurse && (cp = strchr(argv[0], '@'))) { - int ret; + at = strchr(argv[0], '@'); + if (at != NULL) { + int err; - *cp = '\0'; - if ((zhp = zfs_open(g_zfs, argv[0], ZFS_TYPE_DATASET)) == NULL) + /* Build the list of snaps to destroy in cb_nvl. */ + if (nvlist_alloc(&cb.cb_nvl, NV_UNIQUE_NAME, 0) != 0) + nomem(); + + *at = '\0'; + zhp = zfs_open(g_zfs, argv[0], + ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME); + if (zhp == NULL) return (1); - *cp = '@'; - cp++; - if (cb.cb_doclones) { - boolean_t defer = cb.cb_defer_destroy; + cb.cb_snapspec = at + 1; + if (gather_snapshots(zfs_handle_dup(zhp), &cb) != 0 || + cb.cb_error) { + zfs_close(zhp); + nvlist_free(cb.cb_nvl); + return (1); + } - /* - * Temporarily ignore the defer_destroy setting since - * it's not supported for clones. - */ - cb.cb_defer_destroy = B_FALSE; - cb.cb_snapname = cp; - if (destroy_snap_clones(zhp, &cb) != 0) { - zfs_close(zhp); - return (1); + if (nvlist_empty(cb.cb_nvl)) { + (void) fprintf(stderr, gettext("could not find any " + "snapshots to destroy; check snapshot names.\n")); + zfs_close(zhp); + nvlist_free(cb.cb_nvl); + return (1); + } + + if (cb.cb_verbose) { + char buf[16]; + zfs_nicenum(cb.cb_snapused, buf, sizeof (buf)); + if (cb.cb_parsable) { + (void) printf("reclaim\t%llu\n", + cb.cb_snapused); + } else if (cb.cb_dryrun) { + (void) printf(gettext("would reclaim %s\n"), + buf); + } else { + (void) printf(gettext("will reclaim %s\n"), + buf); } - cb.cb_defer_destroy = defer; } - ret = zfs_destroy_snaps(zhp, cp, cb.cb_defer_destroy); - zfs_close(zhp); - if (ret) { - (void) fprintf(stderr, - gettext("no snapshots destroyed\n")); + if (!cb.cb_dryrun) { + if (cb.cb_doclones) + err = destroy_clones(&cb); + if (err == 0) { + err = zfs_destroy_snaps_nvl(zhp, cb.cb_nvl, + cb.cb_defer_destroy); + } } - return (ret != 0); - } - /* Open the given dataset */ - if ((zhp = zfs_open(g_zfs, argv[0], type)) == NULL) - return (1); + zfs_close(zhp); + nvlist_free(cb.cb_nvl); + if (err != 0) + return (1); + } else { + /* Open the given dataset */ + if ((zhp = zfs_open(g_zfs, argv[0], type)) == NULL) + return (1); - cb.cb_target = zhp; + cb.cb_target = zhp; - /* - * Perform an explicit check for pools before going any further. - */ - if (!cb.cb_recurse && strchr(zfs_get_name(zhp), '/') == NULL && - zfs_get_type(zhp) == ZFS_TYPE_FILESYSTEM) { - (void) fprintf(stderr, gettext("cannot destroy '%s': " - "operation does not apply to pools\n"), - zfs_get_name(zhp)); - (void) fprintf(stderr, gettext("use 'zfs destroy -r " - "%s' to destroy all datasets in the pool\n"), - zfs_get_name(zhp)); - (void) fprintf(stderr, gettext("use 'zpool destroy %s' " - "to destroy the pool itself\n"), zfs_get_name(zhp)); - zfs_close(zhp); - return (1); - } + /* + * Perform an explicit check for pools before going any further. + */ + if (!cb.cb_recurse && strchr(zfs_get_name(zhp), '/') == NULL && + zfs_get_type(zhp) == ZFS_TYPE_FILESYSTEM) { + (void) fprintf(stderr, gettext("cannot destroy '%s': " + "operation does not apply to pools\n"), + zfs_get_name(zhp)); + (void) fprintf(stderr, gettext("use 'zfs destroy -r " + "%s' to destroy all datasets in the pool\n"), + zfs_get_name(zhp)); + (void) fprintf(stderr, gettext("use 'zpool destroy %s' " + "to destroy the pool itself\n"), zfs_get_name(zhp)); + zfs_close(zhp); + return (1); + } - /* - * Check for any dependents and/or clones. - */ - cb.cb_first = B_TRUE; - if (!cb.cb_doclones && !cb.cb_defer_destroy && - zfs_iter_dependents(zhp, B_TRUE, destroy_check_dependent, - &cb) != 0) { - zfs_close(zhp); - return (1); - } + /* + * Check for any dependents and/or clones. + */ + cb.cb_first = B_TRUE; + if (!cb.cb_doclones && + zfs_iter_dependents(zhp, B_TRUE, destroy_check_dependent, + &cb) != 0) { + zfs_close(zhp); + return (1); + } - if (cb.cb_error || (!cb.cb_defer_destroy && - (zfs_iter_dependents(zhp, B_FALSE, destroy_callback, &cb) != 0))) { - zfs_close(zhp); - return (1); - } + if (cb.cb_error) { + zfs_close(zhp); + return (1); + } - /* - * Do the real thing. The callback will close the handle regardless of - * whether it succeeds or not. - */ + if (zfs_iter_dependents(zhp, B_FALSE, destroy_callback, + &cb) != 0) { + zfs_close(zhp); + return (1); + } - if (destroy_callback(zhp, &cb) != 0) - return (1); + /* + * Do the real thing. The callback will close the + * handle regardless of whether it succeeds or not. + */ + if (destroy_callback(zhp, &cb) != 0) + return (1); + } return (0); } @@ -1252,6 +1416,17 @@ get_callback(zfs_handle_t *zhp, void *da zprop_print_one_property(zfs_get_name(zhp), cbp, pl->pl_user_prop, buf, sourcetype, source, NULL); + } else if (zfs_prop_written(pl->pl_user_prop)) { + sourcetype = ZPROP_SRC_LOCAL; + + if (zfs_prop_get_written(zhp, pl->pl_user_prop, + buf, sizeof (buf), cbp->cb_literal) != 0) { + sourcetype = ZPROP_SRC_NONE; + (void) strlcpy(buf, "-", sizeof (buf)); + } + + zprop_print_one_property(zfs_get_name(zhp), cbp, + pl->pl_user_prop, buf, sourcetype, source, NULL); } else { if (nvlist_lookup_nvlist(user_props, pl->pl_user_prop, &propval) != 0) { @@ -1796,8 +1971,8 @@ zfs_do_upgrade(int argc, char **argv) "---------------\n"); (void) printf(gettext(" 1 Initial ZFS filesystem version\n")); (void) printf(gettext(" 2 Enhanced directory entries\n")); - (void) printf(gettext(" 3 Case insensitive and File system " - "unique identifier (FUID)\n")); + (void) printf(gettext(" 3 Case insensitive and filesystem " + "user identifier (FUID)\n")); (void) printf(gettext(" 4 userquota, groupquota " "properties\n")); (void) printf(gettext(" 5 System attributes\n")); @@ -2677,6 +2852,13 @@ print_dataset(zfs_handle_t *zhp, zprop_l else propstr = property; right_justify = B_TRUE; + } else if (zfs_prop_written(pl->pl_user_prop)) { + if (zfs_prop_get_written(zhp, pl->pl_user_prop, + property, sizeof (property), B_FALSE) != 0) + propstr = "-"; + else + propstr = property; + right_justify = B_TRUE; } else { if (nvlist_lookup_nvlist(userprops, pl->pl_user_prop, &propval) != 0) @@ -3303,9 +3485,6 @@ usage: } /* - * zfs send [-vDp] -R [-i|-I <@snap>] - * zfs send [-vDp] [-i|-I <@snap>] - * * Send a backup stream to stdout. */ static int @@ -3317,11 +3496,11 @@ zfs_do_send(int argc, char **argv) zfs_handle_t *zhp; sendflags_t flags = { 0 }; int c, err; - nvlist_t *dbgnv; + nvlist_t *dbgnv = NULL; boolean_t extraverbose = B_FALSE; /* check options */ - while ((c = getopt(argc, argv, ":i:I:RDpv")) != -1) { + while ((c = getopt(argc, argv, ":i:I:RDpvnP")) != -1) { switch (c) { case 'i': if (fromname) @@ -3340,6 +3519,10 @@ zfs_do_send(int argc, char **argv) case 'p': flags.props = B_TRUE; break; + case 'P': + flags.parsable = B_TRUE; + flags.verbose = B_TRUE; + break; case 'v': if (flags.verbose) extraverbose = B_TRUE; @@ -3348,6 +3531,9 @@ zfs_do_send(int argc, char **argv) case 'D': flags.dedup = B_TRUE; break; + case 'n': + flags.dryrun = B_TRUE; + break; case ':': (void) fprintf(stderr, gettext("missing argument for " "'%c' option\n"), optopt); @@ -3373,7 +3559,7 @@ zfs_do_send(int argc, char **argv) usage(B_FALSE); } - if (isatty(STDOUT_FILENO)) { + if (!flags.dryrun && isatty(STDOUT_FILENO)) { (void) fprintf(stderr, gettext("Error: Stream can not be written to a terminal.\n" "You must redirect standard output.\n")); @@ -3427,10 +3613,10 @@ zfs_do_send(int argc, char **argv) if (flags.replicate && fromname == NULL) flags.doall = B_TRUE; - err = zfs_send(zhp, fromname, toname, flags, STDOUT_FILENO, NULL, 0, + err = zfs_send(zhp, fromname, toname, &flags, STDOUT_FILENO, NULL, 0, extraverbose ? &dbgnv : NULL); - if (extraverbose) { + if (extraverbose && dbgnv != NULL) { /* * dump_nvlist prints to stdout, but that's been * redirected to a file. Make it print to stderr @@ -3511,7 +3697,7 @@ zfs_do_receive(int argc, char **argv) return (1); } - err = zfs_receive(g_zfs, argv[0], flags, STDIN_FILENO, NULL); + err = zfs_receive(g_zfs, argv[0], &flags, STDIN_FILENO, NULL); return (err != 0); } Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zpool/zpool.8 ============================================================================== --- user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zpool/zpool.8 Fri Dec 2 21:19:14 2011 (r228209) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zpool/zpool.8 Fri Dec 2 21:45:46 2011 (r228210) @@ -23,7 +23,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 26, 2011 +.Dd November 28, 2011 .Dt ZPOOL 8 .Os .Sh NAME @@ -133,6 +133,9 @@ .Op Fl e .Ar pool device ... .Nm +.Cm reguid +.Ar pool +.Nm .Cm remove .Ar pool device ... .Nm @@ -192,7 +195,7 @@ are supported: .Bl -tag .It Sy disk A block device, typically located under -.Pa /dev Ns . +.Pa /dev . .Tn ZFS can use individual slices or partitions, though the recommended mode of operation is to use whole disks. A disk can be specified by a full path to the @@ -218,13 +221,14 @@ bytes and can withstand .Pq Em N-1 devices failing before data integrity is compromised. .It Sy raidz -.No ( or Sy raidz1 raidz2 raidz3 Ns ). +(or +.Sy raidz1 raidz2 raidz3 ) . A variation on *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@FreeBSD.ORG Fri Dec 2 23:21:59 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 705C4106566B; Fri, 2 Dec 2011 23:21:59 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 60E928FC0A; Fri, 2 Dec 2011 23:21:59 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pB2NLxIm013402; Fri, 2 Dec 2011 23:21:59 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pB2NLxIe013400; Fri, 2 Dec 2011 23:21:59 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201112022321.pB2NLxIe013400@svn.freebsd.org> From: Attilio Rao Date: Fri, 2 Dec 2011 23:21:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r228216 - user/attilio/vmcontention/sys/vm X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Dec 2011 23:21:59 -0000 Author: attilio Date: Fri Dec 2 23:21:59 2011 New Revision: 228216 URL: http://svn.freebsd.org/changeset/base/228216 Log: Revert a change that sneaked in during the last MFC. Modified: user/attilio/vmcontention/sys/vm/vm_radix.c Modified: user/attilio/vmcontention/sys/vm/vm_radix.c ============================================================================== --- user/attilio/vmcontention/sys/vm/vm_radix.c Fri Dec 2 22:48:15 2011 (r228215) +++ user/attilio/vmcontention/sys/vm/vm_radix.c Fri Dec 2 23:21:59 2011 (r228216) @@ -55,7 +55,6 @@ #include CTASSERT(sizeof(struct vm_radix_node) < PAGE_SIZE); -CTASSERT((sizeof(u_int) * NBBY) >= VM_RADIX_LIMIT); static uma_zone_t vm_radix_node_zone;