svn commit: r324483 - in projects/runtime-coverage: . bin bin/ps bin/rcp cddl/contrib/opensolaris/cmd/zdb cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/cmd/zpool cddl/contrib/opensolari...

Tue Oct 10 06:26:15 UTC 2017

Author: ngie
Date: Tue Oct 10 06:26:12 2017
New Revision: 324483
URL: https://svnweb.freebsd.org/changeset/base/324483

Log:
  MFhead at r324482

Added:
  projects/runtime-coverage/cddl/contrib/opensolaris/cmd/zfs/zfs-program.8
     - copied unchanged from r324482, head/cddl/contrib/opensolaris/cmd/zfs/zfs-program.8
     - copied unchanged from r324482, head/sys/amd64/amd64/efirt_machdep.c
  projects/runtime-coverage/sys/arm/allwinner/clkng/ccu_sun8i_r.c
     - copied unchanged from r324482, head/sys/arm/allwinner/clkng/ccu_sun8i_r.c
  projects/runtime-coverage/sys/arm/allwinner/clkng/ccu_sun8i_r.h
     - copied unchanged from r324482, head/sys/arm/allwinner/clkng/ccu_sun8i_r.h
  projects/runtime-coverage/sys/arm/conf/VIRT
     - copied unchanged from r324482, head/sys/arm/conf/VIRT
  projects/runtime-coverage/sys/arm/conf/std.armv7
     - copied unchanged from r324482, head/sys/arm/conf/std.armv7
  projects/runtime-coverage/sys/boot/libsa/
     - copied from r324482, head/sys/boot/libsa/
  projects/runtime-coverage/sys/boot/userboot/Makefile.inc
     - copied unchanged from r324482, head/sys/boot/userboot/Makefile.inc
  projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lua/
     - copied from r324482, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lua/
  projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zcp.h
     - copied unchanged from r324482, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zcp.h
  projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zcp_global.h
     - copied unchanged from r324482, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zcp_global.h
  projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zcp_iter.h
     - copied unchanged from r324482, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zcp_iter.h
  projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zcp_prop.h
     - copied unchanged from r324482, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zcp_prop.h
  projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zcp.c
     - copied unchanged from r324482, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zcp.c
  projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zcp_get.c
     - copied unchanged from r324482, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zcp_get.c
  projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zcp_global.c
     - copied unchanged from r324482, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zcp_global.c
  projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zcp_iter.c
     - copied unchanged from r324482, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zcp_iter.c
  projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zcp_synctask.c
     - copied unchanged from r324482, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zcp_synctask.c
  projects/runtime-coverage/sys/contrib/dev/iwm/iwm-8265-22.fw.uu
     - copied unchanged from r324482, head/sys/contrib/dev/iwm/iwm-8265-22.fw.uu
  projects/runtime-coverage/sys/dev/cxgbe/firmware/t4fw-1.16.63.0.bin.uu
     - copied unchanged from r324482, head/sys/dev/cxgbe/firmware/t4fw-1.16.63.0.bin.uu
  projects/runtime-coverage/sys/dev/cxgbe/firmware/t5fw-1.16.63.0.bin.uu
     - copied unchanged from r324482, head/sys/dev/cxgbe/firmware/t5fw-1.16.63.0.bin.uu
  projects/runtime-coverage/sys/dev/cxgbe/firmware/t6fw-1.16.63.0.bin.uu
     - copied unchanged from r324482, head/sys/dev/cxgbe/firmware/t6fw-1.16.63.0.bin.uu
     - copied unchanged from r324482, head/sys/dev/efidev/efirt.c
  projects/runtime-coverage/sys/modules/iwmfw/iwm8265fw/
     - copied from r324482, head/sys/modules/iwmfw/iwm8265fw/
  projects/runtime-coverage/tests/sys/netpfil/
     - copied from r324482, head/tests/sys/netpfil/
Directory Properties:
  projects/runtime-coverage/sys/amd64/amd64/efirt_machdep.c   (props changed)
  projects/runtime-coverage/sys/dev/efidev/efirt.c   (props changed)
Deleted:
  projects/runtime-coverage/bin/rcp/
  projects/runtime-coverage/etc/pam.d/rsh
  projects/runtime-coverage/libexec/rlogind/
  projects/runtime-coverage/libexec/rshd/
  projects/runtime-coverage/release/doc/
  projects/runtime-coverage/sys/amd64/amd64/efirt.c
  projects/runtime-coverage/sys/arm/allwinner/a10_gpio.h
  projects/runtime-coverage/sys/boot/README
  projects/runtime-coverage/sys/dev/cxgbe/firmware/t4fw-1.16.59.0.bin.uu
  projects/runtime-coverage/sys/dev/cxgbe/firmware/t5fw-1.16.59.0.bin.uu
  projects/runtime-coverage/sys/dev/cxgbe/firmware/t6fw-1.16.59.0.bin.uu
  projects/runtime-coverage/sys/sys/sockstate.h
  projects/runtime-coverage/tools/build/options/WITHOUT_RCMDS
  projects/runtime-coverage/tools/build/options/WITH_RCMDS
  projects/runtime-coverage/usr.bin/rlogin/
  projects/runtime-coverage/usr.bin/rsh/
