svn commit: r235350 - in user/attilio/vmcontention: . bin/kenv cddl/contrib/opensolaris/cmd/zdb cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/cmd/zstreamdump cddl/contrib/opensolaris/li...

Sat May 12 19:26:16 UTC 2012

Author: attilio
Date: Sat May 12 19:26:15 2012
New Revision: 235350
URL: http://svn.freebsd.org/changeset/base/235350

Log:
  MFC

Added:
  user/attilio/vmcontention/sbin/etherswitchcfg/
     - copied from r235349, head/sbin/etherswitchcfg/
  user/attilio/vmcontention/share/syscons/keymaps/spanish.dvorak.kbd
     - copied unchanged from r235349, head/share/syscons/keymaps/spanish.dvorak.kbd
  user/attilio/vmcontention/sys/arm/at91/board_ethernut5.c
     - copied unchanged from r235349, head/sys/arm/at91/board_ethernut5.c
  user/attilio/vmcontention/sys/arm/at91/std.ethernut5
     - copied unchanged from r235349, head/sys/arm/at91/std.ethernut5
  user/attilio/vmcontention/sys/arm/conf/ETHERNUT5
     - copied unchanged from r235349, head/sys/arm/conf/ETHERNUT5
  user/attilio/vmcontention/sys/arm/conf/ETHERNUT5.hints
     - copied unchanged from r235349, head/sys/arm/conf/ETHERNUT5.hints
  user/attilio/vmcontention/sys/arm/conf/genboardid.awk
     - copied unchanged from r235349, head/sys/arm/conf/genboardid.awk
  user/attilio/vmcontention/sys/arm/conf/mach-types
     - copied unchanged from r235349, head/sys/arm/conf/mach-types
  user/attilio/vmcontention/sys/boot/i386/btx/lib/btxcsu.S
     - copied unchanged from r235349, head/sys/boot/i386/btx/lib/btxcsu.S
  user/attilio/vmcontention/sys/boot/i386/cdboot/cdboot.S
     - copied unchanged from r235349, head/sys/boot/i386/cdboot/cdboot.S
  user/attilio/vmcontention/sys/boot/i386/common/bootargs.h
     - copied unchanged from r235349, head/sys/boot/i386/common/bootargs.h
  user/attilio/vmcontention/sys/boot/pc98/btx/lib/btxcsu.S
     - copied unchanged from r235349, head/sys/boot/pc98/btx/lib/btxcsu.S
  user/attilio/vmcontention/sys/boot/pc98/cdboot/cdboot.S
     - copied unchanged from r235349, head/sys/boot/pc98/cdboot/cdboot.S
  user/attilio/vmcontention/sys/boot/zfs/devicename_stubs.c
     - copied unchanged from r235349, head/sys/boot/zfs/devicename_stubs.c
  user/attilio/vmcontention/sys/boot/zfs/libzfs.h
     - copied unchanged from r235349, head/sys/boot/zfs/libzfs.h
  user/attilio/vmcontention/sys/dev/etherswitch/arswitch/
     - copied from r235349, head/sys/dev/etherswitch/arswitch/
  user/attilio/vmcontention/sys/dev/etherswitch/etherswitch.c
     - copied unchanged from r235349, head/sys/dev/etherswitch/etherswitch.c
  user/attilio/vmcontention/sys/dev/etherswitch/etherswitch.h
     - copied unchanged from r235349, head/sys/dev/etherswitch/etherswitch.h
  user/attilio/vmcontention/sys/dev/etherswitch/etherswitch_if.m
     - copied unchanged from r235349, head/sys/dev/etherswitch/etherswitch_if.m
  user/attilio/vmcontention/sys/dev/etherswitch/rtl8366/
     - copied from r235349, head/sys/dev/etherswitch/rtl8366/
  user/attilio/vmcontention/sys/dev/gxemul/disk/
     - copied from r235349, head/sys/dev/gxemul/disk/
  user/attilio/vmcontention/sys/dev/gxemul/ether/
     - copied from r235349, head/sys/dev/gxemul/ether/
  user/attilio/vmcontention/sys/dev/ral/rt2860.c
     - copied unchanged from r235349, head/sys/dev/ral/rt2860.c
  user/attilio/vmcontention/sys/dev/ral/rt2860reg.h
     - copied unchanged from r235349, head/sys/dev/ral/rt2860reg.h
  user/attilio/vmcontention/sys/dev/ral/rt2860var.h
     - copied unchanged from r235349, head/sys/dev/ral/rt2860var.h
  user/attilio/vmcontention/sys/mips/conf/AP93
     - copied unchanged from r235349, head/sys/mips/conf/AP93
  user/attilio/vmcontention/sys/mips/conf/AP93.hints
     - copied unchanged from r235349, head/sys/mips/conf/AP93.hints
  user/attilio/vmcontention/sys/mips/gxemul/mpreg.h
     - copied unchanged from r235349, head/sys/mips/gxemul/mpreg.h
  user/attilio/vmcontention/tools/build/options/WITH_BSD_SORT
     - copied unchanged from r235349, head/tools/build/options/WITH_BSD_SORT
  user/attilio/vmcontention/tools/test/sort/
     - copied from r235349, head/tools/test/sort/
  user/attilio/vmcontention/usr.bin/sort/
     - copied from r235349, head/usr.bin/sort/
Deleted:
  user/attilio/vmcontention/sys/boot/i386/btx/lib/btxcsu.s
  user/attilio/vmcontention/sys/boot/i386/cdboot/cdboot.s
  user/attilio/vmcontention/sys/boot/pc98/btx/lib/btxcsu.s
  user/attilio/vmcontention/sys/boot/pc98/cdboot/cdboot.s