Modified:
  projects/runtime-coverage/Makefile
  projects/runtime-coverage/Makefile.inc1
  projects/runtime-coverage/Makefile.libcompat
  projects/runtime-coverage/ObsoleteFiles.inc
  projects/runtime-coverage/UPDATING
  projects/runtime-coverage/bin/Makefile
  projects/runtime-coverage/bin/ps/keyword.c
  projects/runtime-coverage/bin/ps/ps.1
  projects/runtime-coverage/bin/ps/ps.c
  projects/runtime-coverage/cddl/contrib/opensolaris/cmd/zdb/zdb.8
  projects/runtime-coverage/cddl/contrib/opensolaris/cmd/zdb/zdb.c
  projects/runtime-coverage/cddl/contrib/opensolaris/cmd/zfs/zfs.8
  projects/runtime-coverage/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
  projects/runtime-coverage/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
  projects/runtime-coverage/cddl/contrib/opensolaris/cmd/ztest/ztest.c
  projects/runtime-coverage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dis.c
  projects/runtime-coverage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_print.c
  projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
  projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_diff.c
  projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h
  projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
  projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
  projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c
  projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c
  projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h
  projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
  projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
  projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzpool/common/util.c
  projects/runtime-coverage/cddl/lib/libzpool/Makefile
  projects/runtime-coverage/cddl/sbin/zfs/Makefile
  projects/runtime-coverage/contrib/mdocml/Makefile
  projects/runtime-coverage/contrib/mdocml/NEWS
  projects/runtime-coverage/contrib/mdocml/man_term.c
  projects/runtime-coverage/contrib/mdocml/mansearch.c
  projects/runtime-coverage/contrib/mdocml/mdoc_validate.c
  projects/runtime-coverage/contrib/mdocml/tbl_html.c
  projects/runtime-coverage/contrib/mdocml/tbl_term.c
  projects/runtime-coverage/contrib/tcpdump/addrtoname.c
  projects/runtime-coverage/contrib/tcpdump/tcpdump.c
  projects/runtime-coverage/etc/devd/zfs.conf
  projects/runtime-coverage/etc/inetd.conf
  projects/runtime-coverage/etc/mtree/BSD.tests.dist
  projects/runtime-coverage/etc/pam.d/Makefile
  projects/runtime-coverage/gnu/usr.bin/binutils/as/Makefile
  projects/runtime-coverage/gnu/usr.bin/cc/Makefile.inc
  projects/runtime-coverage/lib/Makefile
  projects/runtime-coverage/lib/clang/llvm.build.mk
  projects/runtime-coverage/lib/libc/Makefile
  projects/runtime-coverage/lib/libc/arm/Makefile.inc
  projects/runtime-coverage/lib/libc/arm/aeabi/Makefile.inc
  projects/runtime-coverage/lib/libc/arm/gen/Makefile.inc
  projects/runtime-coverage/lib/libc/gen/tls.c
  projects/runtime-coverage/lib/libc/net/gethostbyname.3
  projects/runtime-coverage/lib/libc/sys/Makefile.inc
  projects/runtime-coverage/lib/libc/sys/recv.2
  projects/runtime-coverage/lib/libcapsicum/capsicum_helpers.h
  projects/runtime-coverage/lib/libcompiler_rt/Makefile.inc
  projects/runtime-coverage/lib/libcuse/cuse.3
  projects/runtime-coverage/lib/libprocstat/libprocstat.c
  projects/runtime-coverage/lib/libprocstat/libprocstat.h
  projects/runtime-coverage/lib/libthr/thread/thr_private.h
  projects/runtime-coverage/lib/libthr/thread/thr_spec.c
  projects/runtime-coverage/lib/msun/arm/Makefile.inc
  projects/runtime-coverage/libexec/Makefile
  projects/runtime-coverage/libexec/ftpd/ftpd.c
  projects/runtime-coverage/release/Makefile
  projects/runtime-coverage/release/Makefile.mirrors
  projects/runtime-coverage/release/arm/BANANAPI.conf
  projects/runtime-coverage/release/arm/BEAGLEBONE.conf
  projects/runtime-coverage/release/arm/CUBIEBOARD.conf
  projects/runtime-coverage/release/arm/CUBIEBOARD2.conf
  projects/runtime-coverage/release/arm/CUBOX-HUMMINGBOARD.conf
  projects/runtime-coverage/release/arm/GUMSTIX.conf
  projects/runtime-coverage/release/arm/PANDABOARD.conf
  projects/runtime-coverage/release/arm/RPI-B.conf
  projects/runtime-coverage/release/arm/RPI2.conf
  projects/runtime-coverage/release/arm/WANDBOARD.conf
  projects/runtime-coverage/rescue/rescue/Makefile
  projects/runtime-coverage/sbin/fsck_ffs/main.c
  projects/runtime-coverage/sbin/geom/class/part/geom_part.c
  projects/runtime-coverage/sbin/growfs/tests/legacy_test.pl
  projects/runtime-coverage/sbin/init/init.c
  projects/runtime-coverage/sbin/ipfw/ipfw.8
  projects/runtime-coverage/sbin/ipfw/ipfw2.h
  projects/runtime-coverage/share/man/man4/cxgbe.4
  projects/runtime-coverage/share/man/man4/mpr.4
  projects/runtime-coverage/share/man/man4/mps.4
  projects/runtime-coverage/share/man/man4/rtwn_usb.4
  projects/runtime-coverage/share/man/man5/src.conf.5
  projects/runtime-coverage/share/man/man7/arch.7
  projects/runtime-coverage/share/man/man9/EVENTHANDLER.9
  projects/runtime-coverage/share/man/man9/mbpool.9
  projects/runtime-coverage/share/man/man9/mbuf.9
  projects/runtime-coverage/share/man/man9/stack.9
  projects/runtime-coverage/share/misc/bsd-family-tree
  projects/runtime-coverage/share/misc/iso3166
  projects/runtime-coverage/share/misc/organization.dot
  projects/runtime-coverage/share/mk/bsd.cpu.mk
  projects/runtime-coverage/share/mk/bsd.libnames.mk
  projects/runtime-coverage/share/mk/local.meta.sys.mk
  projects/runtime-coverage/share/mk/src.libnames.mk
  projects/runtime-coverage/share/mk/src.opts.mk
  projects/runtime-coverage/share/mk/sys.mk
  projects/runtime-coverage/sys/amd64/amd64/cpu_switch.S
  projects/runtime-coverage/sys/amd64/amd64/pmap.c
  projects/runtime-coverage/sys/amd64/amd64/sys_machdep.c
  projects/runtime-coverage/sys/amd64/include/efi.h
  projects/runtime-coverage/sys/amd64/include/proc.h
  projects/runtime-coverage/sys/arm/allwinner/a10_ahci.c
  projects/runtime-coverage/sys/arm/allwinner/a10_gpio.c
  projects/runtime-coverage/sys/arm/allwinner/clkng/aw_ccung.c
  projects/runtime-coverage/sys/arm/allwinner/clkng/ccu_a31.c
  projects/runtime-coverage/sys/arm/allwinner/clkng/ccu_a31.h
  projects/runtime-coverage/sys/arm/allwinner/clkng/ccu_a64.c
  projects/runtime-coverage/sys/arm/allwinner/clkng/ccu_a64.h
  projects/runtime-coverage/sys/arm/allwinner/clkng/ccu_h3.c
  projects/runtime-coverage/sys/arm/allwinner/clkng/ccu_h3.h
  projects/runtime-coverage/sys/arm/allwinner/h3/files.h3
  projects/runtime-coverage/sys/arm/allwinner/std.allwinner
  projects/runtime-coverage/sys/arm/allwinner/std.allwinner_up
  projects/runtime-coverage/sys/arm/altera/socfpga/std.socfpga
  projects/runtime-coverage/sys/arm/amlogic/aml8726/std.aml8726
  projects/runtime-coverage/sys/arm/annapurna/alpine/std.alpine
  projects/runtime-coverage/sys/arm/broadcom/bcm2835/bcm2835_bsc.c
  projects/runtime-coverage/sys/arm/broadcom/bcm2835/bcm2835_bscreg.h
  projects/runtime-coverage/sys/arm/broadcom/bcm2835/bcm2835_bscvar.h
  projects/runtime-coverage/sys/arm/broadcom/bcm2835/bcm2835_machdep.c
  projects/runtime-coverage/sys/arm/broadcom/bcm2835/bcm2835_rng.c
  projects/runtime-coverage/sys/arm/broadcom/bcm2835/std.bcm2836
  projects/runtime-coverage/sys/arm/conf/ALLWINNER_UP
  projects/runtime-coverage/sys/arm/conf/ALPINE
  projects/runtime-coverage/sys/arm/conf/AML8726
  projects/runtime-coverage/sys/arm/conf/ARMADA38X
  projects/runtime-coverage/sys/arm/conf/ARMADAXP
  projects/runtime-coverage/sys/arm/conf/BEAGLEBONE
  projects/runtime-coverage/sys/arm/conf/EFIKA_MX
  projects/runtime-coverage/sys/arm/conf/EXYNOS5.common
  projects/runtime-coverage/sys/arm/conf/GENERIC
  projects/runtime-coverage/sys/arm/conf/IMX53
  projects/runtime-coverage/sys/arm/conf/IMX6
  projects/runtime-coverage/sys/arm/conf/PANDABOARD
  projects/runtime-coverage/sys/arm/conf/RK3188
  projects/runtime-coverage/sys/arm/conf/RPI2
  projects/runtime-coverage/sys/arm/conf/SOCFPGA
  projects/runtime-coverage/sys/arm/conf/TEGRA124
  projects/runtime-coverage/sys/arm/conf/VYBRID
  projects/runtime-coverage/sys/arm/conf/ZEDBOARD
  projects/runtime-coverage/sys/arm/conf/std.armv6
  projects/runtime-coverage/sys/arm/freescale/imx/imx6_ahci.c
  projects/runtime-coverage/sys/arm/freescale/imx/imx6_hdmi.c
  projects/runtime-coverage/sys/arm/freescale/imx/std.imx51
  projects/runtime-coverage/sys/arm/freescale/imx/std.imx53
  projects/runtime-coverage/sys/arm/freescale/imx/std.imx6
  projects/runtime-coverage/sys/arm/freescale/vybrid/std.vybrid
  projects/runtime-coverage/sys/arm/include/param.h
  projects/runtime-coverage/sys/arm/mv/armada38x/std.armada38x
  projects/runtime-coverage/sys/arm/mv/std-pj4b.mv
  projects/runtime-coverage/sys/arm/nvidia/tegra124/std.tegra124
  projects/runtime-coverage/sys/arm/nvidia/tegra_ahci.c
  projects/runtime-coverage/sys/arm/qemu/std.virt
  projects/runtime-coverage/sys/arm/rockchip/std.rk30xx
  projects/runtime-coverage/sys/arm/samsung/exynos/std.exynos5250
  projects/runtime-coverage/sys/arm/samsung/exynos/std.exynos5420
  projects/runtime-coverage/sys/arm/ti/std.ti
  projects/runtime-coverage/sys/arm/ti/ti_pruss.c
  projects/runtime-coverage/sys/arm/ti/ti_pruss.h
  projects/runtime-coverage/sys/arm/xilinx/std.zynq7
  projects/runtime-coverage/sys/arm64/arm64/mp_machdep.c
  projects/runtime-coverage/sys/boot/Makefile
  projects/runtime-coverage/sys/boot/Makefile.inc
  projects/runtime-coverage/sys/boot/arm/uboot/Makefile
  projects/runtime-coverage/sys/boot/common/Makefile.inc
  projects/runtime-coverage/sys/boot/efi/boot1/Makefile
  projects/runtime-coverage/sys/boot/efi/fdt/Makefile
  projects/runtime-coverage/sys/boot/efi/include/efilib.h
  projects/runtime-coverage/sys/boot/efi/include/efizfs.h
  projects/runtime-coverage/sys/boot/efi/libefi/Makefile
  projects/runtime-coverage/sys/boot/efi/libefi/devpath.c
  projects/runtime-coverage/sys/boot/efi/libefi/efizfs.c
  projects/runtime-coverage/sys/boot/efi/loader/Makefile
  projects/runtime-coverage/sys/boot/efi/loader/main.c
  projects/runtime-coverage/sys/boot/fdt/dts/arm/rpi2.dts
  projects/runtime-coverage/sys/boot/i386/gptboot/Makefile
  projects/runtime-coverage/sys/boot/i386/gptzfsboot/Makefile
  projects/runtime-coverage/sys/boot/i386/libfirewire/Makefile
  projects/runtime-coverage/sys/boot/i386/libi386/Makefile
  projects/runtime-coverage/sys/boot/i386/loader/Makefile
  projects/runtime-coverage/sys/boot/i386/zfsboot/Makefile
  projects/runtime-coverage/sys/boot/libstand32/Makefile
  projects/runtime-coverage/sys/boot/mips/beri/boot2/Makefile
  projects/runtime-coverage/sys/boot/mips/beri/loader/Makefile
  projects/runtime-coverage/sys/boot/mips/uboot/Makefile
  projects/runtime-coverage/sys/boot/ofw/libofw/Makefile
  projects/runtime-coverage/sys/boot/powerpc/kboot/Makefile
  projects/runtime-coverage/sys/boot/powerpc/ofw/Makefile
  projects/runtime-coverage/sys/boot/powerpc/ps3/Makefile
  projects/runtime-coverage/sys/boot/powerpc/uboot/Makefile
  projects/runtime-coverage/sys/boot/sparc64/loader/Makefile
  projects/runtime-coverage/sys/boot/uboot/fdt/Makefile
  projects/runtime-coverage/sys/boot/uboot/lib/Makefile
  projects/runtime-coverage/sys/boot/userboot/libstand/Makefile
  projects/runtime-coverage/sys/boot/userboot/userboot/Makefile
  projects/runtime-coverage/sys/boot/userboot/zfs/Makefile
  projects/runtime-coverage/sys/boot/zfs/Makefile
  projects/runtime-coverage/sys/cam/ctl/ctl_frontend_iscsi.c
  projects/runtime-coverage/sys/cddl/compat/opensolaris/kern/opensolaris_sunddi.c
  projects/runtime-coverage/sys/cddl/compat/opensolaris/sys/mutex.h
  projects/runtime-coverage/sys/cddl/compat/opensolaris/sys/sunddi.h
  projects/runtime-coverage/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c
  projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/Makefile.files
  projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/blkptr.c
  projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
  projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c
  projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c
  projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
  projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/blkptr.h
  projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h
  projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_destroy.h
  projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h
  projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h
  projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h
  projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
  projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h
  projects/runtime-coverage/sys/compat/linuxkpi/common/include/linux/random.h
  projects/runtime-coverage/sys/compat/linuxkpi/common/include/linux/workqueue.h
  projects/runtime-coverage/sys/compat/linuxkpi/common/src/linux_work.c
  projects/runtime-coverage/sys/compat/ndis/kern_ndis.c
  projects/runtime-coverage/sys/compat/ndis/ndis_var.h
  projects/runtime-coverage/sys/conf/Makefile.arm
  projects/runtime-coverage/sys/conf/files
  projects/runtime-coverage/sys/conf/files.amd64
  projects/runtime-coverage/sys/conf/files.arm
  projects/runtime-coverage/sys/conf/files.arm64
  projects/runtime-coverage/sys/conf/kern.mk
  projects/runtime-coverage/sys/conf/kern.opts.mk
  projects/runtime-coverage/sys/conf/kern.pre.mk
  projects/runtime-coverage/sys/conf/kmod.mk
  projects/runtime-coverage/sys/conf/options.arm
  projects/runtime-coverage/sys/crypto/aesni/aesni.c
  projects/runtime-coverage/sys/dev/ahci/ahci.c
  projects/runtime-coverage/sys/dev/ahci/ahci.h
  projects/runtime-coverage/sys/dev/ahci/ahci_mv_fdt.c
  projects/runtime-coverage/sys/dev/ahci/ahci_pci.c
  projects/runtime-coverage/sys/dev/bnxt/if_bnxt.c
  projects/runtime-coverage/sys/dev/cas/if_cas.c
  projects/runtime-coverage/sys/dev/cas/if_casvar.h
  projects/runtime-coverage/sys/dev/cxgbe/adapter.h
  projects/runtime-coverage/sys/dev/cxgbe/firmware/t4fw_interface.h
  projects/runtime-coverage/sys/dev/cxgbe/firmware/t6fw_cfg_uwire.txt
  projects/runtime-coverage/sys/dev/cxgbe/t4_main.c
  projects/runtime-coverage/sys/dev/cxgbe/t4_sge.c
  projects/runtime-coverage/sys/dev/cxgbe/tom/t4_cpl_io.c
  projects/runtime-coverage/sys/dev/dpaa/if_dtsec_rm.c
  projects/runtime-coverage/sys/dev/e1000/if_em.c
  projects/runtime-coverage/sys/dev/hwpmc/hwpmc_amd.c
  projects/runtime-coverage/sys/dev/hwpmc/hwpmc_amd.h
  projects/runtime-coverage/sys/dev/hyperv/netvsc/if_hn.c
  projects/runtime-coverage/sys/dev/if_ndis/if_ndis.c
  projects/runtime-coverage/sys/dev/iscsi_initiator/isc_soc.c
  projects/runtime-coverage/sys/dev/iwm/if_iwm.c
  projects/runtime-coverage/sys/dev/iwm/if_iwm_8000.c
  projects/runtime-coverage/sys/dev/iwm/if_iwm_config.h
  projects/runtime-coverage/sys/dev/lge/if_lge.c
  projects/runtime-coverage/sys/dev/md/md.c
  projects/runtime-coverage/sys/dev/mlx4/mlx4_en/en.h
  projects/runtime-coverage/sys/dev/mlx4/mlx4_en/mlx4_en_netdev.c
  projects/runtime-coverage/sys/dev/mlx4/mlx4_en/mlx4_en_rx.c
  projects/runtime-coverage/sys/dev/mlx5/mlx5_en/en.h
  projects/runtime-coverage/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
  projects/runtime-coverage/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c
  projects/runtime-coverage/sys/dev/mlx5/mlx5_en/mlx5_en_tx.c
  projects/runtime-coverage/sys/dev/mpr/mpr.c
  projects/runtime-coverage/sys/dev/mps/mps.c
  projects/runtime-coverage/sys/dev/mwl/if_mwl.c
  projects/runtime-coverage/sys/dev/netmap/netmap_generic.c
  projects/runtime-coverage/sys/dev/ntb/ntb_hw/ntb_hw_plx.c
  projects/runtime-coverage/sys/dev/ofw/ofw_bus_subr.h
  projects/runtime-coverage/sys/dev/pccbb/pccbb_isa.c
  projects/runtime-coverage/sys/dev/pci/pci.c
  projects/runtime-coverage/sys/dev/psci/psci.c
  projects/runtime-coverage/sys/dev/qlxgbe/ql_hw.c
  projects/runtime-coverage/sys/dev/qlxgbe/ql_os.c
  projects/runtime-coverage/sys/dev/random/fortuna.c
  projects/runtime-coverage/sys/dev/random/random_harvestq.c
  projects/runtime-coverage/sys/dev/random/randomdev.c
  projects/runtime-coverage/sys/dev/smbus/smb.c
  projects/runtime-coverage/sys/dev/smbus/smbconf.h
  projects/runtime-coverage/sys/dev/usb/net/if_smsc.c
  projects/runtime-coverage/sys/dev/wb/if_wb.c
  projects/runtime-coverage/sys/fs/cd9660/cd9660_vnops.c
  projects/runtime-coverage/sys/fs/cuse/cuse.c
  projects/runtime-coverage/sys/fs/cuse/cuse_defs.h
  projects/runtime-coverage/sys/fs/nfs/nfs_var.h
  projects/runtime-coverage/sys/fs/nfs/nfsproto.h
  projects/runtime-coverage/sys/fs/nfsclient/nfs_clrpcops.c
  projects/runtime-coverage/sys/fs/nfsclient/nfs_clstate.c
  projects/runtime-coverage/sys/fs/tmpfs/tmpfs_vnops.c
  projects/runtime-coverage/sys/fs/udf/udf_vnops.c
  projects/runtime-coverage/sys/geom/geom_disk.h
  projects/runtime-coverage/sys/geom/geom_subr.c
  projects/runtime-coverage/sys/geom/mountver/g_mountver.c
  projects/runtime-coverage/sys/geom/mountver/g_mountver.h
  projects/runtime-coverage/sys/i386/i386/machdep.c
  projects/runtime-coverage/sys/i386/i386/swtch.s
  projects/runtime-coverage/sys/i386/i386/sys_machdep.c
  projects/runtime-coverage/sys/i386/include/md_var.h
  projects/runtime-coverage/sys/kern/kern_linker.c
  projects/runtime-coverage/sys/kern/kern_mbuf.c
  projects/runtime-coverage/sys/kern/kern_proc.c
  projects/runtime-coverage/sys/kern/kern_rwlock.c
  projects/runtime-coverage/sys/kern/kern_sendfile.c
  projects/runtime-coverage/sys/kern/kern_sx.c
  projects/runtime-coverage/sys/kern/kern_sysctl.c
  projects/runtime-coverage/sys/kern/subr_blist.c
  projects/runtime-coverage/sys/kern/subr_bus.c
  projects/runtime-coverage/sys/kern/subr_eventhandler.c
  projects/runtime-coverage/sys/kern/subr_gtaskqueue.c
  projects/runtime-coverage/sys/kern/subr_mbpool.c
  projects/runtime-coverage/sys/kern/subr_sleepqueue.c
  projects/runtime-coverage/sys/kern/subr_stack.c
  projects/runtime-coverage/sys/kern/uipc_mbuf.c
  projects/runtime-coverage/sys/kern/uipc_shm.c
  projects/runtime-coverage/sys/kern/uipc_usrreq.c
  projects/runtime-coverage/sys/kern/vfs_cache.c
  projects/runtime-coverage/sys/kern/vfs_export.c
  projects/runtime-coverage/sys/modules/Makefile
  projects/runtime-coverage/sys/modules/cloudabi32/Makefile
  projects/runtime-coverage/sys/modules/cxgbe/t4_firmware/Makefile
  projects/runtime-coverage/sys/modules/cxgbe/t5_firmware/Makefile
  projects/runtime-coverage/sys/modules/cxgbe/t6_firmware/Makefile
  projects/runtime-coverage/sys/modules/efirt/Makefile
  projects/runtime-coverage/sys/modules/em/Makefile
  projects/runtime-coverage/sys/modules/iwmfw/Makefile
  projects/runtime-coverage/sys/modules/zfs/Makefile
  projects/runtime-coverage/sys/net/iflib.c
  projects/runtime-coverage/sys/net/iflib.h
  projects/runtime-coverage/sys/netinet/sctp_input.c
  projects/runtime-coverage/sys/netinet/tcp_syncache.c
  projects/runtime-coverage/sys/netinet/tcp_timer.c
  projects/runtime-coverage/sys/netinet/tcp_timer.h
  projects/runtime-coverage/sys/netinet/tcp_timewait.c
  projects/runtime-coverage/sys/netinet6/send.c
  projects/runtime-coverage/sys/netpfil/ipfw/ip_fw2.c
  projects/runtime-coverage/sys/powerpc/include/intr_machdep.h
  projects/runtime-coverage/sys/sys/blist.h
  projects/runtime-coverage/sys/sys/disk.h
  projects/runtime-coverage/sys/sys/efi.h
  projects/runtime-coverage/sys/sys/eventhandler.h
  projects/runtime-coverage/sys/sys/lock.h
  projects/runtime-coverage/sys/sys/mbpool.h
  projects/runtime-coverage/sys/sys/mbuf.h
  projects/runtime-coverage/sys/sys/param.h
  projects/runtime-coverage/sys/sys/random.h
  projects/runtime-coverage/sys/sys/sockbuf.h
  projects/runtime-coverage/sys/sys/socketvar.h
  projects/runtime-coverage/sys/sys/stack.h
  projects/runtime-coverage/sys/sys/sysctl.h
  projects/runtime-coverage/sys/sys/unpcb.h
  projects/runtime-coverage/sys/vm/swap_pager.c
  projects/runtime-coverage/tests/sys/Makefile
  projects/runtime-coverage/tests/sys/geom/class/eli/resize_test.sh
  projects/runtime-coverage/tools/build/mk/OptionalObsoleteFiles.inc
  projects/runtime-coverage/tools/tools/nanobsd/dhcpd/common
  projects/runtime-coverage/tools/tools/nanobsd/embedded/common
  projects/runtime-coverage/tools/tools/nanobsd/gateworks/common
  projects/runtime-coverage/usr.bin/Makefile
  projects/runtime-coverage/usr.bin/bluetooth/btsockstat/btsockstat.c
  projects/runtime-coverage/usr.bin/chpass/chpass.c
  projects/runtime-coverage/usr.bin/hexdump/tests/hexdump_test.sh
  projects/runtime-coverage/usr.bin/lock/lock.c
  projects/runtime-coverage/usr.bin/netstat/inet.c
  projects/runtime-coverage/usr.bin/netstat/netgraph.c
  projects/runtime-coverage/usr.bin/netstat/unix.c
  projects/runtime-coverage/usr.bin/patch/pch.c
  projects/runtime-coverage/usr.bin/procstat/procstat.1
  projects/runtime-coverage/usr.bin/procstat/procstat_files.c
  projects/runtime-coverage/usr.bin/sockstat/sockstat.c
  projects/runtime-coverage/usr.bin/systat/netstat.c
  projects/runtime-coverage/usr.sbin/bsdinstall/scripts/hardening
  projects/runtime-coverage/usr.sbin/cxgbetool/cxgbetool.c
  projects/runtime-coverage/usr.sbin/diskinfo/diskinfo.8
  projects/runtime-coverage/usr.sbin/diskinfo/diskinfo.c
  projects/runtime-coverage/usr.sbin/freebsd-update/freebsd-update.sh
  projects/runtime-coverage/usr.sbin/mountd/mountd.c
  projects/runtime-coverage/usr.sbin/ppp/auth.c
  projects/runtime-coverage/usr.sbin/tcpdump/tcpdump/Makefile
  projects/runtime-coverage/usr.sbin/tcpdump/tcpdump/config.h
Directory Properties:
  projects/runtime-coverage/   (props changed)
  projects/runtime-coverage/cddl/   (props changed)
  projects/runtime-coverage/cddl/contrib/opensolaris/   (props changed)
  projects/runtime-coverage/cddl/contrib/opensolaris/cmd/zdb/   (props changed)
  projects/runtime-coverage/cddl/contrib/opensolaris/cmd/zfs/   (props changed)
  projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/   (props changed)
  projects/runtime-coverage/contrib/mdocml/   (props changed)
  projects/runtime-coverage/contrib/tcpdump/   (props changed)
  projects/runtime-coverage/gnu/usr.bin/binutils/   (props changed)
  projects/runtime-coverage/sys/cddl/contrib/opensolaris/   (props changed)

Modified: projects/runtime-coverage/Makefile
==============================================================================

--- projects/runtime-coverage/Makefile	Tue Oct 10 06:20:55 2017	(r324482)
+++ projects/runtime-coverage/Makefile	Tue Oct 10 06:26:12 2017	(r324483)
@@ -435,7 +435,7 @@ worlds: .PHONY
 .if make(universe) || make(universe_kernels) || make(tinderbox) || make(targets)
 TARGETS?=amd64 arm arm64 i386 mips powerpc riscv sparc64
 _UNIVERSE_TARGETS=	${TARGETS}