Modified:
  user/attilio/vmcontention/Makefile.inc1
  user/attilio/vmcontention/ObsoleteFiles.inc
  user/attilio/vmcontention/bin/kenv/kenv.1
  user/attilio/vmcontention/bin/kenv/kenv.c
  user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zdb/zdb.8
  user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zdb/zdb.c
  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/zstreamdump/zstreamdump.1
  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_sendrecv.c
  user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
  user/attilio/vmcontention/contrib/binutils/ld/emultempl/ppc32elf.em
  user/attilio/vmcontention/contrib/bsnmp/snmp_usm/snmp_usm.3
  user/attilio/vmcontention/contrib/bsnmp/snmp_vacm/snmp_vacm.3
  user/attilio/vmcontention/contrib/jemalloc/ChangeLog
  user/attilio/vmcontention/contrib/jemalloc/FREEBSD-Xlist
  user/attilio/vmcontention/contrib/jemalloc/FREEBSD-diffs
  user/attilio/vmcontention/contrib/jemalloc/VERSION
  user/attilio/vmcontention/contrib/jemalloc/doc/jemalloc.3
  user/attilio/vmcontention/contrib/jemalloc/include/jemalloc/internal/arena.h
  user/attilio/vmcontention/contrib/jemalloc/include/jemalloc/internal/atomic.h
  user/attilio/vmcontention/contrib/jemalloc/include/jemalloc/internal/ctl.h
  user/attilio/vmcontention/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal.h
  user/attilio/vmcontention/contrib/jemalloc/include/jemalloc/internal/mutex.h
  user/attilio/vmcontention/contrib/jemalloc/include/jemalloc/internal/private_namespace.h
  user/attilio/vmcontention/contrib/jemalloc/include/jemalloc/internal/prof.h
  user/attilio/vmcontention/contrib/jemalloc/include/jemalloc/internal/tcache.h
  user/attilio/vmcontention/contrib/jemalloc/include/jemalloc/internal/tsd.h
  user/attilio/vmcontention/contrib/jemalloc/include/jemalloc/internal/util.h
  user/attilio/vmcontention/contrib/jemalloc/include/jemalloc/jemalloc.h
  user/attilio/vmcontention/contrib/jemalloc/include/jemalloc/jemalloc_defs.h
  user/attilio/vmcontention/contrib/jemalloc/src/arena.c
  user/attilio/vmcontention/contrib/jemalloc/src/chunk.c
  user/attilio/vmcontention/contrib/jemalloc/src/chunk_mmap.c
  user/attilio/vmcontention/contrib/jemalloc/src/ctl.c
  user/attilio/vmcontention/contrib/jemalloc/src/huge.c
  user/attilio/vmcontention/contrib/jemalloc/src/jemalloc.c
  user/attilio/vmcontention/contrib/jemalloc/src/mutex.c
  user/attilio/vmcontention/contrib/jemalloc/src/prof.c
  user/attilio/vmcontention/contrib/jemalloc/src/quarantine.c
  user/attilio/vmcontention/contrib/jemalloc/src/stats.c
  user/attilio/vmcontention/contrib/jemalloc/src/tcache.c
  user/attilio/vmcontention/contrib/jemalloc/src/tsd.c
  user/attilio/vmcontention/contrib/jemalloc/src/util.c
  user/attilio/vmcontention/etc/defaults/rc.conf
  user/attilio/vmcontention/etc/mtree/BSD.usr.dist
  user/attilio/vmcontention/etc/periodic/daily/420.status-network
  user/attilio/vmcontention/etc/rc.d/kfd
  user/attilio/vmcontention/games/fortune/datfiles/freebsd-tips
  user/attilio/vmcontention/gnu/usr.bin/binutils/addr2line/addr2line.1
  user/attilio/vmcontention/gnu/usr.bin/binutils/ranlib/ranlib.1
  user/attilio/vmcontention/gnu/usr.bin/binutils/size/size.1
  user/attilio/vmcontention/gnu/usr.bin/binutils/strip/strip.1
  user/attilio/vmcontention/gnu/usr.bin/gdb/gdb/gdb.1
  user/attilio/vmcontention/gnu/usr.bin/sort/Makefile
  user/attilio/vmcontention/lib/libbluetooth/bluetooth.3
  user/attilio/vmcontention/lib/libc/compat-43/sigpause.2
  user/attilio/vmcontention/lib/libc/gmon/moncontrol.3
  user/attilio/vmcontention/lib/libc/locale/duplocale.3
  user/attilio/vmcontention/lib/libc/locale/freelocale.3
  user/attilio/vmcontention/lib/libc/locale/newlocale.3
  user/attilio/vmcontention/lib/libc/locale/querylocale.3
  user/attilio/vmcontention/lib/libc/locale/toupper.c
  user/attilio/vmcontention/lib/libc/locale/uselocale.3
  user/attilio/vmcontention/lib/libc/locale/xlocale.3
  user/attilio/vmcontention/lib/libc/net/sctp_connectx.3
  user/attilio/vmcontention/lib/libc/net/sctp_recvmsg.3
  user/attilio/vmcontention/lib/libc/net/sourcefilter.3
  user/attilio/vmcontention/lib/libc/posix1e/acl_delete_entry.3
  user/attilio/vmcontention/lib/libc/rpc/auth_unix.c
  user/attilio/vmcontention/lib/libc/rpc/publickey.3
  user/attilio/vmcontention/lib/libc/stdio/fgets.3
  user/attilio/vmcontention/lib/libc/stdlib/getenv.3
  user/attilio/vmcontention/lib/libc/stdlib/realpath.3
  user/attilio/vmcontention/lib/libc/stdlib/realpath.c
  user/attilio/vmcontention/lib/libc/stdlib/strfmon.3
  user/attilio/vmcontention/lib/libc/string/strlcpy.3
  user/attilio/vmcontention/lib/libc/sys/ffclock.2
  user/attilio/vmcontention/lib/libc/sys/ktrace.2
  user/attilio/vmcontention/lib/libc/sys/msgsnd.2
  user/attilio/vmcontention/lib/libc/sys/pathconf.2
  user/attilio/vmcontention/lib/libc/sys/rtprio.2
  user/attilio/vmcontention/lib/libc/sys/setfib.2
  user/attilio/vmcontention/lib/libc/sys/shm_open.2
  user/attilio/vmcontention/lib/libc/sys/sigqueue.2
  user/attilio/vmcontention/lib/libc/sys/timer_create.2
  user/attilio/vmcontention/lib/libc/sys/timer_delete.2
  user/attilio/vmcontention/lib/libc/sys/timer_settime.2
  user/attilio/vmcontention/lib/libc/sys/unlink.2
  user/attilio/vmcontention/lib/libelf/elf_getdata.3
  user/attilio/vmcontention/lib/libelf/elf_strptr.3
  user/attilio/vmcontention/lib/libelf/gelf_getphdr.3
  user/attilio/vmcontention/lib/libelf/gelf_newehdr.3
  user/attilio/vmcontention/lib/libgpib/gpib.3
  user/attilio/vmcontention/lib/libjail/jail.c
  user/attilio/vmcontention/lib/libkvm/kvm_getpcpu.3
  user/attilio/vmcontention/lib/libprocstat/libprocstat.3
  user/attilio/vmcontention/lib/libradius/libradius.3
  user/attilio/vmcontention/lib/libtacplus/libtacplus.3
  user/attilio/vmcontention/lib/libthr/thread/thr_sleepq.c
  user/attilio/vmcontention/lib/libusb/Makefile
  user/attilio/vmcontention/lib/libusb/libusb.3
  user/attilio/vmcontention/lib/libusb/libusb.h
  user/attilio/vmcontention/lib/libusb/libusb10_desc.c
  user/attilio/vmcontention/lib/libusb/libusb20.3
  user/attilio/vmcontention/lib/libutil/login.conf.5
  user/attilio/vmcontention/lib/msun/man/cexp.3
  user/attilio/vmcontention/lib/msun/man/complex.3
  user/attilio/vmcontention/sbin/Makefile
  user/attilio/vmcontention/sbin/geom/class/eli/geli.8
  user/attilio/vmcontention/sbin/geom/class/raid/graid.8
  user/attilio/vmcontention/sbin/growfs/growfs.8
  user/attilio/vmcontention/sbin/growfs/growfs.c
  user/attilio/vmcontention/sbin/hastd/hast.conf.5
  user/attilio/vmcontention/sbin/ifconfig/af_nd6.c
  user/attilio/vmcontention/sbin/ipfw/ipfw.8
  user/attilio/vmcontention/sbin/iscontrol/iscsi.conf.5
  user/attilio/vmcontention/sbin/md5/md5.1
  user/attilio/vmcontention/sbin/md5/md5.c
  user/attilio/vmcontention/sbin/mdconfig/mdconfig.8
  user/attilio/vmcontention/share/man/man3/ATOMIC_VAR_INIT.3
  user/attilio/vmcontention/share/man/man3/pthread.3
  user/attilio/vmcontention/share/man/man3/pthread_condattr.3
  user/attilio/vmcontention/share/man/man4/acpi_hp.4
  user/attilio/vmcontention/share/man/man4/acpi_wmi.4
  user/attilio/vmcontention/share/man/man4/ahci.4
  user/attilio/vmcontention/share/man/man4/ath.4
  user/attilio/vmcontention/share/man/man4/atp.4
  user/attilio/vmcontention/share/man/man4/bpf.4
  user/attilio/vmcontention/share/man/man4/bridge.4
  user/attilio/vmcontention/share/man/man4/capsicum.4
  user/attilio/vmcontention/share/man/man4/ch.4
  user/attilio/vmcontention/share/man/man4/cpuctl.4
  user/attilio/vmcontention/share/man/man4/cxgbe.4
  user/attilio/vmcontention/share/man/man4/dcons.4
  user/attilio/vmcontention/share/man/man4/ddb.4
  user/attilio/vmcontention/share/man/man4/epair.4
  user/attilio/vmcontention/share/man/man4/fdt.4
  user/attilio/vmcontention/share/man/man4/fdtbus.4
  user/attilio/vmcontention/share/man/man4/firewire.4
  user/attilio/vmcontention/share/man/man4/gdb.4
  user/attilio/vmcontention/share/man/man4/igb.4
  user/attilio/vmcontention/share/man/man4/ip.4
  user/attilio/vmcontention/share/man/man4/ipmi.4
  user/attilio/vmcontention/share/man/man4/ipw.4
  user/attilio/vmcontention/share/man/man4/isci.4
  user/attilio/vmcontention/share/man/man4/isp.4
  user/attilio/vmcontention/share/man/man4/iwn.4
  user/attilio/vmcontention/share/man/man4/mac_none.4
  user/attilio/vmcontention/share/man/man4/mac_stub.4
  user/attilio/vmcontention/share/man/man4/mk48txx.4
  user/attilio/vmcontention/share/man/man4/mps.4
  user/attilio/vmcontention/share/man/man4/mwl.4
  user/attilio/vmcontention/share/man/man4/net80211.4
  user/attilio/vmcontention/share/man/man4/netmap.4
  user/attilio/vmcontention/share/man/man4/ng_etf.4
  user/attilio/vmcontention/share/man/man4/ng_nat.4
  user/attilio/vmcontention/share/man/man4/ng_netflow.4
  user/attilio/vmcontention/share/man/man4/ng_patch.4
  user/attilio/vmcontention/share/man/man4/ng_socket.4
  user/attilio/vmcontention/share/man/man4/pcm.4
  user/attilio/vmcontention/share/man/man4/pcn.4
  user/attilio/vmcontention/share/man/man4/psm.4
  user/attilio/vmcontention/share/man/man4/ral.4
  user/attilio/vmcontention/share/man/man4/rl.4
  user/attilio/vmcontention/share/man/man4/run.4
  user/attilio/vmcontention/share/man/man4/ses.4
  user/attilio/vmcontention/share/man/man4/siftr.4
  user/attilio/vmcontention/share/man/man4/simplebus.4
  user/attilio/vmcontention/share/man/man4/sis.4
  user/attilio/vmcontention/share/man/man4/sk.4
  user/attilio/vmcontention/share/man/man4/snd_hda.4
  user/attilio/vmcontention/share/man/man4/snd_hdspe.4
  user/attilio/vmcontention/share/man/man4/splash.4
  user/attilio/vmcontention/share/man/man4/ste.4
  user/attilio/vmcontention/share/man/man4/termios.4
  user/attilio/vmcontention/share/man/man4/ti.4
  user/attilio/vmcontention/share/man/man4/tl.4
  user/attilio/vmcontention/share/man/man4/tws.4
  user/attilio/vmcontention/share/man/man4/uhso.4
  user/attilio/vmcontention/share/man/man4/ulpt.4
  user/attilio/vmcontention/share/man/man4/umcs.4
  user/attilio/vmcontention/share/man/man4/uslcom.4
  user/attilio/vmcontention/share/man/man4/vge.4
  user/attilio/vmcontention/share/man/man4/vr.4
  user/attilio/vmcontention/share/man/man4/watchdog.4
  user/attilio/vmcontention/share/man/man4/wb.4
  user/attilio/vmcontention/share/man/man4/wpi.4
  user/attilio/vmcontention/share/man/man4/xl.4
  user/attilio/vmcontention/share/man/man4/xnb.4
  user/attilio/vmcontention/share/man/man5/device.hints.5
  user/attilio/vmcontention/share/man/man5/make.conf.5
  user/attilio/vmcontention/share/man/man5/nsmb.conf.5
  user/attilio/vmcontention/share/man/man5/portsnap.conf.5
  user/attilio/vmcontention/share/man/man5/rc.conf.5
  user/attilio/vmcontention/share/man/man5/src.conf.5
  user/attilio/vmcontention/share/man/man7/tuning.7
  user/attilio/vmcontention/share/man/man9/VOP_GETACL.9
  user/attilio/vmcontention/share/man/man9/VOP_GETEXTATTR.9
  user/attilio/vmcontention/share/man/man9/VOP_SETACL.9
  user/attilio/vmcontention/share/man/man9/VOP_SETEXTATTR.9
  user/attilio/vmcontention/share/man/man9/locking.9
  user/attilio/vmcontention/share/man/man9/store.9
  user/attilio/vmcontention/share/misc/bsd-family-tree
  user/attilio/vmcontention/share/mk/bsd.README
  user/attilio/vmcontention/share/mk/bsd.lib.mk
  user/attilio/vmcontention/share/mk/bsd.own.mk
  user/attilio/vmcontention/share/syscons/keymaps/Makefile
  user/attilio/vmcontention/share/termcap/termcap.5
  user/attilio/vmcontention/sys/amd64/conf/GENERIC
  user/attilio/vmcontention/sys/arm/arm/locore.S
  user/attilio/vmcontention/sys/arm/at91/at91_pioreg.h
  user/attilio/vmcontention/sys/arm/at91/files.at91sam9
  user/attilio/vmcontention/sys/arm/include/param.h
  user/attilio/vmcontention/sys/arm/xscale/ixp425/std.ixp425
  user/attilio/vmcontention/sys/arm/xscale/ixp425/std.ixp435
  user/attilio/vmcontention/sys/boot/arm/at91/boot2/boot2.c
  user/attilio/vmcontention/sys/boot/arm/at91/libat91/at91rm9200.h
  user/attilio/vmcontention/sys/boot/common/boot.c
  user/attilio/vmcontention/sys/boot/common/bootstrap.h
  user/attilio/vmcontention/sys/boot/fdt/fdt_loader_cmd.c
  user/attilio/vmcontention/sys/boot/i386/btx/btx/Makefile
  user/attilio/vmcontention/sys/boot/i386/btx/btx/btx.S
  user/attilio/vmcontention/sys/boot/i386/btx/btxldr/Makefile
  user/attilio/vmcontention/sys/boot/i386/btx/btxldr/btxldr.S
  user/attilio/vmcontention/sys/boot/i386/btx/lib/Makefile
  user/attilio/vmcontention/sys/boot/i386/cdboot/Makefile
  user/attilio/vmcontention/sys/boot/i386/efi/reloc.c
  user/attilio/vmcontention/sys/boot/i386/libi386/Makefile
  user/attilio/vmcontention/sys/boot/i386/libi386/biosdisk.c
  user/attilio/vmcontention/sys/boot/i386/libi386/devicename.c
  user/attilio/vmcontention/sys/boot/i386/libi386/libi386.h
  user/attilio/vmcontention/sys/boot/i386/loader/Makefile
  user/attilio/vmcontention/sys/boot/i386/loader/conf.c
  user/attilio/vmcontention/sys/boot/i386/loader/main.c
  user/attilio/vmcontention/sys/boot/i386/pxeldr/Makefile
  user/attilio/vmcontention/sys/boot/i386/pxeldr/pxeldr.S
  user/attilio/vmcontention/sys/boot/i386/zfsboot/zfsboot.c
  user/attilio/vmcontention/sys/boot/pc98/btx/btx/Makefile
  user/attilio/vmcontention/sys/boot/pc98/btx/btx/btx.S
  user/attilio/vmcontention/sys/boot/pc98/btx/btxldr/Makefile
  user/attilio/vmcontention/sys/boot/pc98/btx/btxldr/btxldr.S
  user/attilio/vmcontention/sys/boot/pc98/btx/lib/Makefile
  user/attilio/vmcontention/sys/boot/pc98/cdboot/Makefile
  user/attilio/vmcontention/sys/boot/pc98/libpc98/biosdisk.c
  user/attilio/vmcontention/sys/boot/pc98/loader/main.c
  user/attilio/vmcontention/sys/boot/sparc64/boot1/Makefile
  user/attilio/vmcontention/sys/boot/sparc64/loader/main.c
  user/attilio/vmcontention/sys/boot/sparc64/zfsboot/Makefile
  user/attilio/vmcontention/sys/boot/uboot/common/metadata.c
  user/attilio/vmcontention/sys/boot/zfs/zfs.c
  user/attilio/vmcontention/sys/boot/zfs/zfsimpl.c
  user/attilio/vmcontention/sys/cam/cam_sim.h
  user/attilio/vmcontention/sys/cam/cam_xpt.c
  user/attilio/vmcontention/sys/cam/cam_xpt_sim.h
  user/attilio/vmcontention/sys/cddl/boot/zfs/zfsimpl.h
  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/sys/dmu.h
  user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.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/zfs_ioctl.c
  user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h
  user/attilio/vmcontention/sys/conf/files
  user/attilio/vmcontention/sys/conf/files.arm
  user/attilio/vmcontention/sys/dev/ahci/ahci.c
  user/attilio/vmcontention/sys/dev/ata/ata-all.c
  user/attilio/vmcontention/sys/dev/ath/ath_hal/ar5210/ar5210.h
  user/attilio/vmcontention/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c
  user/attilio/vmcontention/sys/dev/ath/ath_hal/ar5210/ar5210_misc.c
  user/attilio/vmcontention/sys/dev/ath/ath_hal/ar5211/ar5211.h
  user/attilio/vmcontention/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c
  user/attilio/vmcontention/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c
  user/attilio/vmcontention/sys/dev/ath/if_ath.c
  user/attilio/vmcontention/sys/dev/bce/if_bce.c
  user/attilio/vmcontention/sys/dev/bce/if_bcereg.h
  user/attilio/vmcontention/sys/dev/bwi/bwimac.c
  user/attilio/vmcontention/sys/dev/bwi/bwiphy.c
  user/attilio/vmcontention/sys/dev/bwi/bwirf.c
  user/attilio/vmcontention/sys/dev/bwi/if_bwi.c
  user/attilio/vmcontention/sys/dev/bwi/if_bwi_pci.c
  user/attilio/vmcontention/sys/dev/dc/if_dc.c
  user/attilio/vmcontention/sys/dev/e1000/if_em.c
  user/attilio/vmcontention/sys/dev/e1000/if_igb.c
  user/attilio/vmcontention/sys/dev/fxp/if_fxp.c
  user/attilio/vmcontention/sys/dev/hwpmc/hwpmc_intel.c
  user/attilio/vmcontention/sys/dev/mfi/mfi_cam.c
  user/attilio/vmcontention/sys/dev/mfi/mfivar.h
  user/attilio/vmcontention/sys/dev/mvs/mvs.c
  user/attilio/vmcontention/sys/dev/ral/if_ral_pci.c
  user/attilio/vmcontention/sys/dev/re/if_re.c
  user/attilio/vmcontention/sys/dev/sf/if_sf.c
  user/attilio/vmcontention/sys/dev/siis/siis.c
  user/attilio/vmcontention/sys/dev/tsec/if_tsec.c
  user/attilio/vmcontention/sys/dev/usb/net/if_rue.c
  user/attilio/vmcontention/sys/dev/vr/if_vr.c
  user/attilio/vmcontention/sys/dev/vr/if_vrreg.h
  user/attilio/vmcontention/sys/dev/xl/if_xl.c
  user/attilio/vmcontention/sys/fs/ext2fs/ext2_vfsops.c
  user/attilio/vmcontention/sys/fs/nfsclient/nfs_clbio.c
  user/attilio/vmcontention/sys/fs/nfsclient/nfs_clnode.c
  user/attilio/vmcontention/sys/fs/nfsclient/nfs_clvnops.c
  user/attilio/vmcontention/sys/fs/nfsclient/nfsnode.h
  user/attilio/vmcontention/sys/fs/nfsserver/nfs_nfsdport.c
  user/attilio/vmcontention/sys/geom/eli/g_eli_integrity.c
  user/attilio/vmcontention/sys/geom/multipath/g_multipath.c
  user/attilio/vmcontention/sys/geom/raid/g_raid.c
  user/attilio/vmcontention/sys/geom/raid/g_raid.h
  user/attilio/vmcontention/sys/geom/raid/md_ddf.c
  user/attilio/vmcontention/sys/geom/raid/md_promise.c
  user/attilio/vmcontention/sys/geom/raid/tr_raid1.c
  user/attilio/vmcontention/sys/geom/raid/tr_raid1e.c
  user/attilio/vmcontention/sys/geom/raid/tr_raid5.c
  user/attilio/vmcontention/sys/i386/conf/GENERIC
  user/attilio/vmcontention/sys/mips/conf/AP96
  user/attilio/vmcontention/sys/mips/conf/AP96.hints
  user/attilio/vmcontention/sys/mips/conf/GXEMUL
  user/attilio/vmcontention/sys/mips/conf/TP-WN1043ND
  user/attilio/vmcontention/sys/mips/conf/TP-WN1043ND.hints
  user/attilio/vmcontention/sys/mips/gxemul/files.gxemul
  user/attilio/vmcontention/sys/mips/gxemul/gxemul_machdep.c
  user/attilio/vmcontention/sys/modules/linux/Makefile
  user/attilio/vmcontention/sys/modules/ral/Makefile
  user/attilio/vmcontention/sys/netinet/libalias/libalias.3
  user/attilio/vmcontention/sys/netinet/sctp.h
  user/attilio/vmcontention/sys/netinet/sctp_constants.h
  user/attilio/vmcontention/sys/netinet/sctp_input.c
  user/attilio/vmcontention/sys/netinet/sctp_pcb.c
  user/attilio/vmcontention/sys/netinet/sctp_uio.h
  user/attilio/vmcontention/sys/netinet/sctp_usrreq.c
  user/attilio/vmcontention/sys/netinet/sctputil.c
  user/attilio/vmcontention/sys/nfsclient/nfs_bio.c
  user/attilio/vmcontention/sys/nfsclient/nfs_node.c
  user/attilio/vmcontention/sys/nfsclient/nfs_subs.c
  user/attilio/vmcontention/sys/nfsclient/nfs_vnops.c
  user/attilio/vmcontention/sys/nfsclient/nfsnode.h
  user/attilio/vmcontention/sys/sparc64/include/intr_machdep.h
  user/attilio/vmcontention/sys/sparc64/sparc64/intr_machdep.c
  user/attilio/vmcontention/sys/sys/elf_common.h
  user/attilio/vmcontention/sys/vm/vm_fault.c
  user/attilio/vmcontention/sys/vm/vm_map.c
  user/attilio/vmcontention/sys/vm/vm_map.h
  user/attilio/vmcontention/tools/build/mk/OptionalObsoleteFiles.inc
  user/attilio/vmcontention/tools/build/options/WITHOUT_BINUTILS
  user/attilio/vmcontention/tools/build/options/WITHOUT_ZONEINFO
  user/attilio/vmcontention/tools/build/options/WITH_CLANG_IS_CC
  user/attilio/vmcontention/tools/build/options/WITH_SHARED_TOOLCHAIN
  user/attilio/vmcontention/tools/tools/zfsboottest/zfsboottest.sh
  user/attilio/vmcontention/usr.bin/Makefile
  user/attilio/vmcontention/usr.bin/calendar/calendar.1
  user/attilio/vmcontention/usr.bin/clang/clang/clang.1
  user/attilio/vmcontention/usr.bin/clang/tblgen/tblgen.1
  user/attilio/vmcontention/usr.bin/csup/csup.1
  user/attilio/vmcontention/usr.bin/fetch/fetch.1
  user/attilio/vmcontention/usr.bin/gprof/gprof.1
  user/attilio/vmcontention/usr.bin/ipcrm/ipcrm.1
  user/attilio/vmcontention/usr.bin/join/join.1
  user/attilio/vmcontention/usr.bin/limits/limits.1
  user/attilio/vmcontention/usr.bin/make/Makefile
  user/attilio/vmcontention/usr.bin/ncplogin/ncplogout.1
  user/attilio/vmcontention/usr.bin/stdbuf/stdbuf.c
  user/attilio/vmcontention/usr.bin/tftp/tftp.1
  user/attilio/vmcontention/usr.bin/unzip/unzip.1
  user/attilio/vmcontention/usr.bin/who/who.1
  user/attilio/vmcontention/usr.bin/whois/whois.1
  user/attilio/vmcontention/usr.sbin/bsdinstall/scripts/mirrorselect
  user/attilio/vmcontention/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3
  user/attilio/vmcontention/usr.sbin/bsnmpd/modules/snmp_wlan/snmp_wlan.3
  user/attilio/vmcontention/usr.sbin/jail/jail.8
  user/attilio/vmcontention/usr.sbin/jail/jail.conf.5
  user/attilio/vmcontention/usr.sbin/nfsd/nfsv4.4
  user/attilio/vmcontention/usr.sbin/ntp/doc/ntp.conf.5
  user/attilio/vmcontention/usr.sbin/pkg_install/lib/plist.c
  user/attilio/vmcontention/usr.sbin/pkg_install/updating/pkg_updating.1
  user/attilio/vmcontention/usr.sbin/portsnap/portsnap/portsnap.sh
  user/attilio/vmcontention/usr.sbin/rtprio/rtprio.c
  user/attilio/vmcontention/usr.sbin/traceroute6/traceroute6.c
  user/attilio/vmcontention/usr.sbin/wpa/hostapd/hostapd.conf.5
  user/attilio/vmcontention/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5