-TARGET_ARCHES_arm?=	arm armeb armv6
+TARGET_ARCHES_arm?=	arm armeb armv6 armv7
 TARGET_ARCHES_arm64?=	aarch64
 TARGET_ARCHES_mips?=	mipsel mips mips64el mips64 mipsn32 mipselhf mipshf mips64elhf mips64hf
 TARGET_ARCHES_powerpc?=	powerpc powerpc64 powerpcspe

Modified: projects/runtime-coverage/Makefile.inc1
==============================================================================
--- projects/runtime-coverage/Makefile.inc1	Tue Oct 10 06:20:55 2017	(r324482)
+++ projects/runtime-coverage/Makefile.inc1	Tue Oct 10 06:26:12 2017	(r324483)
@@ -398,6 +398,7 @@ KNOWN_ARCHES?=	aarch64/arm64 \
 		arm \
 		armeb/arm \
 		armv6/arm \
+		armv7/arm \
 		i386 \
 		mips \
 		mipsel/mips \
@@ -615,7 +616,7 @@ BFLAGS+=	-B${CROSS_BINUTILS_PREFIX}
 BFLAGS+=	-B${WORLDTMP}/usr/bin
 .endif
 .if ${TARGET} == "arm"
-.if ${TARGET_ARCH:Marmv6*} != "" && ${TARGET_CPUTYPE:M*soft*} == ""
+.if ${TARGET_ARCH:Marmv[67]*} != "" && ${TARGET_CPUTYPE:M*soft*} == ""
 TARGET_ABI=	gnueabihf
 .else
 TARGET_ABI=	gnueabi
@@ -651,7 +652,7 @@ XCFLAGS+=	${BFLAGS}
     ${TARGET_ARCH} == "powerpc64" || ${TARGET_ARCH:Mmips64*} != "")
 LIBCOMPAT= 32
 .include "Makefile.libcompat"
-.elif ${MK_LIBSOFT} != "no" && ${TARGET_ARCH} == "armv6"
+.elif ${MK_LIBSOFT} != "no" && ${TARGET_ARCH:Marmv[67]*} != ""
 LIBCOMPAT= SOFT
 .include "Makefile.libcompat"
 .endif
@@ -1359,6 +1360,10 @@ BUILDKERNELS+= dummy
 BUILDKERNELS+=	${_kernel}
 .if empty(INSTALLKERNEL) && !defined(NO_INSTALLKERNEL)
 INSTALLKERNEL= ${_kernel}
+.endif
+.else
+.if make(buildkernel)
+.error Missing KERNCONF ${KERNCONFDIR}/${_kernel}
 .endif
 .endif
 .endfor

Modified: projects/runtime-coverage/Makefile.libcompat
==============================================================================
--- projects/runtime-coverage/Makefile.libcompat	Tue Oct 10 06:20:55 2017	(r324482)
+++ projects/runtime-coverage/Makefile.libcompat	Tue Oct 10 06:26:12 2017	(r324483)
@@ -59,10 +59,10 @@ LIB32WMAKEFLAGS+=	-DCOMPAT_32BIT
 
 # -------------------------------------------------------------------
 # soft-fp world
-.if ${TARGET_ARCH} == "armv6"
+.if ${TARGET_ARCH:Marmv[67]*} != ""
 LIBSOFTCFLAGS=        -DCOMPAT_SOFTFP
 LIBSOFTCPUFLAGS= -mfloat-abi=softfp
-LIBSOFTWMAKEENV= CPUTYPE=soft MACHINE=arm MACHINE_ARCH=armv6
+LIBSOFTWMAKEENV= CPUTYPE=soft MACHINE=arm MACHINE_ARCH=${TARGET_ARCH}
 LIBSOFTWMAKEFLAGS=        -DCOMPAT_SOFTFP
 .endif
 

Modified: projects/runtime-coverage/ObsoleteFiles.inc
==============================================================================
--- projects/runtime-coverage/ObsoleteFiles.inc	Tue Oct 10 06:20:55 2017	(r324482)
+++ projects/runtime-coverage/ObsoleteFiles.inc	Tue Oct 10 06:26:12 2017	(r324483)
@@ -38,6 +38,23 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20161010: Remove libstand
+OLD_FILES+=usr/lib/libstand.a
+OLD_FILES+=usr/lib/libstand_p.a
+OLD_FILES+=usr/include/stand.h
+OLD_FILES+=usr/share/man/man3/libstand.3
+# 20171003: remove RCMDS
+OLD_FILES+=bin/rcp
+OLD_FILES+=rescue/rcp
+OLD_FILES+=usr/bin/rlogin
+OLD_FILES+=usr/bin/rsh
+OLD_FILES+=usr/libexec/rlogind
+OLD_FILES+=usr/libexec/rshd
+OLD_FILES+=usr/share/man/man1/rcp.1.gz
+OLD_FILES+=usr/share/man/man1/rlogin.1.gz
+OLD_FILES+=usr/share/man/man1/rsh.1.gz
+OLD_FILES+=usr/share/man/man8/rlogind.8.gz
+OLD_FILES+=usr/share/man/man8/rshd.8.gz
 # 20170927: crshared
 OLD_FILES+=usr/share/man/man9/crshared.9.gz
 # 20170927: procctl

Modified: projects/runtime-coverage/UPDATING
==============================================================================
--- projects/runtime-coverage/UPDATING	Tue Oct 10 06:20:55 2017	(r324482)
+++ projects/runtime-coverage/UPDATING	Tue Oct 10 06:26:12 2017	(r324483)
@@ -51,6 +51,23 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW:
 
 ****************************** SPECIAL WARNING: ******************************
 
+20171010:
+	libstand has turned into a private library for sys/boot use only.
+	It is no longer supported as a public interface outside of sys/boot.
+
+20171005:
+	The arm port has split armv6 into armv6 and armv7. armv7 is now
+	a valid TARGET_ARCH/MACHINE_ARCH setting. If you have an armv7 system
+	and are running a kernel from before r324363, you will need to add
+	MACHINE_ARCH=armv7 to 'make buildworld' to do a native build.
+
+20171003:
+	When building multiple kernels using KERNCONF, non-existent KERNCONF
+	files will produce an error and buildkernel will fail. Previously
+	missing KERNCONF files silently failed giving no indication as to
+	why, only to subsequently discover during installkernel that the
+	desired kernel was never built in the first place.
+
 20170912:
 	The default serial number format for CTL LUNs has changed.  This will
 	affect users who use /dev/diskid/* device nodes, or whose FibreChannel

Modified: projects/runtime-coverage/bin/Makefile
==============================================================================
--- projects/runtime-coverage/bin/Makefile	Tue Oct 10 06:20:55 2017	(r324482)
+++ projects/runtime-coverage/bin/Makefile	Tue Oct 10 06:26:12 2017	(r324483)
@@ -40,7 +40,6 @@ SUBDIR= cat \
 	test \
 	uuidgen
 
-SUBDIR.${MK_RCMDS}+=	rcp
 SUBDIR.${MK_SENDMAIL}+=	rmail
 SUBDIR.${MK_TCSH}+=	csh
 SUBDIR.${MK_TESTS}+=	tests

Modified: projects/runtime-coverage/bin/ps/keyword.c
==============================================================================
--- projects/runtime-coverage/bin/ps/keyword.c	Tue Oct 10 06:20:55 2017	(r324482)
+++ projects/runtime-coverage/bin/ps/keyword.c	Tue Oct 10 06:26:12 2017	(r324483)
@@ -199,7 +199,8 @@ static VAR var[] = {
 	{"tdaddr", "TDADDR", NULL, "thread-address", 0, kvar, KOFF(ki_tdaddr),
 	    KPTR, "lx", 0},
 	{"tdev", "TDEV", NULL, "terminal-device", 0, tdev, 0, CHAR, NULL, 0},
-	{"tdnam", "TDNAM", NULL, "terminal-device-name", LJUST, tdnam, 0, CHAR,
+	{"tdnam", "", "tdname", NULL, 0, NULL, 0, CHAR, NULL, 0},
+	{"tdname", "TDNAME", NULL, "thread-name", LJUST, tdnam, 0, CHAR,
 	    NULL, 0},
 	{"time", "TIME", NULL, "cpu-time", USER, cputime, 0, CHAR, NULL, 0},
 	{"tpgid", "TPGID", NULL, "terminal-process-gid", 0, kvar,

Modified: projects/runtime-coverage/bin/ps/ps.1
==============================================================================
--- projects/runtime-coverage/bin/ps/ps.1	Tue Oct 10 06:20:55 2017	(r324482)
+++ projects/runtime-coverage/bin/ps/ps.1	Tue Oct 10 06:26:12 2017	(r324483)
@@ -29,7 +29,7 @@
 .\"     @(#)ps.1	8.3 (Berkeley) 4/18/94
 .\" $FreeBSD$
 .\"
-.Dd September 7, 2017
+.Dd October 9, 2017
 .Dt PS 1
 .Os
 .Sh NAME
@@ -675,6 +675,8 @@ saved UID from a setuid executable
 accumulated system CPU time
 .It Cm tdaddr
 thread address
+.It Cm tdname
+thread name
 .It Cm tdev
 control terminal device number
 .It Cm time

Modified: projects/runtime-coverage/bin/ps/ps.c
==============================================================================
--- projects/runtime-coverage/bin/ps/ps.c	Tue Oct 10 06:20:55 2017	(r324482)
+++ projects/runtime-coverage/bin/ps/ps.c	Tue Oct 10 06:26:12 2017	(r324483)
@@ -523,7 +523,11 @@ main(int argc, char *argv[])
 	 */
 	nentries = -1;
 	kp = kvm_getprocs(kd, what, flag, &nentries);