Directory Properties:
  user/attilio/vmcontention/   (props changed)
  user/attilio/vmcontention/cddl/contrib/opensolaris/   (props changed)
  user/attilio/vmcontention/contrib/binutils/   (props changed)
  user/attilio/vmcontention/gnu/usr.bin/binutils/   (props changed)
  user/attilio/vmcontention/gnu/usr.bin/gdb/   (props changed)
  user/attilio/vmcontention/lib/libc/   (props changed)
  user/attilio/vmcontention/lib/libutil/   (props changed)
  user/attilio/vmcontention/sbin/   (props changed)
  user/attilio/vmcontention/sbin/ipfw/   (props changed)
  user/attilio/vmcontention/share/man/man4/   (props changed)
  user/attilio/vmcontention/sys/   (props changed)
  user/attilio/vmcontention/sys/boot/   (props changed)
  user/attilio/vmcontention/sys/boot/i386/efi/   (props changed)
  user/attilio/vmcontention/sys/cddl/contrib/opensolaris/   (props changed)
  user/attilio/vmcontention/sys/conf/   (props changed)
  user/attilio/vmcontention/usr.bin/calendar/   (props changed)
  user/attilio/vmcontention/usr.bin/csup/   (props changed)
  user/attilio/vmcontention/usr.sbin/jail/   (props changed)