-	if ((kp == NULL && nentries > 0) || (kp != NULL && nentries < 0))
+	/*
+	 * Ignore ESRCH to preserve behaviour of "ps -p nonexistent-pid"
+	 * not reporting an error.
+	 */
+	if ((kp == NULL && errno != ESRCH) || (kp != NULL && nentries < 0))
 		xo_errx(1, "%s", kvm_geterr(kd));
 	nkept = 0;
 	if (nentries > 0) {

Modified: projects/runtime-coverage/cddl/contrib/opensolaris/cmd/zdb/zdb.8
==============================================================================
--- projects/runtime-coverage/cddl/contrib/opensolaris/cmd/zdb/zdb.8	Tue Oct 10 06:20:55 2017	(r324482)
+++ projects/runtime-coverage/cddl/contrib/opensolaris/cmd/zdb/zdb.8	Tue Oct 10 06:26:12 2017	(r324483)
@@ -1,6 +1,3 @@
-'\" te
-.\" Copyright (c) 2012, Martin Matuska <mm at FreeBSD.org>.
-.\" All Rights Reserved.
 .\"
 .\" This file and its contents are supplied under the terms of the
 .\" Common Development and Distribution License ("CDDL"), version 1.0.
@@ -13,71 +10,75 @@
 .\"
 .\"
 .\" Copyright 2012, Richard Lowe.
-.\" Copyright (c) 2012, Marcelo Araujo <araujo at FreeBSD.org>.
-.\" Copyright (c) 2012, 2014 by Delphix. All rights reserved.
-.\" All Rights Reserved.
+.\" Copyright (c) 2012, 2017 by Delphix. All rights reserved.
+.\" Copyright 2017 Nexenta Systems, Inc.
 .\"
-.\" $FreeBSD$
-.\"
-.Dd July 26, 2014
+.Dd October 06, 2017
 .Dt ZDB 8
 .Os
 .Sh NAME
 .Nm zdb
-.Nd Display zpool debugging and consistency information
+.Nd display zpool debugging and consistency information
 .Sh SYNOPSIS
 .Nm
-.Op Fl CumdibcsDvhLMXFPA
-.Op Fl e Op Fl p Ar path...
+.Op Fl AbcdDFGhiLMPsvX
+.Op Fl e Oo Fl V Oc Op Fl p Ar path ...
+.Op Fl I Ar inflight I/Os
+.Oo Fl o Ar var Ns = Ns Ar value Oc Ns ...
 .Op Fl t Ar txg
 .Op Fl U Ar cache
-.Op Fl I Ar inflight I/Os
 .Op Fl x Ar dumpdir
-.Ar poolname
-.Op Ar object ...
+.Op Ar poolname Op Ar object ...
 .Nm
-.Op Fl divPA
-.Op Fl e Op Fl p Ar path...
+.Op Fl AdiPv
+.Op Fl e Oo Fl V Oc Op Fl p Ar path ...
 .Op Fl U Ar cache
-.Ar dataset
-.Op Ar object ...
+.Ar dataset Op Ar object ...
 .Nm
-.Fl m Op Fl MLXFPA
+.Fl C
+.Op Fl A
+.Op Fl U Ar cache
+.Nm
+.Fl E
+.Op Fl A
+.Ar word0 Ns \&: Ns Ar word1 Ns :...: Ns Ar word15
+.Nm
+.Fl l
+.Op Fl Aqu
+.Ar device
+.Nm
+.Fl m
+.Op Fl AFLPX
+.Op Fl e Oo Fl V Oc Op Fl p Ar path ...
 .Op Fl t Ar txg
-.Op Fl e Op Fl p Ar path...
 .Op Fl U Ar cache
-.Ar poolname
+.Ar poolname Op Ar vdev Op Ar metaslab ...
 .Nm
-.Fl R Op Fl A
-.Op Fl e Op Fl p Ar path...
+.Fl O
+.Ar dataset path
+.Nm
+.Fl R
+.Op Fl A
+.Op Fl e Oo Fl V Oc Op Fl p Ar path ...
 .Op Fl U Ar cache
-.Ar poolname
-.Ar poolname
-.Ar vdev Ns : Ns Ar offset Ns : Ns Ar size Ns Op Ns : Ns Ar flags
+.Ar poolname vdev Ns \&: Ns Ar offset Ns \&: Ns Ar size Ns Op : Ns Ar flags
 .Nm
 .Fl S
 .Op Fl AP
-.Op Fl e Op Fl p Ar path...
+.Op Fl e Oo Fl V Oc Op Fl p Ar path ...
 .Op Fl U Ar cache
 .Ar poolname
-.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
-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.
+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
+.Pq and facilities
+may change.
 This is neither a
 .Xr fsck 8
-nor a
+nor an
 .Xr fsdb 8
 utility.
 .Pp
@@ -89,74 +90,97 @@ internals is assumed.
 If the
 .Ar dataset
 argument does not contain any
-.Sy /
+.Qq Sy /
 or
-.Sy @
+.Qq Sy @
 characters, it is interpreted as a pool name.
 The root dataset can be specified as
-.Pa pool Ns Sy /
-(pool name followed by a slash).
+.Ar pool Ns /
+.Pq pool name followed by a slash .
 .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
+.Bl -tag -width Ds
 .It Fl b
-Display statistics regarding the number, size (logical, physical and
-allocated) and deduplication of blocks.
+Display statistics regarding the number, size
+.Pq 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 ).
+.Po see
+.Fl b
+.Pc .
 .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
-.Po Pa /etc/zfs/zpool.cache Pc .
+Display information about the configuration.
+If specified with no other options, instead display information about the cache
+file
+.Pq Pa /boot/zfs/zpool.cache .
 To specify the cache file to display, see
-.Fl U
+.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, 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.
+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.
+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.
+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.
-.Pp
-If specified a third time, display the statistics independently for each deduplication table.
-.Pp
-If specified a fourth time, dump the contents of the deduplication tables describing duplicate blocks.
-.Pp
-If specified a fifth time, also dump the contents of the deduplication tables describing unique blocks.
+Display deduplication statistics, including the deduplication ratio
+.Pq Sy dedup ,
+compression ratio
+.Pq Sy compress ,
+inflation due to the zfs copies property
+.Pq Sy copies ,
+and an overall effective ratio
+.Pq Sy dedup No * Sy compress No / Sy copies .
+.It Fl DD
+Display a histogram of deduplication statistics, showing the allocated
+.Pq physically present on disk
+and referenced
+.Pq logically referenced in the pool
+block counts and sizes by reference count.
+.It Fl DDD
+Display the statistics independently for each deduplication table.
+.It Fl DDDD
+Dump the contents of the deduplication tables describing duplicate blocks.
+.It Fl DDDDD
+Also dump the contents of the deduplication tables describing unique blocks.
+.It Fl E Ar word0 Ns \&: Ns Ar word1 Ns :...: Ns Ar word15
+Decode and display block from an embedded block pointer specified by the
+.Ar word
+arguments.
 .It Fl h
 Display pool history similar to
-.Cm zpool history ,
+.Nm zpool Cm 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.
+Display information about intent log
+.Pq 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.
+Read the vdev labels from the specified device.
+.Nm Fl l
+will return 0 if valid label was found, 1 if error occurred, and 2 if no valid
+labels were found.
+.Pp
 If the
+.Fl q
+option is also specified, don't print the labels.
+.Pp
+If the
 .Fl u
 option is also specified, also display the uberblocks on this device.
 .It Fl L
@@ -166,36 +190,55 @@ By default,
 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 on-disk free
-space histogram associated with each metaslab. When specified three time,
-display the maximum contiguous free space, the in-core free space histogram,
-and the percentage of free space in each space map.  When specified
-four times display every spacemap record.
+.It Fl mm
+Also display information about the on-disk free space histogram associated with
+each metaslab.
+.It Fl mmm
+Display the maximum contiguous free space, the in-core free space histogram, and
+the percentage of free space in each space map.
+.It Fl mmmm
+Display every spacemap record.
 .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 Fl MM
+Also display information about the maximum contiguous free space and the
+percentage of free space in each space map.
+.It Fl MMM
+Display every spacemap record.
+.It Fl O Ar dataset path
+Look up the specified
+.Ar path
+inside of the
+.Ar dataset
+and display its metadata and indirect blocks.
+Specified
+.Ar path
+must be relative to the root of
+.Ar dataset .
+This option can be combined with
+.Fl v
+for increasing verbosity.
 .It Xo
-.Fl R Ar poolname
-.Ar vdev Ns : Ns Ar offset Ns : Ns Ar size Ns Op Ns : Ns Ar flags
+.Fl R Ar poolname vdev Ns \&: Ns Ar offset Ns \&: Ns Ar size Ns Op : 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
+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
+.Sy r
 flag, below.
 .Pp
 The block is specified in terms of a colon-separated tuple
 .Ar vdev
-(an integer vdev identifier)
+.Pq an integer vdev identifier
 .Ar offset
-(the offset within the vdev)
+.Pq the offset within the vdev
 .Ar size
-(the size of the block to read) and, optionally,
+.Pq 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
+.Pq a set of flags, described below .
+.Pp
+.Bl -tag -compact -width "b offset"
+.It Sy b Ar offset
 Print block pointer
 .It Sy d
 Decompress the block
@@ -210,19 +253,20 @@ Dump raw uninterpreted block data
 .El
 .It Fl s
 Report statistics on
-.Nm Ns 's
+.Nm zdb
 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.
+that DDT as with
+.Fl DD .
 .It Fl u
 Display the current uberblock.
 .El
 .Pp
 Other options:
-.Bl -tag -width indent
+.Bl -tag -width Ds
 .It Fl A
 Do not abort should any assertion fail.
 .It Fl AA
@@ -230,28 +274,41 @@ Enable panic recovery, certain errors which would othe
 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...
+.It Fl e Op Fl p Ar path ...
 Operate on an exported pool, not present in
-.Pa /etc/zfs/zpool.cache .
+.Pa /boot/zfs/zpool.cache .
 The
 .Fl p
 flag specifies the path under which devices are to be searched.
 .It Fl x Ar dumpdir
 All blocks accessed will be copied to files in the specified directory.
 The blocks will be placed in sparse files whose name is the same as
-that of the file or device read.  zdb can be then run on the generated files.
+that of the file or device read.
+.Nm
+can be then run on the generated files.
 Note that the
 .Fl bbc
-flags are sufficient to access (and thus copy)
+flags are sufficient to access
+.Pq and thus copy
 all metadata on the pool.
 .It Fl F
 Attempt to make an unreadable pool readable by trying progressively older
 transactions.