Modified: user/attilio/vmcontention/Makefile.inc1
==============================================================================

--- user/attilio/vmcontention/Makefile.inc1	Sat May 12 19:22:57 2012	(r235349)
+++ user/attilio/vmcontention/Makefile.inc1	Sat May 12 19:26:15 2012	(r235350)
@@ -223,9 +223,6 @@ CROSSENV=	MAKEOBJDIRPREFIX=${OBJTREE} \
 		MACHINE_ARCH=${TARGET_ARCH} \
 		MACHINE=${TARGET} \
 		CPUTYPE=${TARGET_CPUTYPE}
-.if ${OSRELDATE} < 700044
-CROSSENV+=	AR=gnu-ar RANLIB=gnu-ranlib
-.endif
 .if ${MK_GROFF} != "no"
 CROSSENV+=	GROFF_BIN_PATH=${WORLDTMP}/legacy/usr/bin \
 		GROFF_FONT_PATH=${WORLDTMP}/legacy/usr/share/groff_font \
@@ -265,6 +262,7 @@ XMAKE=		TOOLS_PREFIX=${WORLDTMP} ${BMAKE
 # world stage
 WMAKEENV=	${CROSSENV} \
 		_SHLIBDIRPREFIX=${WORLDTMP} \
+		_LDSCRIPTROOT= \
 		VERSION="${VERSION}" \
 		INSTALL="sh ${.CURDIR}/tools/install.sh" \
 		PATH=${TMPPATH}
@@ -307,6 +305,7 @@ LIB32FLAGS=	-m32 ${LIB32CPUFLAGS} -DCOMP
 # Yes, the flags are redundant.
 LIB32WMAKEENV+=	MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \
 		_SHLIBDIRPREFIX=${LIB32TMP} \
+		_LDSCRIPTROOT=${LIB32TMP} \
 		VERSION="${VERSION}" \
 		INSTALL="sh ${.CURDIR}/tools/install.sh" \
 		PATH=${TMPPATH} \
@@ -319,11 +318,11 @@ LIB32WMAKE=	${LIB32WMAKEENV} ${MAKE} -DN
 		-DWITHOUT_BIND -DWITHOUT_MAN -DWITHOUT_INFO \
 		-DWITHOUT_HTML -DNO_CTF -DNO_LINT -ECC -ECXX -EAS -ELD \
 		DESTDIR=${LIB32TMP}
-LIB32IMAKE=	${LIB32WMAKE:NINSTALL=*:NDESTDIR=*} -DNO_INCS
+LIB32IMAKE=	${LIB32WMAKE:NINSTALL=*:NDESTDIR=*:N_LDSCRIPTROOT=*} -DNO_INCS
 .endif
 
 # install stage
-IMAKEENV=	${CROSSENV}
+IMAKEENV=	${CROSSENV:N_LDSCRIPTROOT=*}
 IMAKE=		${IMAKEENV} ${MAKE} -f Makefile.inc1
 .if empty(.MAKEFLAGS:M-n)
 IMAKEENV+=	PATH=${STRICTTMPPATH}:${INSTALLTMP} \
@@ -979,8 +978,8 @@ update:
 # legacy: Build compatibility shims for the next three targets
 #
 legacy:
-.if ${BOOTSTRAPPING} < 600034 && ${BOOTSTRAPPING} != 0
-	@echo "ERROR: Source upgrades from versions prior to 6.0 not supported."; \
+.if ${BOOTSTRAPPING} < 800107 && ${BOOTSTRAPPING} != 0
+	@echo "ERROR: Source upgrades from versions prior to 8.0 not supported."; \
 	false
 .endif
 .for _tool in tools/build
@@ -1008,14 +1007,6 @@ _gperf=		gnu/usr.bin/gperf
 _groff=		gnu/usr.bin/groff
 .endif
 
-.if ${BOOTSTRAPPING} >= 700044 && ${BOOTSTRAPPING} < 800022
-_ar=		usr.bin/ar
-.endif
-
-.if ${BOOTSTRAPPING} < 800013
-_mklocale=	usr.bin/mklocale
-.endif
-
 .if ${BOOTSTRAPPING} < 900002
 _sed=		usr.bin/sed
 .endif
@@ -1029,16 +1020,10 @@ _yacc=		usr.bin/yacc
 _awk=		usr.bin/awk
 .endif
 
-.if ${MK_BSNMP} != "no" && \
-    (${BOOTSTRAPPING} < 700018 || !exists(/usr/sbin/gensnmptree))
+.if ${MK_BSNMP} != "no" &&  !exists(/usr/sbin/gensnmptree)
 _gensnmptree=	usr.sbin/bsnmpd/gensnmptree
 .endif
 
-.if ${MK_RESCUE} != "no" && \
-    ${BOOTSTRAPPING} < 700026
-_crunchgen=	usr.sbin/crunch/crunchgen
-.endif
-
 .if ${MK_CLANG} != "no"
 _clang_tblgen= \
 	lib/clang/libllvmsupport \
@@ -1049,9 +1034,7 @@ _clang_tblgen= \
 
 # dtrace tools are required for older bootstrap env and cross-build
 .if ${MK_CDDL} != "no" && \
-    ((${BOOTSTRAPPING} < 800038 && \
-          !(${BOOTSTRAPPING} >= 700112 && ${BOOTSTRAPPING} < 799999)) \
-      || (${MACHINE} != ${TARGET} || ${MACHINE_ARCH} != ${TARGET_ARCH}))
+    (${MACHINE} != ${TARGET} || ${MACHINE_ARCH} != ${TARGET_ARCH})
 _dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf lib/libelf \
     lib/libdwarf cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge
 .endif
@@ -1080,20 +1063,17 @@ bootstrap-tools:
     ${_strfile} \
     ${_gperf} \
     ${_groff} \
-    ${_ar} \
     ${_dtc} \
     ${_awk} \
     usr.bin/lorder \
     usr.bin/makewhatis \
-    ${_mklocale} \
     usr.bin/rpcgen \
     ${_sed} \
     ${_lex} \
     ${_yacc} \
     usr.bin/xinstall \
     ${_gensnmptree} \
-    usr.sbin/config \
-    ${_crunchgen}
+    usr.sbin/config
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
 		cd ${.CURDIR}/${_tool}; \
 		${MAKE} DIRPRFX=${_tool}/ obj; \
@@ -1152,7 +1132,7 @@ build-tools:
 #
 # cross-tools: Build cross-building tools
 #
-.if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 800035
+.if ${TARGET_ARCH} != ${MACHINE_ARCH}
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
 _btxld=		usr.sbin/btxld
 .endif

Modified: user/attilio/vmcontention/ObsoleteFiles.inc
==============================================================================
--- user/attilio/vmcontention/ObsoleteFiles.inc	Sat May 12 19:22:57 2012	(r235349)
+++ user/attilio/vmcontention/ObsoleteFiles.inc	Sat May 12 19:26:15 2012	(r235350)
@@ -40,9 +40,20 @@
 
 # 20120505: new clang import installed a redundant internal header
 OLD_FILES+=usr/include/clang/3.1/stdalign.h
+# 20120428: MD2 removed from libmd
+OLD_FILES+=usr/include/md2.h
+OLD_FILES+=usr/share/man/man3/MD2Data.3.gz
+OLD_FILES+=usr/share/man/man3/MD2End.3.gz
+OLD_FILES+=usr/share/man/man3/MD2File.3.gz
+OLD_FILES+=usr/share/man/man3/MD2FileChunk.3.gz
+OLD_FILES+=usr/share/man/man3/MD2Final.3.gz
+OLD_FILES+=usr/share/man/man3/MD2Init.3.gz
+OLD_FILES+=usr/share/man/man3/MD2Update.3.gz
+OLD_FILES+=usr/share/man/man3/md2.3.gz
 # 20120425: libusb version bump (r234684)
 OLD_LIBS+=usr/lib/libusb.so.2
 OLD_LIBS+=usr/lib32/libusb.so.2
+OLD_FILES+=usr/share/man/man3/libsub_get_active_config_descriptor.3.gz
 # 20120415: new clang import which bumps version from 3.0 to 3.1
 OLD_FILES+=usr/include/clang/3.0/altivec.h
 OLD_FILES+=usr/include/clang/3.0/avxintrin.h
@@ -59,6 +70,17 @@ OLD_FILES+=usr/include/clang/3.0/wmmintr
 OLD_FILES+=usr/include/clang/3.0/x86intrin.h
 OLD_FILES+=usr/include/clang/3.0/xmmintrin.h
 OLD_DIRS+=usr/include/clang/3.0
+# 20120412: BIND 9.8.1 release notes removed
+OLD_FILES+=usr/share/doc/bind9/RELEASE-NOTES-BIND-9.8.1.pdf
+OLD_FILES+=usr/share/doc/bind9/RELEASE-NOTES-BIND-9.8.1.txt
+OLD_FILES+=usr/share/doc/bind9/RELEASE-NOTES-BIND-9.8.1.html
+OLD_FILES+=usr/share/doc/bind9/release-notes.css
+# 20120330: legacy(4) moved to x86
+OLD_FILES+=usr/include/machine/legacyvar.h
+# 20120324: MPI headers updated
+OLD_FILES+=usr/include/dev/mpt/mpilib/mpi_inb.h
+# 20120322: hwpmc_mips24k.h removed
+OLD_FILES+=usr/include/dev/hwpmc/hwpmc_mips24k.h
 # 20120322: Update heimdal to 1.5.1.
 OLD_FILES+=usr/include/krb5-v4compat.h \
 	usr/include/krb_err.h \
@@ -103,6 +125,8 @@ OLD_LIBS+=usr/lib/libasn1.so.10 \
 # 20120309: Remove fifofs header files.
 OLD_FILES+=usr/include/fs/fifofs/fifo.h
 OLD_DIRS+=usr/include/fs/fifofs
+# 20120304: xlocale cleanup
+OLD_FILES+=usr/include/_xlocale_ctype.h
 # 20120225: libarchive 3.0.3
 OLD_FILES+=usr/share/man/man3/archive_read_data_into_buffer.3.gz \
 	usr/share/man/man3/archive_read_support_compression_all.3.gz \

Modified: user/attilio/vmcontention/bin/kenv/kenv.1
==============================================================================
--- user/attilio/vmcontention/bin/kenv/kenv.1	Sat May 12 19:22:57 2012	(r235349)
+++ user/attilio/vmcontention/bin/kenv/kenv.1	Sat May 12 19:26:15 2012	(r235350)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 13, 2009
+.Dd May 11, 2012
 .Dt KENV 1
 .Os
 .Sh NAME
@@ -32,9 +32,9 @@
 .Nd dump or modify the kernel environment
 .Sh SYNOPSIS
 .Nm
-.Op Fl hq
+.Op Fl hNq
 .Nm
-.Op Fl q
+.Op Fl qv
 .Ar variable Ns Op = Ns Ar value
 .Nm
 .Op Fl q
@@ -54,6 +54,11 @@ name is specified,
 .Nm
 will only report that value.
 If the
+.Fl N
+option is specified,
+.Nm
+will only display variable names and not their values.
+If the
 .Fl u
 option is specified,
 .Nm
@@ -68,6 +73,13 @@ If the
 option is set, warnings normally printed as a result of being unable to
 perform the requested operation will be suppressed.
 .Pp
+If the
+.Fl v
+option is set, the variable name will be printed out for the
+environment variable in addition to the value when
+.Nm
+is executed with a variable name.
+.Pp
 Variables can be added to the kernel environment using the
 .Pa /boot/loader.conf
 file, or also statically compiled into the kernel using the statement

Modified: user/attilio/vmcontention/bin/kenv/kenv.c
==============================================================================
--- user/attilio/vmcontention/bin/kenv/kenv.c	Sat May 12 19:22:57 2012	(r235349)
+++ user/attilio/vmcontention/bin/kenv/kenv.c	Sat May 12 19:26:15 2012	(r235350)
@@ -42,15 +42,17 @@ static int	ksetenv(char *, char *);
 static int	kunsetenv(char *);
 
 static int hflag = 0;
+static int Nflag = 0;
 static int qflag = 0;
 static int uflag = 0;
+static int vflag = 0;
 
 static void
 usage(void)
 {
 	(void)fprintf(stderr, "%s\n%s\n%s\n",
-	    "usage: kenv [-hq]",
-	    "       kenv [-q] variable[=value]",
+	    "usage: kenv [-hNq]",
+	    "       kenv [-qv] variable[=value]",
 	    "       kenv [-q] -u variable");
 	exit(1);
 }
@@ -64,17 +66,23 @@ main(int argc, char **argv)
 	error = 0;
 	val = NULL;
 	env = NULL;
-	while ((ch = getopt(argc, argv, "hqu")) != -1) {
+	while ((ch = getopt(argc, argv, "hNquv")) != -1) {
 		switch (ch) {
 		case 'h':
 			hflag++;
 			break;
+		case 'N':
+			Nflag++;
+			break;
 		case 'q':
 			qflag++;
 			break;
 		case 'u':
 			uflag++;
 			break;
+		case 'v':
+			vflag++;
+			break;
 		default:
 			usage();
 		}
@@ -91,9 +99,9 @@ main(int argc, char **argv)
 		argv++;
 		argc--;
 	}
-	if (hflag && (env != NULL))
+	if ((hflag || Nflag) && env != NULL)
 		usage();
-	if ((argc > 0) || (uflag && (env == NULL)))
+	if (argc > 0 || ((uflag || vflag) && env == NULL))
 		usage();
 	if (env == NULL) {
 		error = kdumpenv();
@@ -152,7 +160,10 @@ kdumpenv(void)
 		if (cp == NULL)
 			continue;
 		*cp++ = '\0';
-		printf("%s=\"%s\"\n", buf, cp);
+		if (Nflag)
+			printf("%s\n", buf);
+		else
+			printf("%s=\"%s\"\n", buf, cp);
 		buf = cp;
 	}
 	return (0);
@@ -167,7 +178,10 @@ kgetenv(char *env)
 	ret = kenv(KENV_GET, env, buf, sizeof(buf));
 	if (ret == -1)
 		return (ret);
-	printf("%s\n", buf);
+	if (vflag)
+		printf("%s=\"%s\"\n", env, buf);
+	else
+		printf("%s\n", buf);
 	return (0);
 }
 

Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zdb/zdb.8
==============================================================================
--- user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zdb/zdb.8	Sat May 12 19:22:57 2012	(r235349)
+++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zdb/zdb.8	Sat May 12 19:26:15 2012	(r235350)
@@ -1,61 +1,286 @@
 '\" te
-.\" Copyright (c) 2011, Martin Matuska <mm at FreeBSD.org>.
+.\" Copyright (c) 2012, Martin Matuska <mm at FreeBSD.org>.
 .\" All Rights Reserved.
 .\"
-.\" The contents of this file are subject to the terms of the
-.\" Common Development and Distribution License (the "License").
-.\" You may not use this file except in compliance with the License.
-.\"
-.\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-.\" or http://www.opensolaris.org/os/licensing.
-.\" See the License for the specific language governing permissions
-.\" and limitations under the License.
-.\"
-.\" When distributing Covered Code, include this CDDL HEADER in each
-.\" file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-.\" If applicable, add the following below this CDDL HEADER, with the
-.\" fields enclosed by brackets "[]" replaced with your own identifying
-.\" information: Portions Copyright [yyyy] [name of copyright owner]
+.\" This file and its contents are supplied under the terms of the
+.\" Common Development and Distribution License ("CDDL"), version 1.0.
+.\" You may only use this file in accordance with the terms of version
+.\" 1.0 of the CDDL.
 .\"
-.\" Copyright (c) 2004, Sun Microsystems, Inc. All Rights Reserved.
+.\" A full copy of the text of the CDDL should have accompanied this
+.\" source.  A copy of the CDDL is also available via the Internet at
+.\" http://www.illumos.org/license/CDDL.
+.\"
+.\"
+.\" Copyright 2012, Richard Lowe.
+.\" Copyright (c) 2012, Marcelo Araujo <araujo at FreeBSD.org>.
+.\" All Rights Reserved.
 .\"
 .\" $FreeBSD$
 .\"
-.Dd November 26, 2011
+.Dd May 10, 2012
 .Dt ZDB 8
 .Os
 .Sh NAME
 .Nm zdb
-.Nd ZFS debugger
+.Nd Display zpool debugging and consistency information
 .Sh SYNOPSIS
 .Nm
-.Ar pool
+.Op Fl CumdibcsDvhLXFPA
+.Op Fl e Op Fl p Ar path...
+.Op Fl t Ar txg
+.Ar poolname
+.Op Ar object ...
+.Nm
+.Op Fl divPA
+.Op Fl e Op Fl p Ar path...
+.Ar dataset
+.Op Ar object ...
+.Nm
+.Fl m Op Fl LXFPA
+.Op Fl t Ar txg
+.Op Fl e Op Fl p Ar path...
+.Ar poolname
+.Nm
+.Fl R Op Fl A
+.Op Fl e Op Fl p Ar path...
+.Ar poolname
+.Ar vdev Ns : Ns Ar offset Ns : Ns Ar size Ns Op Ns : Ns Ar flags
+.Nm
+.Fl S
+.Op Fl AP
+.Op Fl e Op Fl p Ar path...
+.Ar poolname
+.Nm
+.Fl l
+.Op Fl uA
+.Ar device
+.Nm
+.Fl C
+.Op Fl A
+.Op Fl U Ar cache
 .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
-The following exit values are returned:
-.Bl -tag -offset 2n -width 2n
-.It 0
-The pool is consistent.
-.It 1
-An error was detected.
-.It 2
-Invalid command line options were specified.
+utility displays information about a ZFS pool useful for debugging and
+performs some amount of consistency checking.
+It is a not a general purpose tool and options (and facilities) may change.
+This is neither a
+.Xr fsck 8
+nor a
+.Xr fsdb 8
+utility.
+.Pp
+The output of this command in general reflects the on-disk structure of a ZFS
+pool, and is inherently unstable.
+The precise output of most invocations is not documented, a knowledge of ZFS
+internals is assumed.
+.Pp
+When operating on an imported and active pool it is possible, though unlikely,
+that zdb may interpret inconsistent pool data and behave erratically.
+.Sh OPTIONS
+Display options:
+.Bl -tag -width indent
+.It Fl b
+Display statistics regarding the number, size (logical, physical and
+allocated) and deduplication of blocks.
+.It Fl c
+Verify the checksum of all metadata blocks while printing block statistics
+(see
+.Fl b Ns ).
+.Pp
+If specified multiple times, verify the checksums of all blocks.
+.It Fl C
+Display information about the configuration. If specified with no other
+options, instead display information about the cache file
+.Ns ( Pa /etc/zfs/zpool.cache Ns ).
+To specify the cache file to display, see
+.Fl U
+.Pp
+If specified multiple times, and a pool name is also specified display both
+the cached configuration and the on-disk configuration.
+If specified multiple times with
+.FL e
+also display the configuration that would be used were the pool to be
+imported.
+.It Fl d
+Display information about datasets. Specified once, displays basic dataset
+information: ID, create transaction, size, and object count.
+.Pp
+If specified multiple times provides greater and greater verbosity.
+.Pp
+If object IDs are specified, display information about those specific objects only.
+.It Fl D
+Display deduplication statistics, including the deduplication ratio (dedup),
+compression ratio (compress), inflation due to the zfs copies property
+(copies), and an overall effective ratio (dedup * compress / copies).
+.Pp
+If specified twice, display a histogram of deduplication statistics, showing
+the allocated (physically present on disk) and referenced (logically
+referenced in the pool) block counts and sizes by reference count.
+.It Fl h
+Display pool history similar to
+.Cm zpool history ,
+but include internal changes, transaction, and dataset information.
+.It Fl i
+Display information about intent log (ZIL) entries relating to each
+dataset.
+If specified multiple times, display counts of each intent log transaction
+type.
+.It Fl l Ar device
+Display the vdev labels from the specified device.
+If the
+.Fl u
+option is also specified, also display the uberblocks on this device.
+.It Fl L
+Disable leak tracing and the loading of space maps.
+By default,
+.Nm 
+verifies that all non-free blocks are referenced, which can be very expensive.
+.It Fl m
+Display the offset, spacemap, and free space of each metaslab.
+When specified twice, also display information about the maximum contiguous
+free space and the percentage of free space in each space map.
+When specified three times display every spacemap record.
+.It Xo
+.Fl R Ar poolname
+.Ar vdev Ns : Ns Ar offset Ns : Ns Ar size Ns Op Ns : Ns Ar flags
+.Xc
+Read and display a block from the specified device. By default the block is
+displayed as a hex dump, but see the description of the
+.Fl r
+flag, below.
+.Pp
+The block is specified in terms of a colon-separated tuple
+.Ar vdev
+(an integer vdev identifier)
+.Ar offset
+(the offset within the vdev)
+.Ar size
+(the size of the block to read) and, optionally,
+.Ar flags
+(a set of flags, described below).
+.Bl -tag -width indent
+.It Sy b offset
+Print block pointer
+.It Sy d
+Decompress the block
+.It Sy e
+Byte swap the block
+.It Sy g
+Dump gang block header
+.It Sy i
+Dump indirect block
+.It Sy r
+Dump raw uninterpreted block data
+.El
+.It Fl s
+Report statistics on
+.Nm Ns 's
+I/O.
+Display operation counts, bandwidth, and error counts of I/O to the pool from
+.Nm .
+.It Fl S
+Simulate the effects of deduplication, constructing a DDT and then display
+that DDT as with \fB-DD\fR.
+.It Fl u
+Display the current uberblock.
+.El
+.Pp
+Other options:
+.Bl -tag -width indent
+.It Fl A
+Do not abort should any assertion fail.
+.It Fl AA
+Enable panic recovery, certain errors which would otherwise be fatal are
+demoted to warnings.
+.It Fl AAA
+Do not abort if asserts fail and also enable panic recovery.
+.It Fl e Op Fl p Ar path...
+Operate on an exported pool, not present in
+.Pa /etc/zfs/zpool.cache .
+The
+.Fl p
+flag specifies the path under which devices are to be searched.
+.It Fl F
+Attempt to make an unreadable pool readable by trying progressively older
+transactions.
+.It Fl P
+Print numbers in an unscaled form more amenable to parsing, eg. 1000000 rather
+than 1M.
+.It Fl t Ar transaction
+Specify the highest transaction to use when searching for uberblocks.
+See also the
+.Fl u
+and
+.Fl l
+options for a means to see the available uberblocks and their associated
+transaction numbers.
+.It Fl U Ar cachefile
+Use a cache file other than
+.Pa /etc/zfs/zpool.cache .
+This option is only valid with
+.Fl C
+.It Fl v
+Enable verbosity.
+Specify multiple times for increased verbosity.
+.It Fl X
+Attempt
+.Ql extreme
+transaction rewind, that is attempt the same recovery as
+.Fl F
+but read transactions otherwise deemed too old.
+.El
+.Pp
+Specifying a display option more than once enables verbosity for only that
+option, with more occurrences enabling more verbosity.
+.Pp
+If no options are specified, all information about the named pool will be
+displayed at default verbosity.
+.Sh EXAMPLES
+.Bl -tag -width 0n
+.It Sy Example 1 Display the configuration of imported pool 'rpool'
+.Bd -literal -offset 2n
+.Li # Ic zdb -C rpool
+
+MOS Configuration:
+        version: 28
+        name: 'rpool'
+ ...
+.Ed
+.It Sy Example 2 Display basic dataset information about 'rpool'
+.Bd -literal -offset 2n
+.Li # Ic zdb -d rpool
+Dataset mos [META], ID 0, cr_txg 4, 26.9M, 1051 objects
+Dataset rpool/swap [ZVOL], ID 59, cr_txg 356, 486M, 2 objects
+...
+.Ed
+.It Xo Sy Example 3 Display basic information about object 0 in
+.Sy 'rpool/export/home'
+.Xc
+.Bd -literal -offset 2n
+.Li # Ic zdb -d rpool/export/home 0
+Dataset rpool/export/home [ZPL], ID 137, cr_txg 1546, 32K, 8 objects
+
+    Object  lvl   iblk   dblk  dsize  lsize   %full  type
+         0    7    16K    16K  15.0K    16K   25.00  DMU dnode
+.Ed
+.It Xo Sy Example 4 Display the predicted effect of enabling deduplication on
+.Sy 'rpool'
+.Xc
+.Bd -literal -offset 2n
+.Li # Ic zdb -S rpool
+Simulated DDT histogram:
+
+bucket             allocated                      referenced          
+______  ______________________________  ______________________________
+refcnt  blocks   LSIZE   PSIZE   DSIZE  blocks   LSIZE   PSIZE   DSIZE
+------  ------   -----   -----   -----  ------   -----   -----   -----
+     1    694K   27.1G   15.0G   15.0G    694K   27.1G   15.0G   15.0G
+     2   35.0K   1.33G    699M    699M   74.7K   2.79G   1.45G   1.45G
+ ...
+dedup = 1.11, compress = 1.80, copies = 1.00, dedup * compress / copies = 2.00
+.Ed
 .El
 .Sh SEE ALSO
 .Xr zfs 8 ,
@@ -64,16 +289,18 @@ Invalid command line options were specif
 This manual page is a
 .Xr mdoc 7
 reimplementation of the
-.Tn OpenSolaris
+.Tn illumos
 manual page
 .Em zdb(1M) ,
 modified and customized for
 .Fx
 and licensed under the
-.Tn Common Development and Distribution License
+Common Development and Distribution License
 .Pq Tn CDDL .
 .Pp
 The
 .Xr mdoc 7
 implementation of this manual page was initially written by
-.An Martin Matuska Aq mm at FreeBSD.org .
+.An Martin Matuska Aq mm at FreeBSD.org
+and
+.An Marcelo Araujo Aq araujo at FreeBSD.org .

Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zdb/zdb.c
==============================================================================
--- user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Sat May 12 19:22:57 2012	(r235349)
+++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Sat May 12 19:26:15 2012	(r235350)
@@ -102,13 +102,16 @@ static void
 usage(void)
 {
 	(void) fprintf(stderr,
-	    "Usage: %s [-CumdibcsDvhL] poolname [object...]\n"
-	    "       %s [-div] dataset [object...]\n"
-	    "       %s -m [-L] poolname [vdev [metaslab...]]\n"
-	    "       %s -R poolname vdev:offset:size[:flags]\n"
-	    "       %s -S poolname\n"
-	    "       %s -l [-u] device\n"
-	    "       %s -C\n\n",
+            "Usage: %s [-CumdibcsDvhLXFPA] [-t txg] [-e [-p path...]]"
+            "poolname [object...]\n"
+            "       %s [-divPA] [-e -p path...] dataset [object...]\n"
+            "       %s -m [-LXFPA] [-t txg] [-e [-p path...]]"
+            "poolname [vdev [metaslab...]]\n"
+            "       %s -R [-A] [-e [-p path...]] poolname "
+            "vdev:offset:size[:flags]\n"
+            "       %s -S [-PA] [-e [-p path...]] poolname\n"
+            "       %s -l [-uA] device\n"
+            "       %s -C [-A] [-U config]\n\n",
 	    cmdname, cmdname, cmdname, cmdname, cmdname, cmdname, cmdname);
 
 	(void) fprintf(stderr, "    Dataset name must include at least one "
@@ -150,7 +153,7 @@ usage(void)
 	    "has altroot/not in a cachefile\n");
 	(void) fprintf(stderr, "        -p <path> -- use one or more with "
 	    "-e to specify path to vdev dir\n");
-	(void) fprintf(stderr, "	-P print numbers parsable\n");
+	(void) fprintf(stderr, "	-P print numbers in parseable form\n");
 	(void) fprintf(stderr, "        -t <txg> -- highest txg to use when "
 	    "searching for uberblocks\n");
 	(void) fprintf(stderr, "Specify an option more than once (e.g. -bb) "

Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zfs/zfs.8
==============================================================================
--- user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Sat May 12 19:22:57 2012	(r235349)
+++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Sat May 12 19:26:15 2012	(r235350)
@@ -18,8 +18,9 @@
 .\" information: Portions Copyright [yyyy] [name of copyright owner]
 .\"
 .\" Copyright (c) 2010, Sun Microsystems, Inc. All Rights Reserved.
-.\" Copyright (c) 2011 by Delphix. All rights reserved.
+.\" Copyright (c) 2012 by Delphix. All rights reserved.
 .\" Copyright (c) 2012 Nexenta Systems, Inc. All Rights Reserved.
+.\" Copyright (c) 2012, Joyent, Inc. All rights reserved.
 .\" Copyright (c) 2011, Pawel Jakub Dawidek <pjd at FreeBSD.org>
 .\"
 .\" $FreeBSD$
@@ -77,10 +78,12 @@
 .Ar clone-filesystem
 .Nm
 .Cm rename
+.Op Fl f
 .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot
 .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot
 .Nm
 .Cm rename
+.Op Fl f
 .Fl p
 .Ar filesystem Ns | Ns Ar volume
 .Ar filesystem Ns | Ns Ar volume
@@ -1646,12 +1649,14 @@ subcommand can be used to rename any con
 .It Xo
 .Nm
 .Cm rename
+.Op Fl f
 .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot
 .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot
 .Xc
 .It Xo
 .Nm
 .Cm rename
+.Op Fl f
 .Fl p
 .Ar filesystem Ns | Ns Ar volume
 .Ar filesystem Ns | Ns Ar volume
@@ -1685,6 +1690,11 @@ property is set to
 or
 .Cm none ,
 file system is not unmounted even if this option is not given.
+.It Fl f
+Force unmount any filesystems that need to be unmounted in the process.
+This flag has no effect if used together with the
+.Fl u
+flag.
 .El
 .It Xo
 .Nm
@@ -2271,6 +2281,7 @@ flags to determine what data will be sen
 Print machine-parsable verbose information about the stream package generated.
 .It Fl v
 Print verbose information about the stream package generated.
+This information includes a per-second report of how much data has been sent.
 .El
 .Pp
 The format of the stream is committed. You will be able to receive your streams

Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
==============================================================================
--- user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Sat May 12 19:22:57 2012	(r235349)
+++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Sat May 12 19:26:15 2012	(r235350)
@@ -22,10 +22,12 @@
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2012 Nexenta Systems, Inc. All rights reserved.
- * Copyright (c) 2011 by Delphix. All rights reserved.
+ * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright 2012 Milan Jurik. All rights reserved.
+ * Copyright (c) 2012, Joyent, Inc. All rights reserved.
  * Copyright (c) 2011-2012 Pawel Jakub Dawidek <pawel at dawidek.net>.
  * All rights reserved.
- * Copyright (c) 2011 Martin Matuska <mm at FreeBSD.org>. All rights reserved.
+ * Copyright (c) 2012 Martin Matuska <mm at FreeBSD.org>. All rights reserved.
  */
 
 #include <assert.h>
@@ -256,9 +258,10 @@ get_usage(zfs_help_t idx)
 		"snapshot>\n"
 		"\treceive [-vnFu] [-d | -e] <filesystem>\n"));
 	case HELP_RENAME:
-		return (gettext("\trename <filesystem|volume|snapshot> "
+		return (gettext("\trename [-f] <filesystem|volume|snapshot> "
 		    "<filesystem|volume|snapshot>\n"
-		    "\trename -p <filesystem|volume> <filesystem|volume>\n"
+		    "\trename [-f] -p <filesystem|volume> "
+		    "<filesystem|volume>\n"
 		    "\trename -r <snapshot> <snapshot>\n"
 		    "\trename -u [-p] <filesystem> <filesystem>"));
 	case HELP_ROLLBACK:
@@ -764,7 +767,6 @@ zfs_do_create(int argc, char **argv)
 			(void) fprintf(stderr, gettext("missing size "
 			    "argument\n"));
 			goto badusage;
-			break;
 		case '?':
 			(void) fprintf(stderr, gettext("invalid option '%c'\n"),
 			    optopt);
@@ -3091,8 +3093,8 @@ zfs_do_list(int argc, char **argv)
 }
 
 /*
- * zfs rename <fs | snap | vol> <fs | snap | vol>
- * zfs rename -p <fs | vol> <fs | vol>
+ * zfs rename [-f] <fs | snap | vol> <fs | snap | vol>
+ * zfs rename [-f] -p <fs | vol> <fs | vol>
  * zfs rename -r <snap> <snap>
  * zfs rename -u [-p] <fs> <fs>
  *
@@ -3112,7 +3114,7 @@ zfs_do_rename(int argc, char **argv)
 	boolean_t parents = B_FALSE;
 
 	/* check options */
-	while ((c = getopt(argc, argv, "pru")) != -1) {
+	while ((c = getopt(argc, argv, "fpru")) != -1) {
 		switch (c) {
 		case 'p':
 			parents = B_TRUE;
@@ -3123,6 +3125,9 @@ zfs_do_rename(int argc, char **argv)
 		case 'u':
 			flags.nounmount = B_TRUE;
 			break;
+		case 'f':
+			flags.forceunmount = B_TRUE;
+			break;
 		case '?':
 		default:
 			(void) fprintf(stderr, gettext("invalid option '%c'\n"),
@@ -3586,6 +3591,7 @@ zfs_do_send(int argc, char **argv)
 			if (flags.verbose)
 				extraverbose = B_TRUE;
 			flags.verbose = B_TRUE;
+			flags.progress = B_TRUE;
 			break;
 		case 'D':
 			flags.dedup = B_TRUE;

Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.1
==============================================================================
--- user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.1	Sat May 12 19:22:57 2012	(r235349)
+++ user/attilio/vmcontention/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.1	Sat May 12 19:26:15 2012	(r235350)
@@ -25,7 +25,7 @@
 .Dt ZSTREAMDUMP 8
 .Os
 .Sh NAME
-.Nm zdb
+.Nm zstreamdump
 .Nd filter data in zfs send stream
 .Sh SYNOPSIS
 .Nm

Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
==============================================================================
--- user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h	Sat May 12 19:22:57 2012	(r235349)
+++ user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h	Sat May 12 19:26:15 2012	(r235350)
@@ -25,7 +25,8 @@
  * Copyright (c) 2011 Pawel Jakub Dawidek <pawel at dawidek.net>.
  * All rights reserved.
  * Copyright (c) 2011 by Delphix. All rights reserved.
- * All rights reserved.
+ * Copyright (c) 2012, Joyent, Inc. All rights reserved.
+ * Copyright (c) 2012 Martin Matuska <mm at FreeBSD.org>. All rights reserved.
  */
 
 #ifndef	_LIBZFS_H
@@ -541,6 +542,9 @@ typedef struct renameflags {
 
 	/* don't unmount file systems */
 	int nounmount : 1;
+
+	/* force unmount file systems */
+	int forceunmount : 1;
 } renameflags_t;
 
 extern int zfs_rename(zfs_handle_t *, const char *, renameflags_t flags);
@@ -569,6 +573,9 @@ typedef struct sendflags {
 
 	/* parsable verbose output (ie. -P) */
 	boolean_t parsable;
+
+	/* show progress (ie. -v) */
+	boolean_t progress;
 } sendflags_t;
 
 typedef boolean_t (snapfilter_cb_t)(zfs_handle_t *, void *);

Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
==============================================================================
--- user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c	Sat May 12 19:22:57 2012	(r235349)
+++ user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c	Sat May 12 19:26:15 2012	(r235350)
@@ -25,6 +25,7 @@
  * Copyright (c) 2011 by Delphix. All rights reserved.
  * Copyright (c) 2011-2012 Pawel Jakub Dawidek <pawel at dawidek.net>.
  * All rights reserved.
+ * Copyright (c) 2012 Martin Matuska <mm at FreeBSD.org>. All rights reserved.
  */
 
 #include <ctype.h>
@@ -3721,7 +3722,8 @@ zfs_rename(zfs_handle_t *zhp, const char
 
 	} else {
 		if ((cl = changelist_gather(zhp, ZFS_PROP_NAME,
-		    flags.nounmount ? CL_GATHER_DONT_UNMOUNT : 0, 0)) == NULL) {
+		    flags.nounmount ? CL_GATHER_DONT_UNMOUNT : 0,
+		    flags.forceunmount ? MS_FORCE : 0)) == NULL) {
 			return (-1);
 		}
 

Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
==============================================================================
--- user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c	Sat May 12 19:22:57 2012	(r235349)
+++ user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c	Sat May 12 19:26:15 2012	(r235350)
@@ -22,6 +22,7 @@
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2011 by Delphix. All rights reserved.
+ * Copyright (c) 2012, Joyent, Inc. All rights reserved.
  * Copyright (c) 2012 Pawel Jakub Dawidek <pawel at dawidek.net>.
  * All rights reserved.
  */
@@ -40,6 +41,7 @@
 #include <sys/mount.h>
 #include <pthread.h>
 #include <umem.h>
+#include <time.h>
 
 #include <libzfs.h>
 
@@ -67,6 +69,12 @@ typedef struct dedup_arg {
 	libzfs_handle_t  *dedup_hdl;
 } dedup_arg_t;
 
+typedef struct progress_arg {
+	zfs_handle_t *pa_zhp;
+	int pa_fd;
+	boolean_t pa_parsable;
+} progress_arg_t;
+
 typedef struct dataref {
 	uint64_t ref_guid;
 	uint64_t ref_object;
@@ -786,7 +794,7 @@ typedef struct send_dump_data {
 	char prevsnap[ZFS_MAXNAMELEN];
 	uint64_t prevsnap_obj;
 	boolean_t seenfrom, seento, replicate, doall, fromorigin;
-	boolean_t verbose, dryrun, parsable;
+	boolean_t verbose, dryrun, parsable, progress;
 	int outfd;
 	boolean_t err;
 	nvlist_t *fss;
@@ -979,10 +987,60 @@ hold_for_send(zfs_handle_t *zhp, send_du
 	return (error);
 }
 
+static void *
+send_progress_thread(void *arg)
+{
+	progress_arg_t *pa = arg;
+
+	zfs_cmd_t zc = { 0 };
+	zfs_handle_t *zhp = pa->pa_zhp;
+	libzfs_handle_t *hdl = zhp->zfs_hdl;
+	unsigned long long bytes;
+	char buf[16];
+
+	time_t t;
+	struct tm *tm;
+
+	assert(zhp->zfs_type == ZFS_TYPE_SNAPSHOT);
+	(void) strlcpy(zc.zc_name, zhp->zfs_name, sizeof (zc.zc_name));
+
+	if (!pa->pa_parsable)
+		(void) fprintf(stderr, "TIME        SENT   SNAPSHOT\n");
+
+	/*
+	 * Print the progress from ZFS_IOC_SEND_PROGRESS every second.
+	 */
+	for (;;) {
+		(void) sleep(1);
+
+		zc.zc_cookie = pa->pa_fd;
+		if (zfs_ioctl(hdl, ZFS_IOC_SEND_PROGRESS, &zc) != 0)
+			return ((void *)-1);
+
+		(void) time(&t);
+		tm = localtime(&t);
+		bytes = zc.zc_cookie;
+
+		if (pa->pa_parsable) {
+			(void) fprintf(stderr, "%02d:%02d:%02d\t%llu\t%s\n",
+			    tm->tm_hour, tm->tm_min, tm->tm_sec,
+			    bytes, zhp->zfs_name);
+		} else {
+			zfs_nicenum(bytes, buf, sizeof (buf));
+			(void) fprintf(stderr, "%02d:%02d:%02d   %5s   %s\n",
+			    tm->tm_hour, tm->tm_min, tm->tm_sec,
+			    buf, zhp->zfs_name);
+		}
+	}
+}
+
 static int
 dump_snapshot(zfs_handle_t *zhp, void *arg)
 {
 	send_dump_data_t *sdd = arg;
+	progress_arg_t pa = { 0 };
+	pthread_t tid;
+
 	char *thissnap;
 	int err;
 	boolean_t isfromsnap, istosnap, fromorigin;
@@ -1100,8 +1158,29 @@ dump_snapshot(zfs_handle_t *zhp, void *a

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