+.It Fl G
+Dump the contents of the zfs_dbgmsg buffer before exiting
+.Nm .
+zfs_dbgmsg is a buffer used by ZFS to dump advanced debug information.
 .It Fl I Ar inflight I/Os
 Limit the number of outstanding checksum I/Os to the specified value.
-The default value is 200. This option affects the performance of the
+The default value is 200.
+This option affects the performance of the
 .Fl c
 option.
+.It Fl o Ar var Ns = Ns Ar value ...
+Set the given global libzpool variable to the provided value.
+The value must be an unsigned 32-bit integer.
+Currently only little-endian systems are supported to avoid accidentally setting
+the high 32 bits of 64-bit variables.
 .It Fl P
 Print numbers in an unscaled form more amenable to parsing, eg. 1000000 rather
 than 1M.
@@ -269,9 +326,14 @@ Use a cache file other than
 .It Fl v
 Enable verbosity.
 Specify multiple times for increased verbosity.
+.It Fl V
+Attempt verbatim import.
+This mimics the behavior of the kernel when loading a pool from a cachefile.
+Only usable with
+.Fl e .
 .It Fl X
 Attempt
-.Ql extreme
+.Qq extreme
 transaction rewind, that is attempt the same recovery as
 .Fl F
 but read transactions otherwise deemed too old.
@@ -283,46 +345,58 @@ option, with more occurrences enabling more verbosity.
 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
+.Bl -tag -width Ds
+.It Xo
+.Sy Example 1
+Display the configuration of imported pool
+.Pa rpool
+.Xc
+.Bd -literal
+# 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
+.It Xo
+.Sy Example 2
+Display basic dataset information about
+.Pa rpool
+.Xc
+.Bd -literal
+# 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'
+.It Xo
+.Sy Example 3
+Display basic information about object 0 in
+.Pa rpool/export/home
 .Xc
-.Bd -literal -offset 2n
-.Li # Ic zdb -d rpool/export/home 0
+.Bd -literal
+# 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'
+.It Xo
+.Sy Example 4
+Display the predicted effect of enabling deduplication on
+.Pa rpool
 .Xc
-.Bd -literal -offset 2n
-.Li # Ic zdb -S rpool
+.Bd -literal
+# 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
+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
@@ -330,22 +404,3 @@ dedup = 1.11, compress = 1.80, copies = 1.00, dedup * 
 .Sh SEE ALSO
 .Xr zfs 8 ,
 .Xr zpool 8
-.Sh AUTHORS
-This manual page is a
-.Xr mdoc 7
-reimplementation of the
-.Tn illumos
-manual page
-.Em zdb(1M) ,
-modified and customized for
-.Fx
-and licensed under the
-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
-and
-.An Marcelo Araujo Aq araujo at FreeBSD.org .

Modified: projects/runtime-coverage/cddl/contrib/opensolaris/cmd/zdb/zdb.c
==============================================================================
--- projects/runtime-coverage/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Tue Oct 10 06:20:55 2017	(r324482)
+++ projects/runtime-coverage/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Tue Oct 10 06:26:12 2017	(r324483)
@@ -23,6 +23,7 @@
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2011, 2016 by Delphix. All rights reserved.
  * Copyright (c) 2014 Integros [integros.com]
+ * Copyright 2017 Nexenta Systems, Inc.
  */
 
 #include <stdio.h>
@@ -60,6 +61,7 @@
 #include <sys/ddt.h>
 #include <sys/zfeature.h>
 #include <sys/abd.h>
+#include <sys/blkptr.h>
 #include <zfs_comutil.h>
 #undef verify
 #include <libzfs.h>
@@ -120,18 +122,24 @@ static void
 usage(void)
 {
 	(void) fprintf(stderr,
-	    "Usage: %s [-CumMdibcsDvhLXFPAG] [-t txg] [-e [-p path...]] "
-	    "[-U config] [-I inflight I/Os] [-x dumpdir] poolname [object...]\n"
-	    "       %s [-divPA] [-e -p path...] [-U config] dataset "
-	    "[object...]\n"
-	    "       %s -mM [-LXFPA] [-t txg] [-e [-p path...]] [-U config] "
-	    "poolname [vdev [metaslab...]]\n"
-	    "       %s -R [-A] [-e [-p path...]] poolname "
-	    "vdev:offset:size[:flags]\n"
-	    "       %s -S [-PA] [-e [-p path...]] [-U config] poolname\n"
-	    "       %s -l [-uA] device\n"
-	    "       %s -C [-A] [-U config]\n\n",
-	    cmdname, cmdname, cmdname, cmdname, cmdname, cmdname, cmdname);
+	    "Usage:\t%s [-AbcdDFGhiLMPsvX] [-e [-V] [-p <path> ...]] "
+	    "[-I <inflight I/Os>]\n"
+	    "\t\t[-o <var>=<value>]... [-t <txg>] [-U <cache>] [-x <dumpdir>]\n"
+	    "\t\t[<poolname> [<object> ...]]\n"
+	    "\t%s [-AdiPv] [-e [-V] [-p <path> ...]] [-U <cache>] <dataset> "
+	    "[<object> ...]\n"
+	    "\t%s -C [-A] [-U <cache>]\n"
+	    "\t%s -l [-Aqu] <device>\n"
+	    "\t%s -m [-AFLPX] [-e [-V] [-p <path> ...]] [-t <txg>] "
+	    "[-U <cache>]\n\t\t<poolname> [<vdev> [<metaslab> ...]]\n"
+	    "\t%s -O <dataset> <path>\n"
+	    "\t%s -R [-A] [-e [-V] [-p <path> ...]] [-U <cache>]\n"
+	    "\t\t<poolname> <vdev>:<offset>:<size>[:<flags>]\n"
+	    "\t%s -E [-A] word0:word1:...:word15\n"
+	    "\t%s -S [-AP] [-e [-V] [-p <path> ...]] [-U <cache>] "
+	    "<poolname>\n\n",
+	    cmdname, cmdname, cmdname, cmdname, cmdname, cmdname, cmdname,
+	    cmdname, cmdname);
 
 	(void) fprintf(stderr, "    Dataset name must include at least one "
 	    "separator character '/' or '@'\n");
@@ -140,49 +148,57 @@ usage(void)
 	(void) fprintf(stderr, "    If object numbers are specified, only "
 	    "those objects are dumped\n\n");
 	(void) fprintf(stderr, "    Options to control amount of output:\n");
-	(void) fprintf(stderr, "        -u uberblock\n");
-	(void) fprintf(stderr, "        -d dataset(s)\n");
-	(void) fprintf(stderr, "        -i intent logs\n");
-	(void) fprintf(stderr, "        -C config (or cachefile if alone)\n");
-	(void) fprintf(stderr, "        -h pool history\n");
 	(void) fprintf(stderr, "        -b block statistics\n");
-	(void) fprintf(stderr, "        -m metaslabs\n");
-	(void) fprintf(stderr, "        -M metaslab groups\n");
 	(void) fprintf(stderr, "        -c checksum all metadata (twice for "
 	    "all data) blocks\n");
-	(void) fprintf(stderr, "        -s report stats on zdb's I/O\n");
+	(void) fprintf(stderr, "        -C config (or cachefile if alone)\n");
+	(void) fprintf(stderr, "        -d dataset(s)\n");
 	(void) fprintf(stderr, "        -D dedup statistics\n");
-	(void) fprintf(stderr, "        -S simulate dedup to measure effect\n");
-	(void) fprintf(stderr, "        -v verbose (applies to all others)\n");
-	(void) fprintf(stderr, "        -l dump label contents\n");
+	(void) fprintf(stderr, "        -E decode and display block from an "
+	    "embedded block pointer\n");
+	(void) fprintf(stderr, "        -h pool history\n");
+	(void) fprintf(stderr, "        -i intent logs\n");
+	(void) fprintf(stderr, "        -l read label contents\n");
 	(void) fprintf(stderr, "        -L disable leak tracking (do not "
 	    "load spacemaps)\n");
+	(void) fprintf(stderr, "        -m metaslabs\n");
+	(void) fprintf(stderr, "        -M metaslab groups\n");
+	(void) fprintf(stderr, "        -O perform object lookups by path\n");
 	(void) fprintf(stderr, "        -R read and display block from a "
-	    "device\n\n");
+	    "device\n");
+	(void) fprintf(stderr, "        -s report stats on zdb's I/O\n");
+	(void) fprintf(stderr, "        -S simulate dedup to measure effect\n");
+	(void) fprintf(stderr, "        -v verbose (applies to all "
+	    "others)\n\n");
 	(void) fprintf(stderr, "    Below options are intended for use "
 	    "with other options:\n");
 	(void) fprintf(stderr, "        -A ignore assertions (-A), enable "
 	    "panic recovery (-AA) or both (-AAA)\n");
-	(void) fprintf(stderr, "        -F attempt automatic rewind within "
-	    "safe range of transaction groups\n");
-	(void) fprintf(stderr, "        -U <cachefile_path> -- use alternate "
-	    "cachefile\n");
-	(void) fprintf(stderr, "        -X attempt extreme rewind (does not "
-	    "work with dataset)\n");
 	(void) fprintf(stderr, "        -e pool is exported/destroyed/"
 	    "has altroot/not in a cachefile\n");
+	(void) fprintf(stderr, "        -F attempt automatic rewind within "
+	    "safe range of transaction groups\n");
+	(void) fprintf(stderr, "        -G dump zfs_dbgmsg buffer before "
+	    "exiting\n");
+	(void) fprintf(stderr, "        -I <number of inflight I/Os> -- "
+	    "specify the maximum number of "
+	    "checksumming I/Os [default is 200]\n");
+	(void) fprintf(stderr, "        -o <variable>=<value> set global "
+	    "variable to an unsigned 32-bit integer value\n");
 	(void) fprintf(stderr, "        -p <path> -- use one or more with "
 	    "-e to specify path to vdev dir\n");
-	(void) fprintf(stderr, "        -x <dumpdir> -- "
-	    "dump all read blocks into specified directory\n");
 	(void) fprintf(stderr, "        -P print numbers in parseable form\n");
+	(void) fprintf(stderr, "        -q don't print label contents\n");
 	(void) fprintf(stderr, "        -t <txg> -- highest txg to use when "
 	    "searching for uberblocks\n");
-	(void) fprintf(stderr, "        -I <number of inflight I/Os> -- "
-	    "specify the maximum number of "
-	    "checksumming I/Os [default is 200]\n");
-	(void) fprintf(stderr, "        -G dump zfs_dbgmsg buffer before "
-	    "exiting\n");
+	(void) fprintf(stderr, "        -u uberblock\n");
+	(void) fprintf(stderr, "        -U <cachefile_path> -- use alternate "
+	    "cachefile\n");
+	(void) fprintf(stderr, "        -V do verbatim import\n");
+	(void) fprintf(stderr, "        -x <dumpdir> -- "
+	    "dump all read blocks into specified directory\n");
+	(void) fprintf(stderr, "        -X attempt extreme rewind (does not "
+	    "work with dataset)\n\n");
 	(void) fprintf(stderr, "Specify an option more than once (e.g. -bb) "
 	    "to make only that option verbose\n");
 	(void) fprintf(stderr, "Default is to dump everything non-verbosely\n");
@@ -1582,8 +1598,9 @@ dump_deadlist(dsl_deadlist_t *dl)
 	    dle = AVL_NEXT(&dl->dl_tree, dle)) {
 		if (dump_opt['d'] >= 5) {
 			char buf[128];
-			(void) snprintf(buf, sizeof (buf), "mintxg %llu -> "
-			    "obj %llu", (longlong_t)dle->dle_mintxg,
+			(void) snprintf(buf, sizeof (buf),
+			    "mintxg %llu -> obj %llu",
+			    (longlong_t)dle->dle_mintxg,
 			    (longlong_t)dle->dle_bpobj.bpo_object);
 			dump_full_bpobj(&dle->dle_bpobj, buf, 0);
 		} else {
@@ -1597,10 +1614,57 @@ dump_deadlist(dsl_deadlist_t *dl)
 static avl_tree_t idx_tree;
 static avl_tree_t domain_tree;
 static boolean_t fuid_table_loaded;
-static boolean_t sa_loaded;
-sa_attr_type_t *sa_attr_table;
+static objset_t *sa_os = NULL;
+static sa_attr_type_t *sa_attr_table = NULL;
 
+static int
+open_objset(const char *path, dmu_objset_type_t type, void *tag, objset_t **osp)
+{
+	int err;
+	uint64_t sa_attrs = 0;
+	uint64_t version = 0;
+
+	VERIFY3P(sa_os, ==, NULL);
+	err = dmu_objset_own(path, type, B_TRUE, tag, osp);
+	if (err != 0) {
+		(void) fprintf(stderr, "failed to own dataset '%s': %s\n", path,
+		    strerror(err));
+		return (err);
+	}
+
+	if (dmu_objset_type(*osp) == DMU_OST_ZFS) {
+		(void) zap_lookup(*osp, MASTER_NODE_OBJ, ZPL_VERSION_STR,
+		    8, 1, &version);
+		if (version >= ZPL_VERSION_SA) {
+			(void) zap_lookup(*osp, MASTER_NODE_OBJ, ZFS_SA_ATTRS,
+			    8, 1, &sa_attrs);
+		}
+		err = sa_setup(*osp, sa_attrs, zfs_attr_table, ZPL_END,
+		    &sa_attr_table);
+		if (err != 0) {
+			(void) fprintf(stderr, "sa_setup failed: %s\n",
+			    strerror(err));
+			dmu_objset_disown(*osp, tag);
+			*osp = NULL;
+		}
+	}
+	sa_os = *osp;
+
+	return (0);
+}
+
 static void
+close_objset(objset_t *os, void *tag)
+{
+	VERIFY3P(os, ==, sa_os);
+	if (os->os_sa != NULL)
+		sa_tear_down(os);
+	dmu_objset_disown(os, tag);
+	sa_attr_table = NULL;
+	sa_os = NULL;
+}
+
+static void
 fuid_table_destroy()
 {
 	if (fuid_table_loaded) {
@@ -1670,25 +1734,7 @@ dump_znode(objset_t *os, uint64_t object, void *data, 
 	int idx = 0;
 	int error;
 
-	if (!sa_loaded) {
-		uint64_t sa_attrs = 0;
-		uint64_t version;
-
-		VERIFY(zap_lookup(os, MASTER_NODE_OBJ, ZPL_VERSION_STR,
-		    8, 1, &version) == 0);
-		if (version >= ZPL_VERSION_SA) {
-			VERIFY(zap_lookup(os, MASTER_NODE_OBJ, ZFS_SA_ATTRS,
-			    8, 1, &sa_attrs) == 0);
-		}
-		if ((error = sa_setup(os, sa_attrs, zfs_attr_table,
-		    ZPL_END, &sa_attr_table)) != 0) {
-			(void) printf("sa_setup failed errno %d, can't "
-			    "display znode contents\n", error);
-			return;
-		}
-		sa_loaded = B_TRUE;
-	}
-
+	VERIFY3P(os, ==, sa_os);
 	if (sa_handle_get(os, object, NULL, SA_HDL_PRIVATE, &hdl)) {
 		(void) printf("Failed to get handle for SA znode\n");
 		return;
@@ -2156,44 +2202,154 @@ dump_label_uberblocks(vdev_label_t *lbl, uint64_t ashi
 	}
 }
 
-static void
+static char curpath[PATH_MAX];
+
+/*
+ * Iterate through the path components, recursively passing
+ * current one's obj and remaining path until we find the obj
+ * for the last one.
+ */
+static int
+dump_path_impl(objset_t *os, uint64_t obj, char *name)
+{
+	int err;
+	int header = 1;
+	uint64_t child_obj;
+	char *s;
+	dmu_buf_t *db;
+	dmu_object_info_t doi;
+
+	if ((s = strchr(name, '/')) != NULL)
+		*s = '\0';
+	err = zap_lookup(os, obj, name, 8, 1, &child_obj);
+
+	(void) strlcat(curpath, name, sizeof (curpath));
+
+	if (err != 0) {
+		(void) fprintf(stderr, "failed to lookup %s: %s\n",
+		    curpath, strerror(err));
+		return (err);
+	}
+
+	child_obj = ZFS_DIRENT_OBJ(child_obj);
+	err = sa_buf_hold(os, child_obj, FTAG, &db);
+	if (err != 0) {
+		(void) fprintf(stderr,
+		    "failed to get SA dbuf for obj %llu: %s\n",
+		    (u_longlong_t)child_obj, strerror(err));
+		return (EINVAL);
+	}
+	dmu_object_info_from_db(db, &doi);
+	sa_buf_rele(db, FTAG);
+
+	if (doi.doi_bonus_type != DMU_OT_SA &&
+	    doi.doi_bonus_type != DMU_OT_ZNODE) {
+		(void) fprintf(stderr, "invalid bonus type %d for obj %llu\n",
+		    doi.doi_bonus_type, (u_longlong_t)child_obj);
+		return (EINVAL);
+	}
+
+	if (dump_opt['v'] > 6) {
+		(void) printf("obj=%llu %s type=%d bonustype=%d\n",
+		    (u_longlong_t)child_obj, curpath, doi.doi_type,
+		    doi.doi_bonus_type);
+	}
+
+	(void) strlcat(curpath, "/", sizeof (curpath));
+
+	switch (doi.doi_type) {
+	case DMU_OT_DIRECTORY_CONTENTS:
+		if (s != NULL && *(s + 1) != '\0')
+			return (dump_path_impl(os, child_obj, s + 1));

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