svn commit: r269579 - in projects/sendfile: . bin/sh bin/sh/tests/builtins cddl/contrib/dtracetoolkit cddl/contrib/dtracetoolkit/Apps cddl/contrib/opensolaris/cmd/zdb cddl/contrib/opensolaris/cmd/z...

Gleb Smirnoff glebius at FreeBSD.org
Tue Aug 5 10:09:05 UTC 2014 

Author: glebius
Date: Tue Aug  5 10:08:59 2014
New Revision: 269579
URL: http://svnweb.freebsd.org/changeset/base/269579

Log:
  Merge head r258543 through r269578.

Added:
  projects/sendfile/bin/sh/tests/builtins/break6.0
     - copied unchanged from r269578, head/bin/sh/tests/builtins/break6.0
  projects/sendfile/contrib/libucl/tests/basic/11.in
     - copied unchanged from r269578, head/contrib/libucl/tests/basic/11.in
  projects/sendfile/contrib/libucl/tests/basic/11.res
     - copied unchanged from r269578, head/contrib/libucl/tests/basic/11.res
  projects/sendfile/lib/libc/arm/aeabi/aeabi_unwind_exidx.c
     - copied unchanged from r269578, head/lib/libc/arm/aeabi/aeabi_unwind_exidx.c
  projects/sendfile/lib/libmp/tests/
     - copied from r269578, head/lib/libmp/tests/
  projects/sendfile/lib/libstand/pkgfs.c
     - copied unchanged from r269578, head/lib/libstand/pkgfs.c
  projects/sendfile/share/examples/hwpmc/Makefile
     - copied unchanged from r269578, head/share/examples/hwpmc/Makefile
  projects/sendfile/share/examples/hwpmc/overhead.c
     - copied unchanged from r269578, head/share/examples/hwpmc/overhead.c
  projects/sendfile/share/man/man9/PCBGROUP.9
     - copied unchanged from r269578, head/share/man/man9/PCBGROUP.9
  projects/sendfile/sys/arm/conf/CHROMEBOOK-PEACH-PIT
     - copied unchanged from r269578, head/sys/arm/conf/CHROMEBOOK-PEACH-PIT
  projects/sendfile/sys/arm/conf/CHROMEBOOK-PEACH-PIT.hints
     - copied unchanged from r269578, head/sys/arm/conf/CHROMEBOOK-PEACH-PIT.hints
  projects/sendfile/sys/arm/freescale/imx/imx_i2c.c
     - copied unchanged from r269578, head/sys/arm/freescale/imx/imx_i2c.c
  projects/sendfile/sys/arm/samsung/exynos/chrome_ec_spi.c
     - copied unchanged from r269578, head/sys/arm/samsung/exynos/chrome_ec_spi.c
  projects/sendfile/sys/arm/samsung/exynos/exynos5_pmu.c
     - copied unchanged from r269578, head/sys/arm/samsung/exynos/exynos5_pmu.c
  projects/sendfile/sys/arm/samsung/exynos/exynos5_pmu.h
     - copied unchanged from r269578, head/sys/arm/samsung/exynos/exynos5_pmu.h
  projects/sendfile/sys/arm/samsung/exynos/exynos5_spi.c
     - copied unchanged from r269578, head/sys/arm/samsung/exynos/exynos5_spi.c
  projects/sendfile/sys/arm/samsung/exynos/exynos5_usb_phy.c
     - copied unchanged from r269578, head/sys/arm/samsung/exynos/exynos5_usb_phy.c
  projects/sendfile/sys/arm/samsung/exynos/exynos5_xhci.c
     - copied unchanged from r269578, head/sys/arm/samsung/exynos/exynos5_xhci.c
  projects/sendfile/sys/boot/fdt/dts/arm/exynos5250-snow.dts
     - copied unchanged from r269578, head/sys/boot/fdt/dts/arm/exynos5250-snow.dts
  projects/sendfile/sys/boot/fdt/dts/arm/exynos5250-spring.dts
     - copied unchanged from r269578, head/sys/boot/fdt/dts/arm/exynos5250-spring.dts
  projects/sendfile/sys/boot/fdt/dts/arm/exynos5420-peach-pit.dts
     - copied unchanged from r269578, head/sys/boot/fdt/dts/arm/exynos5420-peach-pit.dts
  projects/sendfile/sys/boot/kshim/
     - copied from r269578, head/sys/boot/kshim/
  projects/sendfile/sys/boot/usb/tools/Makefile
     - copied unchanged from r269578, head/sys/boot/usb/tools/Makefile
  projects/sendfile/sys/boot/usb/usbcore.mk
     - copied unchanged from r269578, head/sys/boot/usb/usbcore.mk
  projects/sendfile/sys/cddl/contrib/opensolaris/common/util/
     - copied from r269578, head/sys/cddl/contrib/opensolaris/common/util/
  projects/sendfile/sys/dev/i40e/README
     - copied unchanged from r269578, head/sys/dev/i40e/README
  projects/sendfile/sys/dev/usb/template/usb_template_phone.c
     - copied unchanged from r269578, head/sys/dev/usb/template/usb_template_phone.c
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/imx6sx-clock.h
     - copied unchanged from r269578, head/sys/gnu/dts/include/dt-bindings/clock/imx6sx-clock.h
  projects/sendfile/sys/kern/subr_sfbuf.c
     - copied unchanged from r269578, head/sys/kern/subr_sfbuf.c
  projects/sendfile/sys/modules/tsec/
     - copied from r269578, head/sys/modules/tsec/
  projects/sendfile/usr.bin/gcore/elf32core.c
     - copied unchanged from r269578, head/usr.bin/gcore/elf32core.c
  projects/sendfile/usr.bin/m4/lib/ohash.c
     - copied unchanged from r269578, head/usr.bin/m4/lib/ohash.c
  projects/sendfile/usr.bin/units/tests/basics_test.sh
     - copied unchanged from r269578, head/usr.bin/units/tests/basics_test.sh
  projects/sendfile/usr.sbin/bsdconfig/examples/add_some_packages.sh
     - copied unchanged from r269578, head/usr.sbin/bsdconfig/examples/add_some_packages.sh
  projects/sendfile/usr.sbin/bsdconfig/share/packages/musthavepkg.subr
     - copied unchanged from r269578, head/usr.sbin/bsdconfig/share/packages/musthavepkg.subr
Deleted:
  projects/sendfile/contrib/unbound/util/configlexer.c
  projects/sendfile/contrib/unbound/util/configparser.c
  projects/sendfile/contrib/unbound/util/configparser.h
  projects/sendfile/share/man/man9/VOP_GETVOBJECT.9
  projects/sendfile/share/man/man9/pmap_change_wiring.9
  projects/sendfile/share/man/man9/zero_copy.9
  projects/sendfile/sys/arm/freescale/imx/i2c.c
  projects/sendfile/sys/boot/fdt/dts/arm/exynos5250-chromebook-snow.dts
  projects/sendfile/sys/boot/fdt/dts/arm/exynos5250-chromebook-spring.dts
  projects/sendfile/sys/boot/usb/bsd_busspace.c
  projects/sendfile/sys/boot/usb/bsd_global.h
  projects/sendfile/sys/boot/usb/bsd_kernel.c
  projects/sendfile/sys/boot/usb/bsd_kernel.h
  projects/sendfile/sys/boot/usb/tools/sysinit.h
  projects/sendfile/sys/powerpc/include/sf_buf.h
  projects/sendfile/sys/sparc64/include/sf_buf.h
  projects/sendfile/tools/regression/lib/libmp/
  projects/sendfile/usr.bin/m4/lib/ohash_create_entry.c
  projects/sendfile/usr.bin/m4/lib/ohash_delete.c
  projects/sendfile/usr.bin/m4/lib/ohash_do.c
  projects/sendfile/usr.bin/m4/lib/ohash_entries.c
  projects/sendfile/usr.bin/m4/lib/ohash_enum.c
  projects/sendfile/usr.bin/m4/lib/ohash_init.c
  projects/sendfile/usr.bin/m4/lib/ohash_int.h
  projects/sendfile/usr.bin/m4/lib/ohash_interval.c
  projects/sendfile/usr.bin/m4/lib/ohash_lookup_interval.c
  projects/sendfile/usr.bin/m4/lib/ohash_lookup_memory.c
  projects/sendfile/usr.bin/m4/lib/ohash_qlookup.c
  projects/sendfile/usr.bin/m4/lib/ohash_qlookupi.c
  projects/sendfile/usr.bin/units/tests/units_basics.sh
  projects/sendfile/usr.sbin/bsdconfig/examples/browse_packages_ftp.sh
Modified:
  projects/sendfile/Makefile
  projects/sendfile/Makefile.inc1
  projects/sendfile/ObsoleteFiles.inc
  projects/sendfile/UPDATING
  projects/sendfile/bin/sh/eval.c
  projects/sendfile/bin/sh/exec.c
  projects/sendfile/bin/sh/jobs.c
  projects/sendfile/bin/sh/miscbltin.c
  projects/sendfile/bin/sh/mystring.c
  projects/sendfile/bin/sh/mystring.h
  projects/sendfile/bin/sh/tests/builtins/Makefile
  projects/sendfile/cddl/contrib/dtracetoolkit/Apps/shellsnoop
  projects/sendfile/cddl/contrib/dtracetoolkit/rwsnoop
  projects/sendfile/cddl/contrib/opensolaris/cmd/zdb/zdb.8
  projects/sendfile/cddl/contrib/opensolaris/cmd/zdb/zdb.c
  projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool.8
  projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
  projects/sendfile/cddl/contrib/opensolaris/cmd/ztest/ztest.c
  projects/sendfile/cddl/contrib/opensolaris/common/avl/avl.c
  projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c
  projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_map.c
  projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_work.c
  projects/sendfile/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
  projects/sendfile/contrib/binutils/gas/config/tc-arm.c
  projects/sendfile/contrib/gcc/config/arm/unwind-arm.h
  projects/sendfile/contrib/libstdc++/libsupc++/unwind-cxx.h
  projects/sendfile/contrib/libucl/src/ucl_parser.c
  projects/sendfile/contrib/llvm/tools/clang/lib/Driver/ToolChain.cpp
  projects/sendfile/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
  projects/sendfile/contrib/serf/CHANGES
  projects/sendfile/contrib/serf/auth/auth.c
  projects/sendfile/contrib/serf/outgoing.c
  projects/sendfile/contrib/serf/serf.h
  projects/sendfile/contrib/subversion/subversion/svn/util.c
  projects/sendfile/contrib/unbound/doc/example.conf.in
  projects/sendfile/contrib/unbound/doc/unbound.conf.5
  projects/sendfile/contrib/unbound/doc/unbound.conf.5.in
  projects/sendfile/contrib/unbound/freebsd-configure.sh
  projects/sendfile/contrib/unbound/services/localzone.c
  projects/sendfile/contrib/unbound/util/config_file.c
  projects/sendfile/contrib/unbound/util/config_file.h
  projects/sendfile/contrib/unbound/util/configlexer.lex
  projects/sendfile/contrib/unbound/util/configparser.y
  projects/sendfile/etc/defaults/rc.conf
  projects/sendfile/etc/mtree/BSD.tests.dist
  projects/sendfile/games/fortune/datfiles/freebsd-tips
  projects/sendfile/include/search.h
  projects/sendfile/lib/csu/i386-elf/Makefile
  projects/sendfile/lib/libarchive/config_freebsd.h
  projects/sendfile/lib/libc/arm/Symbol.map
  projects/sendfile/lib/libc/arm/aeabi/Makefile.inc
  projects/sendfile/lib/libc/gen/directory.3
  projects/sendfile/lib/libc/gen/rewinddir.c
  projects/sendfile/lib/libc/gen/telldir.c
  projects/sendfile/lib/libc/gen/ttyname.3
  projects/sendfile/lib/libc/iconv/iconv.3
  projects/sendfile/lib/libc/net/sctp_sys_calls.c
  projects/sendfile/lib/libc/net/sourcefilter.c
  projects/sendfile/lib/libc/stdio/fflush.c
  projects/sendfile/lib/libc/stdio/fputs.c
  projects/sendfile/lib/libc/stdio/fputws.c
  projects/sendfile/lib/libc/stdio/freopen.c
  projects/sendfile/lib/libc/stdio/ftell.c
  projects/sendfile/lib/libc/stdio/getline.3
  projects/sendfile/lib/libc/stdio/gets.c
  projects/sendfile/lib/libc/stdio/puts.c
  projects/sendfile/lib/libc/stdio/putw.c
  projects/sendfile/lib/libc/stdio/rewind.c
  projects/sendfile/lib/libc/stdio/vfprintf.c
  projects/sendfile/lib/libc/stdio/vfwprintf.c
  projects/sendfile/lib/libc/stdio/wbuf.c
  projects/sendfile/lib/libc/stdlib/Makefile.inc
  projects/sendfile/lib/libc/stdlib/Symbol.map
  projects/sendfile/lib/libc/stdlib/hcreate.3
  projects/sendfile/lib/libc/stdlib/hcreate.c
  projects/sendfile/lib/libc/stdtime/strftime.c
  projects/sendfile/lib/libc/sys/kqueue.2
  projects/sendfile/lib/libedit/TEST/tc1.c
  projects/sendfile/lib/libmp/Makefile
  projects/sendfile/lib/libpam/modules/pam_group/pam_group.8
  projects/sendfile/lib/libpam/modules/pam_group/pam_group.c
  projects/sendfile/lib/libpam/modules/pam_lastlog/pam_lastlog.c
  projects/sendfile/lib/libpmc/pmc.3
  projects/sendfile/lib/libsbuf/Makefile
  projects/sendfile/lib/libstand/Makefile
  projects/sendfile/lib/libstand/open.c
  projects/sendfile/lib/libstand/qdivrem.c
  projects/sendfile/lib/libstand/quad.h
  projects/sendfile/lib/libstand/stand.h
  projects/sendfile/lib/libunbound/Makefile
  projects/sendfile/lib/libutil/fparseln.c
  projects/sendfile/lib/libvmmapi/vmmapi.c
  projects/sendfile/lib/libvmmapi/vmmapi.h
  projects/sendfile/libexec/rtld-elf/tests/Makefile
  projects/sendfile/libexec/rtld-elf/tests/ld_library_pathfds.c
  projects/sendfile/libexec/rtld-elf/tests/target/Makefile
  projects/sendfile/libexec/save-entropy/save-entropy.sh
  projects/sendfile/release/arm/release.sh
  projects/sendfile/rescue/rescue/Makefile
  projects/sendfile/sbin/geom/class/part/gpart.8
  projects/sendfile/sbin/geom/class/virstor/gvirstor.8
  projects/sendfile/sbin/ping6/ping6.c
  projects/sendfile/sbin/restore/tape.c
  projects/sendfile/sbin/setkey/setkey.8
  projects/sendfile/share/examples/hwpmc/README
  projects/sendfile/share/man/man3/offsetof.3
  projects/sendfile/share/man/man4/acpi_wmi.4
  projects/sendfile/share/man/man4/ddb.4
  projects/sendfile/share/man/man4/hptiop.4
  projects/sendfile/share/man/man4/vt.4
  projects/sendfile/share/man/man5/pf.conf.5
  projects/sendfile/share/man/man7/hier.7
  projects/sendfile/share/man/man9/Makefile
  projects/sendfile/share/man/man9/VOP_INACTIVE.9
  projects/sendfile/share/man/man9/ifnet.9
  projects/sendfile/share/man/man9/kernel_mount.9
  projects/sendfile/share/man/man9/pmap.9
  projects/sendfile/share/man/man9/pmap_unwire.9
  projects/sendfile/share/man/man9/sysctl.9
  projects/sendfile/share/man/man9/sysctl_add_oid.9
  projects/sendfile/share/man/man9/sysctl_ctx_init.9
  projects/sendfile/share/man/man9/vnode.9
  projects/sendfile/share/misc/committers-src.dot
  projects/sendfile/share/mk/bsd.README
  projects/sendfile/share/mk/bsd.dep.mk
  projects/sendfile/share/mk/bsd.lib.mk
  projects/sendfile/share/mk/bsd.obj.mk
  projects/sendfile/share/mk/src.sys.mk
  projects/sendfile/share/mk/sys.mk
  projects/sendfile/sys/amd64/acpica/acpi_wakecode.S
  projects/sendfile/sys/amd64/amd64/exception.S
  projects/sendfile/sys/amd64/amd64/identcpu.c
  projects/sendfile/sys/amd64/amd64/machdep.c
  projects/sendfile/sys/amd64/amd64/mpboot.S
  projects/sendfile/sys/amd64/amd64/pmap.c
  projects/sendfile/sys/amd64/amd64/trap.c
  projects/sendfile/sys/amd64/include/sf_buf.h
  projects/sendfile/sys/amd64/include/vmm.h   (contents, props changed)
  projects/sendfile/sys/amd64/include/vmm_dev.h   (contents, props changed)
  projects/sendfile/sys/amd64/include/vmm_instruction_emul.h   (contents, props changed)
  projects/sendfile/sys/amd64/vmm/intel/vmx.c
  projects/sendfile/sys/amd64/vmm/intel/vmx_msr.c
  projects/sendfile/sys/amd64/vmm/intel/vmx_msr.h
  projects/sendfile/sys/amd64/vmm/vmm.c
  projects/sendfile/sys/amd64/vmm/vmm_dev.c
  projects/sendfile/sys/amd64/vmm/vmm_instruction_emul.c
  projects/sendfile/sys/arm/arm/busdma_machdep-v6.c
  projects/sendfile/sys/arm/arm/cpufunc_asm_arm10.S
  projects/sendfile/sys/arm/arm/cpufunc_asm_arm9.S
  projects/sendfile/sys/arm/arm/cpufunc_asm_armv5.S
  projects/sendfile/sys/arm/arm/cpufunc_asm_armv6.S
  projects/sendfile/sys/arm/arm/cpufunc_asm_armv7.S
  projects/sendfile/sys/arm/arm/cpufunc_asm_xscale.S
  projects/sendfile/sys/arm/arm/cpufunc_asm_xscale_c3.S
  projects/sendfile/sys/arm/arm/dump_machdep.c
  projects/sendfile/sys/arm/arm/exception.S
  projects/sendfile/sys/arm/arm/fusu.S
  projects/sendfile/sys/arm/arm/locore.S
  projects/sendfile/sys/arm/arm/pmap-v6.c
  projects/sendfile/sys/arm/arm/pmap.c
  projects/sendfile/sys/arm/arm/setstack.s
  projects/sendfile/sys/arm/arm/support.S
  projects/sendfile/sys/arm/arm/vm_machdep.c
  projects/sendfile/sys/arm/conf/CHROMEBOOK
  projects/sendfile/sys/arm/conf/CHROMEBOOK-SNOW
  projects/sendfile/sys/arm/conf/CHROMEBOOK-SPRING
  projects/sendfile/sys/arm/conf/EXYNOS5.common
  projects/sendfile/sys/arm/conf/IMX6
  projects/sendfile/sys/arm/conf/RPI-B
  projects/sendfile/sys/arm/conf/VYBRID
  projects/sendfile/sys/arm/freescale/imx/files.imx51
  projects/sendfile/sys/arm/freescale/imx/files.imx53
  projects/sendfile/sys/arm/freescale/imx/files.imx6
  projects/sendfile/sys/arm/freescale/vybrid/vf_i2c.c
  projects/sendfile/sys/arm/include/asm.h
  projects/sendfile/sys/arm/include/atomic.h
  projects/sendfile/sys/arm/include/counter.h
  projects/sendfile/sys/arm/include/elf.h
  projects/sendfile/sys/arm/include/sf_buf.h
  projects/sendfile/sys/arm/include/vmparam.h
  projects/sendfile/sys/arm/samsung/exynos/chrome_ec.c
  projects/sendfile/sys/arm/samsung/exynos/chrome_ec.h
  projects/sendfile/sys/arm/samsung/exynos/exynos5_combiner.c
  projects/sendfile/sys/arm/samsung/exynos/exynos5_ehci.c
  projects/sendfile/sys/arm/samsung/exynos/exynos5_pad.c
  projects/sendfile/sys/arm/samsung/exynos/files.exynos5
  projects/sendfile/sys/arm/ti/ti_smc.S
  projects/sendfile/sys/boot/amd64/boot1.efi/Makefile
  projects/sendfile/sys/boot/amd64/efi/main.c
  projects/sendfile/sys/boot/arm/at91/boot0/main.c
  projects/sendfile/sys/boot/arm/at91/boot0iic/main.c
  projects/sendfile/sys/boot/arm/at91/boot0spi/main.c
  projects/sendfile/sys/boot/arm/at91/boot2/boot2.c
  projects/sendfile/sys/boot/arm/at91/bootiic/main.c
  projects/sendfile/sys/boot/arm/at91/bootspi/main.c
  projects/sendfile/sys/boot/arm/at91/libat91/emac.c
  projects/sendfile/sys/boot/arm/at91/libat91/mci_device.h
  projects/sendfile/sys/boot/arm/at91/libat91/sd-card.c
  projects/sendfile/sys/boot/arm/at91/libat91/sd-card.h
  projects/sendfile/sys/boot/common/bootstrap.h
  projects/sendfile/sys/boot/common/interp.c
  projects/sendfile/sys/boot/common/interp_forth.c
  projects/sendfile/sys/boot/efi/libefi/Makefile
  projects/sendfile/sys/boot/fdt/dts/arm/exynos5.dtsi
  projects/sendfile/sys/boot/fdt/dts/arm/exynos5250.dtsi
  projects/sendfile/sys/boot/fdt/dts/arm/exynos5420-arndale-octa.dts
  projects/sendfile/sys/boot/fdt/dts/arm/exynos5420.dtsi
  projects/sendfile/sys/boot/fdt/dts/arm/imx6.dtsi
  projects/sendfile/sys/boot/i386/libi386/Makefile
  projects/sendfile/sys/boot/i386/libi386/amd64_tramp.S
  projects/sendfile/sys/boot/i386/libi386/libi386.h
  projects/sendfile/sys/boot/i386/libi386/pxe.c
  projects/sendfile/sys/boot/i386/loader/Makefile
  projects/sendfile/sys/boot/i386/loader/main.c
  projects/sendfile/sys/boot/libstand32/Makefile
  projects/sendfile/sys/boot/mips/beri/boot2/Makefile
  projects/sendfile/sys/boot/mips/beri/loader/main.c
  projects/sendfile/sys/boot/ofw/common/main.c
  projects/sendfile/sys/boot/pc98/loader/main.c
  projects/sendfile/sys/boot/powerpc/ps3/main.c
  projects/sendfile/sys/boot/sparc64/loader/main.c
  projects/sendfile/sys/boot/uboot/common/main.c
  projects/sendfile/sys/boot/usb/Makefile
  projects/sendfile/sys/boot/userboot/test/test.c
  projects/sendfile/sys/boot/userboot/userboot/main.c
  projects/sendfile/sys/cam/ctl/ctl.c
  projects/sendfile/sys/cam/ctl/ctl_backend_block.c
  projects/sendfile/sys/cam/ctl/ctl_backend_ramdisk.c
  projects/sendfile/sys/cam/ctl/ctl_cmd_table.c
  projects/sendfile/sys/cam/ctl/ctl_frontend_iscsi.c
  projects/sendfile/sys/cam/ctl/ctl_private.h
  projects/sendfile/sys/cam/ctl/ctl_ser_table.c
  projects/sendfile/sys/cam/ctl/ctl_tpc.c
  projects/sendfile/sys/cam/scsi/scsi_all.c
  projects/sendfile/sys/cam/scsi/scsi_all.h
  projects/sendfile/sys/cam/scsi/scsi_sa.c
  projects/sendfile/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c
  projects/sendfile/sys/cddl/compat/opensolaris/sys/atomic.h
  projects/sendfile/sys/cddl/contrib/opensolaris/common/avl/avl.c
  projects/sendfile/sys/cddl/contrib/opensolaris/common/zfs/zpool_prop.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/range_tree.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/rrwlock.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/rrwlock.h
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_debug.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h
  projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h
  projects/sendfile/sys/cddl/dev/dtrace/amd64/dtrace_subr.c
  projects/sendfile/sys/cddl/dev/fbt/fbt.c
  projects/sendfile/sys/conf/Makefile.arm
  projects/sendfile/sys/conf/files
  projects/sendfile/sys/conf/files.arm
  projects/sendfile/sys/conf/files.i386
  projects/sendfile/sys/conf/files.mips
  projects/sendfile/sys/conf/files.pc98
  projects/sendfile/sys/conf/files.powerpc
  projects/sendfile/sys/conf/files.sparc64
  projects/sendfile/sys/conf/kern.opts.mk
  projects/sendfile/sys/conf/kern.pre.mk
  projects/sendfile/sys/conf/kmod.mk
  projects/sendfile/sys/conf/options
  projects/sendfile/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_interrupts.c
  projects/sendfile/sys/dev/acpica/acpi_cpu.c
  projects/sendfile/sys/dev/acpica/acpi_hpet.c
  projects/sendfile/sys/dev/acpica/acpi_timer.c
  projects/sendfile/sys/dev/bxe/bxe.c
  projects/sendfile/sys/dev/bxe/bxe.h
  projects/sendfile/sys/dev/bxe/bxe_stats.c
  projects/sendfile/sys/dev/bxe/ecore_reg.h
  projects/sendfile/sys/dev/bxe/ecore_sp.h
  projects/sendfile/sys/dev/cxgbe/adapter.h
  projects/sendfile/sys/dev/cxgbe/common/common.h
  projects/sendfile/sys/dev/cxgbe/common/t4_hw.c
  projects/sendfile/sys/dev/cxgbe/offload.h
  projects/sendfile/sys/dev/cxgbe/t4_main.c
  projects/sendfile/sys/dev/cxgbe/t4_netmap.c
  projects/sendfile/sys/dev/cxgbe/t4_sge.c
  projects/sendfile/sys/dev/cxgbe/tom/t4_cpl_io.c
  projects/sendfile/sys/dev/cxgbe/tom/t4_ddp.c
  projects/sendfile/sys/dev/cxgbe/tom/t4_tom.h
  projects/sendfile/sys/dev/drm2/drm_fb_helper.c
  projects/sendfile/sys/dev/drm2/i915/intel_fb.c
  projects/sendfile/sys/dev/drm2/radeon/rs690.c
  projects/sendfile/sys/dev/drm2/radeon/rv515.c
  projects/sendfile/sys/dev/e1000/if_igb.c
  projects/sendfile/sys/dev/etherswitch/arswitch/arswitch.c
  projects/sendfile/sys/dev/i40e/i40e.h
  projects/sendfile/sys/dev/i40e/i40e_adminq.c
  projects/sendfile/sys/dev/i40e/i40e_adminq.h
  projects/sendfile/sys/dev/i40e/i40e_adminq_cmd.h
  projects/sendfile/sys/dev/i40e/i40e_common.c
  projects/sendfile/sys/dev/i40e/i40e_hmc.h
  projects/sendfile/sys/dev/i40e/i40e_lan_hmc.c
  projects/sendfile/sys/dev/i40e/i40e_lan_hmc.h
  projects/sendfile/sys/dev/i40e/i40e_nvm.c
  projects/sendfile/sys/dev/i40e/i40e_osdep.c
  projects/sendfile/sys/dev/i40e/i40e_prototype.h
  projects/sendfile/sys/dev/i40e/i40e_register.h
  projects/sendfile/sys/dev/i40e/i40e_register_x710_int.h
  projects/sendfile/sys/dev/i40e/i40e_txrx.c
  projects/sendfile/sys/dev/i40e/i40e_type.h
  projects/sendfile/sys/dev/i40e/if_i40e.c
  projects/sendfile/sys/dev/iscsi/icl.c
  projects/sendfile/sys/dev/iwn/if_iwn.c
  projects/sendfile/sys/dev/ixgbe/ixgbe.c
  projects/sendfile/sys/dev/md/md.c
  projects/sendfile/sys/dev/mmc/mmc.c
  projects/sendfile/sys/dev/mmc/mmcsd.c
  projects/sendfile/sys/dev/mmc/mmcvar.h
  projects/sendfile/sys/dev/mps/mps.c
  projects/sendfile/sys/dev/mps/mps_mapping.c
  projects/sendfile/sys/dev/mps/mps_sas.c
  projects/sendfile/sys/dev/mps/mps_sas.h
  projects/sendfile/sys/dev/mps/mps_sas_lsi.c
  projects/sendfile/sys/dev/mps/mpsvar.h
  projects/sendfile/sys/dev/nfe/if_nfe.c
  projects/sendfile/sys/dev/pccbb/pccbb_pci.c
  projects/sendfile/sys/dev/sound/pci/hda/hdaa_patches.c
  projects/sendfile/sys/dev/sound/pci/hda/hdac.h
  projects/sendfile/sys/dev/sound/pcm/mixer.c
  projects/sendfile/sys/dev/terasic/mtl/terasic_mtl.h
  projects/sendfile/sys/dev/tsec/if_tsec_fdt.c
  projects/sendfile/sys/dev/uart/uart_cpu_powerpc.c
  projects/sendfile/sys/dev/usb/controller/ehci.c
  projects/sendfile/sys/dev/usb/controller/saf1761_otg.c
  projects/sendfile/sys/dev/usb/controller/usb_controller.c
  projects/sendfile/sys/dev/usb/controller/uss820dci.c
  projects/sendfile/sys/dev/usb/controller/uss820dci.h
  projects/sendfile/sys/dev/usb/controller/uss820dci_atmelarm.c
  projects/sendfile/sys/dev/usb/controller/xhci.c
  projects/sendfile/sys/dev/usb/controller/xhci.h
  projects/sendfile/sys/dev/usb/net/if_axgereg.h
  projects/sendfile/sys/dev/usb/quirk/usb_quirk.c
  projects/sendfile/sys/dev/usb/quirk/usb_quirk.h
  projects/sendfile/sys/dev/usb/serial/u3g.c
  projects/sendfile/sys/dev/usb/serial/uftdi.c
  projects/sendfile/sys/dev/usb/serial/umcs.c
  projects/sendfile/sys/dev/usb/template/usb_template.c
  projects/sendfile/sys/dev/usb/template/usb_template.h
  projects/sendfile/sys/dev/usb/usb_device.c
  projects/sendfile/sys/dev/usb/usb_ioctl.h
  projects/sendfile/sys/dev/usb/usb_msctest.c
  projects/sendfile/sys/dev/usb/usb_msctest.h
  projects/sendfile/sys/dev/usb/usbdevs
  projects/sendfile/sys/dev/usb/wlan/if_rum.c
  projects/sendfile/sys/dev/usb/wlan/if_upgt.c
  projects/sendfile/sys/dev/usb/wlan/if_ural.c
  projects/sendfile/sys/dev/usb/wlan/if_zyd.c
  projects/sendfile/sys/dev/usb/wlan/if_zydreg.h
  projects/sendfile/sys/dev/vt/hw/fb/vt_fb.c
  projects/sendfile/sys/dev/vt/hw/ofwfb/ofwfb.c
  projects/sendfile/sys/dev/vt/hw/vga/vt_vga.c
  projects/sendfile/sys/dev/vt/vt.h
  projects/sendfile/sys/dev/vt/vt_core.c
  projects/sendfile/sys/dev/xen/console/xencons_ring.c
  projects/sendfile/sys/fs/nandfs/nandfs_subr.c
  projects/sendfile/sys/fs/nandfs/nandfs_vfsops.c
  projects/sendfile/sys/fs/nandfs/nandfs_vnops.c
  projects/sendfile/sys/fs/nfs/nfsrvcache.h
  projects/sendfile/sys/fs/nfsserver/nfs_nfsdport.c
  projects/sendfile/sys/fs/nullfs/null_vnops.c
  projects/sendfile/sys/geom/uzip/g_uzip.c
  projects/sendfile/sys/gnu/dts/include/dt-bindings/clock/imx6sl-clock.h   (contents, props changed)
  projects/sendfile/sys/i386/i386/pmap.c
  projects/sendfile/sys/i386/i386/vm_machdep.c
  projects/sendfile/sys/i386/include/sf_buf.h
  projects/sendfile/sys/i386/include/vmparam.h
  projects/sendfile/sys/i386/xen/pmap.c
  projects/sendfile/sys/kern/kern_descrip.c
  projects/sendfile/sys/kern/kern_event.c
  projects/sendfile/sys/kern/kern_proc.c
  projects/sendfile/sys/kern/kern_shutdown.c
  projects/sendfile/sys/kern/kern_thread.c
  projects/sendfile/sys/kern/subr_sbuf.c
  projects/sendfile/sys/kern/subr_witness.c
  projects/sendfile/sys/kern/sys_capability.c
  projects/sendfile/sys/kern/tty.c
  projects/sendfile/sys/kern/uipc_accf.c
  projects/sendfile/sys/kern/uipc_mbuf.c
  projects/sendfile/sys/kern/uipc_shm.c
  projects/sendfile/sys/kern/uipc_socket.c
  projects/sendfile/sys/kern/uipc_syscalls.c
  projects/sendfile/sys/kern/uipc_usrreq.c
  projects/sendfile/sys/kern/vfs_bio.c
  projects/sendfile/sys/kern/vfs_cache.c
  projects/sendfile/sys/kern/vfs_init.c
  projects/sendfile/sys/kern/vfs_mount.c
  projects/sendfile/sys/kern/vfs_subr.c
  projects/sendfile/sys/libkern/arm/divsi3.S
  projects/sendfile/sys/mips/atheros/uart_dev_ar933x.c
  projects/sendfile/sys/mips/include/elf.h
  projects/sendfile/sys/mips/include/sf_buf.h
  projects/sendfile/sys/mips/include/vmparam.h
  projects/sendfile/sys/mips/mips/dump_machdep.c
  projects/sendfile/sys/mips/mips/pmap.c
  projects/sendfile/sys/mips/mips/vm_machdep.c
  projects/sendfile/sys/modules/acl_nfs4/Makefile
  projects/sendfile/sys/modules/acl_posix1e/Makefile
  projects/sendfile/sys/modules/alq/Makefile
  projects/sendfile/sys/modules/an/Makefile
  projects/sendfile/sys/modules/arcnet/Makefile
  projects/sendfile/sys/modules/bxe/Makefile
  projects/sendfile/sys/modules/cam/Makefile
  projects/sendfile/sys/modules/carp/Makefile
  projects/sendfile/sys/modules/cc/cc_cdg/Makefile
  projects/sendfile/sys/modules/cc/cc_chd/Makefile
  projects/sendfile/sys/modules/cc/cc_cubic/Makefile
  projects/sendfile/sys/modules/cc/cc_hd/Makefile
  projects/sendfile/sys/modules/cc/cc_htcp/Makefile
  projects/sendfile/sys/modules/cc/cc_vegas/Makefile
  projects/sendfile/sys/modules/cxgb/cxgb/Makefile
  projects/sendfile/sys/modules/cxgb/iw_cxgb/Makefile
  projects/sendfile/sys/modules/cxgb/tom/Makefile
  projects/sendfile/sys/modules/cxgbe/Makefile
  projects/sendfile/sys/modules/cxgbe/if_cxgbe/Makefile
  projects/sendfile/sys/modules/cxgbe/iw_cxgbe/Makefile
  projects/sendfile/sys/modules/cxgbe/t4_firmware/Makefile
  projects/sendfile/sys/modules/cxgbe/t5_firmware/Makefile
  projects/sendfile/sys/modules/cxgbe/tom/Makefile
  projects/sendfile/sys/modules/drm2/radeonkms/Makefile
  projects/sendfile/sys/modules/dtrace/Makefile
  projects/sendfile/sys/modules/dtrace/dtrace/Makefile
  projects/sendfile/sys/modules/dtrace/fasttrap/Makefile
  projects/sendfile/sys/modules/dummynet/Makefile
  projects/sendfile/sys/modules/em/Makefile
  projects/sendfile/sys/modules/en/Makefile
  projects/sendfile/sys/modules/fatm/Makefile
  projects/sendfile/sys/modules/firewire/fwip/Makefile
  projects/sendfile/sys/modules/hatm/Makefile
  projects/sendfile/sys/modules/i40e/Makefile
  projects/sendfile/sys/modules/ibcore/Makefile
  projects/sendfile/sys/modules/if_bridge/Makefile
  projects/sendfile/sys/modules/if_disc/Makefile
  projects/sendfile/sys/modules/if_faith/Makefile
  projects/sendfile/sys/modules/if_gif/Makefile
  projects/sendfile/sys/modules/if_gre/Makefile
  projects/sendfile/sys/modules/if_lagg/Makefile
  projects/sendfile/sys/modules/if_stf/Makefile
  projects/sendfile/sys/modules/if_tap/Makefile
  projects/sendfile/sys/modules/if_tun/Makefile
  projects/sendfile/sys/modules/igb/Makefile
  projects/sendfile/sys/modules/ip6_mroute_mod/Makefile
  projects/sendfile/sys/modules/ip_mroute_mod/Makefile
  projects/sendfile/sys/modules/ipdivert/Makefile
  projects/sendfile/sys/modules/ipfilter/Makefile
  projects/sendfile/sys/modules/ipfw/Makefile
  projects/sendfile/sys/modules/ipoib/Makefile
  projects/sendfile/sys/modules/ixgbe/Makefile
  projects/sendfile/sys/modules/khelp/h_ertt/Makefile
  projects/sendfile/sys/modules/krpc/Makefile
  projects/sendfile/sys/modules/linux/Makefile
  projects/sendfile/sys/modules/lmc/Makefile
  projects/sendfile/sys/modules/mlx4/Makefile
  projects/sendfile/sys/modules/mlx4ib/Makefile
  projects/sendfile/sys/modules/mlxen/Makefile
  projects/sendfile/sys/modules/mthca/Makefile
  projects/sendfile/sys/modules/netgraph/gif/Makefile
  projects/sendfile/sys/modules/netgraph/iface/Makefile
  projects/sendfile/sys/modules/netgraph/ipfw/Makefile
  projects/sendfile/sys/modules/netgraph/netflow/Makefile
  projects/sendfile/sys/modules/nfscl/Makefile
  projects/sendfile/sys/modules/nfsclient/Makefile
  projects/sendfile/sys/modules/nfslockd/Makefile
  projects/sendfile/sys/modules/nfsserver/Makefile
  projects/sendfile/sys/modules/patm/Makefile
  projects/sendfile/sys/modules/pf/Makefile
  projects/sendfile/sys/modules/pflog/Makefile
  projects/sendfile/sys/modules/pfsync/Makefile
  projects/sendfile/sys/modules/siftr/Makefile
  projects/sendfile/sys/modules/smbfs/Makefile
  projects/sendfile/sys/modules/snc/Makefile
  projects/sendfile/sys/modules/sppp/Makefile
  projects/sendfile/sys/modules/trm/Makefile
  projects/sendfile/sys/modules/usb/template/Makefile
  projects/sendfile/sys/modules/virtio/network/Makefile
  projects/sendfile/sys/modules/vmware/vmxnet3/Makefile
  projects/sendfile/sys/modules/wlan/Makefile
  projects/sendfile/sys/modules/wlan_acl/Makefile
  projects/sendfile/sys/modules/wlan_amrr/Makefile
  projects/sendfile/sys/modules/wlan_ccmp/Makefile
  projects/sendfile/sys/modules/wlan_rssadapt/Makefile
  projects/sendfile/sys/modules/wlan_tkip/Makefile
  projects/sendfile/sys/modules/wlan_wep/Makefile
  projects/sendfile/sys/modules/wlan_xauth/Makefile
  projects/sendfile/sys/modules/zfs/Makefile
  projects/sendfile/sys/net/if.c
  projects/sendfile/sys/net/if.h
  projects/sendfile/sys/net/if_lagg.c
  projects/sendfile/sys/net/if_lagg.h
  projects/sendfile/sys/net/if_var.h
  projects/sendfile/sys/net/if_vlan.c
  projects/sendfile/sys/net/rtsock.c
  projects/sendfile/sys/netinet/in.c
  projects/sendfile/sys/netinet/in_gif.c
  projects/sendfile/sys/netinet/in_pcb.c
  projects/sendfile/sys/netinet/in_pcbgroup.c
  projects/sendfile/sys/netinet/in_proto.c
  projects/sendfile/sys/netinet/in_rss.c
  projects/sendfile/sys/netinet/in_rss.h
  projects/sendfile/sys/netinet/sctp.h
  projects/sendfile/sys/netinet/sctp_auth.c
  projects/sendfile/sys/netinet/sctp_header.h
  projects/sendfile/sys/netinet/sctp_indata.c
  projects/sendfile/sys/netinet/sctp_input.c
  projects/sendfile/sys/netinet/sctp_output.c
  projects/sendfile/sys/netinet/sctp_pcb.c
  projects/sendfile/sys/netinet/sctp_pcb.h
  projects/sendfile/sys/netinet/sctp_peeloff.c
  projects/sendfile/sys/netinet/sctp_structs.h
  projects/sendfile/sys/netinet/sctp_sysctl.c
  projects/sendfile/sys/netinet/sctp_sysctl.h
  projects/sendfile/sys/netinet/sctp_timer.c
  projects/sendfile/sys/netinet/sctp_uio.h
  projects/sendfile/sys/netinet/sctp_usrreq.c
  projects/sendfile/sys/netinet/sctputil.c
  projects/sendfile/sys/netinet/sctputil.h
  projects/sendfile/sys/netinet/tcp_timewait.c
  projects/sendfile/sys/netinet6/in6.c
  projects/sendfile/sys/netinet6/in6_gif.c
  projects/sendfile/sys/netinet6/in6_pcbgroup.c
  projects/sendfile/sys/netinet6/in6_src.c
  projects/sendfile/sys/powerpc/aim/mmu_oea.c
  projects/sendfile/sys/powerpc/aim/mmu_oea64.c
  projects/sendfile/sys/powerpc/aim/trap.c
  projects/sendfile/sys/powerpc/booke/pmap.c
  projects/sendfile/sys/powerpc/include/pmap.h
  projects/sendfile/sys/powerpc/include/vmparam.h
  projects/sendfile/sys/powerpc/powerpc/dump_machdep.c
  projects/sendfile/sys/powerpc/powerpc/elf32_machdep.c
  projects/sendfile/sys/powerpc/powerpc/mem.c
  projects/sendfile/sys/powerpc/powerpc/mmu_if.m
  projects/sendfile/sys/powerpc/powerpc/pmap_dispatch.c
  projects/sendfile/sys/powerpc/powerpc/vm_machdep.c
  projects/sendfile/sys/powerpc/ps3/platform_ps3.c
  projects/sendfile/sys/powerpc/ps3/ps3_syscons.c
  projects/sendfile/sys/sparc64/conf/GENERIC
  projects/sendfile/sys/sparc64/include/vmparam.h
  projects/sendfile/sys/sparc64/sparc64/dump_machdep.c
  projects/sendfile/sys/sparc64/sparc64/pmap.c
  projects/sendfile/sys/sparc64/sparc64/vm_machdep.c
  projects/sendfile/sys/sys/capsicum.h
  projects/sendfile/sys/sys/conf.h
  projects/sendfile/sys/sys/elf_common.h
  projects/sendfile/sys/sys/event.h
  projects/sendfile/sys/sys/link_elf.h
  projects/sendfile/sys/sys/mount.h
  projects/sendfile/sys/sys/param.h
  projects/sendfile/sys/sys/procdesc.h
  projects/sendfile/sys/sys/sbuf.h
  projects/sendfile/sys/sys/sf_buf.h
  projects/sendfile/sys/ufs/ffs/ffs_softdep.c
  projects/sendfile/sys/ufs/ffs/softdep.h
  projects/sendfile/sys/ufs/ufs/ufs_vnops.c
  projects/sendfile/sys/vm/pmap.h
  projects/sendfile/sys/vm/vm_extern.h
  projects/sendfile/sys/vm/vm_fault.c
  projects/sendfile/sys/vm/vm_map.c
  projects/sendfile/sys/vm/vm_object.c
  projects/sendfile/sys/vm/vm_object.h
  projects/sendfile/sys/x86/acpica/madt.c
  projects/sendfile/sys/x86/include/acpica_machdep.h   (contents, props changed)
  projects/sendfile/sys/x86/include/init.h
  projects/sendfile/sys/x86/include/specialreg.h
  projects/sendfile/sys/x86/x86/dump_machdep.c
  projects/sendfile/sys/x86/x86/local_apic.c
  projects/sendfile/sys/x86/x86/mca.c
  projects/sendfile/sys/x86/xen/pvcpu_enum.c
  projects/sendfile/sys/x86/xen/xen_intr.c
  projects/sendfile/sys/x86/xen/xen_nexus.c
  projects/sendfile/sys/xen/xen_intr.h
  projects/sendfile/tools/build/mk/OptionalObsoleteFiles.inc
  projects/sendfile/tools/regression/net80211/ccmp/test_ccmp.c
  projects/sendfile/tools/regression/net80211/wep/test_wep.c
  projects/sendfile/tools/test/netfibs/reflect.c
  projects/sendfile/tools/tools/cxgbetool/cxgbetool.c
  projects/sendfile/tools/tools/nanobsd/dhcpd/README
  projects/sendfile/tools/tools/nanobsd/nanobsd.sh
  projects/sendfile/usr.bin/calendar/calendars/calendar.freebsd
  projects/sendfile/usr.bin/elfdump/elfdump.c
  projects/sendfile/usr.bin/gcore/Makefile
  projects/sendfile/usr.bin/gcore/elfcore.c
  projects/sendfile/usr.bin/iscsictl/iscsictl.8
  projects/sendfile/usr.bin/kdump/kdump.c
  projects/sendfile/usr.bin/m4/Makefile
  projects/sendfile/usr.bin/m4/eval.c
  projects/sendfile/usr.bin/m4/extern.h
  projects/sendfile/usr.bin/m4/gnum4.c
  projects/sendfile/usr.bin/m4/lib/ohash.h
  projects/sendfile/usr.bin/m4/lib/ohash_init.3
  projects/sendfile/usr.bin/m4/lib/ohash_interval.3
  projects/sendfile/usr.bin/m4/look.c
  projects/sendfile/usr.bin/m4/m4.1
  projects/sendfile/usr.bin/m4/main.c
  projects/sendfile/usr.bin/m4/misc.c
  projects/sendfile/usr.bin/make/Makefile
  projects/sendfile/usr.bin/mkimg/vhd.c
  projects/sendfile/usr.bin/procstat/procstat.1
  projects/sendfile/usr.bin/procstat/procstat_files.c
  projects/sendfile/usr.bin/procstat/procstat_vm.c
  projects/sendfile/usr.bin/sed/process.c
  projects/sendfile/usr.bin/sort/sort.1.in
  projects/sendfile/usr.bin/systat/systat.1
  projects/sendfile/usr.bin/timeout/timeout.1
  projects/sendfile/usr.bin/units/tests/Makefile
  projects/sendfile/usr.bin/vtfontcvt/vtfontcvt.8
  projects/sendfile/usr.bin/vtfontcvt/vtfontcvt.c
  projects/sendfile/usr.sbin/bhyve/atkbdc.c
  projects/sendfile/usr.sbin/bhyve/bhyverun.c
  projects/sendfile/usr.sbin/bhyve/bhyverun.h
  projects/sendfile/usr.sbin/bhyve/inout.c
  projects/sendfile/usr.sbin/bhyve/inout.h
  projects/sendfile/usr.sbin/bhyve/mem.c
  projects/sendfile/usr.sbin/bhyve/mem.h
  projects/sendfile/usr.sbin/bhyve/pci_ahci.c
  projects/sendfile/usr.sbin/bhyve/pm.c
  projects/sendfile/usr.sbin/bhyve/task_switch.c
  projects/sendfile/usr.sbin/bhyvectl/bhyvectl.c
  projects/sendfile/usr.sbin/binmiscctl/binmiscctl.8
  projects/sendfile/usr.sbin/bsdconfig/dot/dot
  projects/sendfile/usr.sbin/bsdconfig/dot/include/messages.subr
  projects/sendfile/usr.sbin/bsdconfig/examples/Makefile
  projects/sendfile/usr.sbin/bsdconfig/examples/browse_packages_http.sh
  projects/sendfile/usr.sbin/bsdconfig/include/messages.subr
  projects/sendfile/usr.sbin/bsdconfig/share/common.subr
  projects/sendfile/usr.sbin/bsdconfig/share/dialog.subr
  projects/sendfile/usr.sbin/bsdconfig/share/media/http.subr
  projects/sendfile/usr.sbin/bsdconfig/share/media/httpproxy.subr
  projects/sendfile/usr.sbin/bsdconfig/share/packages/Makefile
  projects/sendfile/usr.sbin/bsdconfig/share/packages/index.subr   (contents, props changed)
  projects/sendfile/usr.sbin/bsdconfig/share/packages/packages.subr   (contents, props changed)
  projects/sendfile/usr.sbin/bsdinstall/scripts/mirrorselect
  projects/sendfile/usr.sbin/config/config.8
  projects/sendfile/usr.sbin/cron/cron/do_command.c
  projects/sendfile/usr.sbin/ctld/ctl.conf.5
  projects/sendfile/usr.sbin/ctld/ctld.8
  projects/sendfile/usr.sbin/ctld/ctld.c
  projects/sendfile/usr.sbin/ctld/ctld.h
  projects/sendfile/usr.sbin/ctld/login.c
  projects/sendfile/usr.sbin/jail/command.c
  projects/sendfile/usr.sbin/jail/config.c
  projects/sendfile/usr.sbin/jail/jail.8
  projects/sendfile/usr.sbin/kbdcontrol/kbdcontrol.c
  projects/sendfile/usr.sbin/nfsd/nfsd.8
  projects/sendfile/usr.sbin/pmcstat/pmcstat.8
  projects/sendfile/usr.sbin/sysrc/sysrc
  projects/sendfile/usr.sbin/sysrc/sysrc.8
  projects/sendfile/usr.sbin/unbound/local-setup/local-unbound-setup.sh
Directory Properties:
  projects/sendfile/   (props changed)
  projects/sendfile/cddl/   (props changed)
  projects/sendfile/cddl/contrib/opensolaris/   (props changed)
  projects/sendfile/cddl/contrib/opensolaris/lib/libzfs/   (props changed)
  projects/sendfile/contrib/binutils/   (props changed)
  projects/sendfile/contrib/gcc/   (props changed)
  projects/sendfile/contrib/libstdc++/   (props changed)
  projects/sendfile/contrib/libucl/   (props changed)
  projects/sendfile/contrib/llvm/   (props changed)
  projects/sendfile/contrib/llvm/tools/clang/   (props changed)
  projects/sendfile/contrib/serf/   (props changed)
  projects/sendfile/contrib/subversion/   (props changed)
  projects/sendfile/contrib/unbound/   (props changed)
  projects/sendfile/etc/   (props changed)
  projects/sendfile/include/   (props changed)
  projects/sendfile/lib/libc/   (props changed)
  projects/sendfile/lib/libc/stdtime/   (props changed)
  projects/sendfile/lib/libutil/   (props changed)
  projects/sendfile/lib/libvmmapi/   (props changed)
  projects/sendfile/sbin/   (props changed)
  projects/sendfile/share/   (props changed)
  projects/sendfile/share/man/man4/   (props changed)
  projects/sendfile/sys/   (props changed)
  projects/sendfile/sys/amd64/vmm/   (props changed)
  projects/sendfile/sys/boot/   (props changed)
  projects/sendfile/sys/cddl/contrib/opensolaris/   (props changed)
  projects/sendfile/sys/conf/   (props changed)
  projects/sendfile/sys/gnu/dts/   (props changed)
  projects/sendfile/usr.bin/calendar/   (props changed)
  projects/sendfile/usr.bin/mkimg/   (props changed)
  projects/sendfile/usr.bin/procstat/   (props changed)
  projects/sendfile/usr.sbin/bhyve/   (props changed)
  projects/sendfile/usr.sbin/bhyvectl/   (props changed)
  projects/sendfile/usr.sbin/bsdconfig/share/packages/categories.subr   (props changed)
  projects/sendfile/usr.sbin/jail/   (props changed)

Modified: projects/sendfile/Makefile
==============================================================================
--- projects/sendfile/Makefile	Tue Aug  5 09:59:16 2014	(r269578)
+++ projects/sendfile/Makefile	Tue Aug  5 10:08:59 2014	(r269579)
@@ -174,6 +174,13 @@ _TARGET=${TARGET}
 .if defined(TARGET_ARCH) && !defined(_TARGET_ARCH)
 _TARGET_ARCH=${TARGET_ARCH}
 .endif
+# for historical compatibility for xdev targets
+.if defined(XDEV)
+_TARGET=	${XDEV}
+.endif
+.if defined(XDEV_ARCH)
+_TARGET_ARCH=	${XDEV_ARCH}
+.endif
 # Otherwise, default to current machine type and architecture.
 _TARGET?=	${MACHINE}
 _TARGET_ARCH?=	${MACHINE_ARCH}

Modified: projects/sendfile/Makefile.inc1
==============================================================================
--- projects/sendfile/Makefile.inc1	Tue Aug  5 09:59:16 2014	(r269578)
+++ projects/sendfile/Makefile.inc1	Tue Aug  5 10:08:59 2014	(r269579)
@@ -1366,9 +1366,6 @@ kernel-tools: .MAKE
 #
 # cross-tools: Build cross-building tools
 #
-.if !defined(TARGET_ARCH) && defined(XDEV_ARCH)
-TARGET_ARCH=	${XDEV_ARCH}
-.endif
 .if ${TARGET_ARCH} != ${MACHINE_ARCH}
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
 _btxld=		usr.sbin/btxld
@@ -1409,7 +1406,8 @@ cross-tools: .MAKE
     usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint \
     ${_btxld} \
     ${_crunchide} \
-    ${_kgzip}
+    ${_kgzip} \
+    sys/boot/usb/tools
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
 		cd ${.CURDIR}/${_tool} && \
 		${MAKE} DIRPRFX=${_tool}/ obj && \
@@ -1497,6 +1495,7 @@ _prebuild_libs=	${_kerberos5_lib_libasn1
 .if ${MK_GNUCXX} != "no"
 _prebuild_libs+= gnu/lib/libstdc++ gnu/lib/libsupc++
 gnu/lib/libstdc++__L: lib/msun__L
+gnu/lib/libsupc++__L: gnu/lib/libstdc++__L
 .endif
 
 .if defined(WITH_ATF) || ${MK_TESTS} != "no"
@@ -1853,9 +1852,9 @@ builddtb:
 
 ###############
 
-.if defined(XDEV) && defined(XDEV_ARCH)
+.if defined(TARGET) && defined(TARGET_ARCH)
 
-.if ${XDEV} == ${MACHINE} && ${XDEV_ARCH} == ${MACHINE_ARCH}
+.if ${TARGET} == ${MACHINE} && ${TARGET_ARCH} == ${MACHINE_ARCH}
 XDEV_CPUTYPE?=${CPUTYPE}
 .else
 XDEV_CPUTYPE?=${TARGET_CPUTYPE}
@@ -1864,10 +1863,10 @@ XDEV_CPUTYPE?=${TARGET_CPUTYPE}
 NOFUN=-DNO_FSCHG MK_HTML=no MK_INFO=no -DNO_LINT \
 	MK_MAN=no MK_NLS=no MK_PROFILE=no \
 	MK_KERBEROS=no MK_RESCUE=no MK_TESTS=no MK_WARNS=no \
-	TARGET=${XDEV} TARGET_ARCH=${XDEV_ARCH} \
+	TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 	CPUTYPE=${XDEV_CPUTYPE}
 
-XDDIR=${XDEV_ARCH}-freebsd
+XDDIR=${TARGET_ARCH}-freebsd
 XDTP?=/usr/${XDDIR}
 .if ${XDTP:N/*}
 .error XDTP variable should be an absolute path
@@ -1883,7 +1882,7 @@ CD2CFLAGS=-isystem ${XDDESTDIR}/usr/incl
 	-B${XDDESTDIR}/usr/bin -B${XDDESTDIR}/usr/lib
 CD2ENV=${CDENV} CC="${CC} ${CD2CFLAGS}" CXX="${CXX} ${CD2CFLAGS}" \
 	CPP="${CPP} ${CD2CFLAGS}" \
-	MACHINE=${XDEV} MACHINE_ARCH=${XDEV_ARCH}
+	MACHINE=${TARGET} MACHINE_ARCH=${TARGET_ARCH}
 
 CDTMP=	${MAKEOBJDIRPREFIX}/${XDDIR}/${.CURDIR}/tmp
 CDMAKE=${CDENV} PATH=${CDTMP}/usr/bin:${PATH} ${MAKE} ${NOFUN}
@@ -1942,6 +1941,10 @@ _xi-mtree:
 	    -p ${XDDESTDIR}/usr >/dev/null
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
 	    -p ${XDDESTDIR}/usr/include >/dev/null
+.if ${MK_TESTS} != "no"
+	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \
+	    -p ${XDDESTDIR}/usr >/dev/null
+.endif
 
 .ORDER: xdev-build _xi-mtree _xi-cross-tools _xi-includes _xi-libraries
 xdev-install: xdev-build _xi-mtree _xi-cross-tools _xi-includes _xi-libraries
@@ -1978,5 +1981,5 @@ xdev-links:
 		done
 .else
 xdev xdev-build xdev-install xdev-links:
-	@echo "*** Error: Both XDEV and XDEV_ARCH must be defined for \"${.TARGET}\" target"
+	@echo "*** Error: Both TARGET and TARGET_ARCH must be defined for \"${.TARGET}\" target"
 .endif

Modified: projects/sendfile/ObsoleteFiles.inc
==============================================================================
--- projects/sendfile/ObsoleteFiles.inc	Tue Aug  5 09:59:16 2014	(r269578)
+++ projects/sendfile/ObsoleteFiles.inc	Tue Aug  5 10:08:59 2014	(r269579)
@@ -38,6 +38,19 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20140803: Remove an obsolete man page
+OLD_FILES+=usr/share/man/man9/pmap_change_wiring.9.gz
+# 20140728: libsbuf restored to old version.
+OLD_LIBS+=lib/libsbuf.so.7
+# 20140728: Remove an obsolete man page
+OLD_FILES+=usr/share/man/man9/VOP_GETVOBJECT.9.gz
+OLD_FILES+=usr/share/man/man9/VOP_CREATEVOBJECT.9.gz
+OLD_FILES+=usr/share/man/man9/VOP_DESTROYVOBJECT.9.gz
+# 20140723: renamed to PCBGROUP.9
+OLD_FILES+=usr/share/man/man9/PCBGROUPS.9.gz
+# 20140718: Remove obsolete man pages
+OLD_FILES+=usr/share/man/man9/zero_copy.9.gz
+OLD_FILES+=usr/share/man/man9/zero_copy_sockets.9.gz
 # 20140718: Remove an obsolete man page
 OLD_FILES+=usr/share/man/man9/pmap_page_protect.9.gz
 # 20140717: Remove an obsolete man page
@@ -76,8 +89,10 @@ OLD_FILES+=usr/share/examples/cvsup/stab
 OLD_FILES+=usr/share/examples/cvsup/standard-supfile
 OLD_DIRS+=usr/share/examples/cvsup
 # 20140614: send-pr removal
+OLD_FILES+=usr/bin/sendbug
 OLD_FILES+=usr/share/info/send-pr.info.gz
 OLD_FILES+=usr/share/man/man1/send-pr.1.gz
+OLD_FILES+=usr/share/man/man1/sendbug.1.gz
 OLD_FILES+=etc/gnats/freefall
 OLD_DIRS+=etc/gnats
 # 20140512: new clang import which bumps version from 3.4 to 3.4.1.

Modified: projects/sendfile/UPDATING
==============================================================================
--- projects/sendfile/UPDATING	Tue Aug  5 09:59:16 2014	(r269578)
+++ projects/sendfile/UPDATING	Tue Aug  5 10:08:59 2014	(r269579)
@@ -1,4 +1,4 @@
-Updating Information for FreeBSD current users
+Updating Information for FreeBSD current users.
 
 This file is maintained and copyrighted by M. Warner Losh <imp at freebsd.org>.
 See end of file for further details.  For commonly done items, please see the
@@ -31,6 +31,25 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20140729:
+	The ofwfb driver, used to provide a graphics console on PowerPC when
+	using vt(4), no longer allows mmap() of all of physical memory. This
+	will prevent Xorg on PowerPC with some ATI graphics cards from
+	initializing properly unless x11-servers/xorg-server is updated to
+	1.12.4_8 or newer.
+
+20140723:
+	The xdev targets have been converted to using TARGET and
+	TARGET_ARCH instead of XDEV and XDEV_ARCH.
+
+20140719:
+	The default unbound configuration has been modified to address
+	issues with reverse lookups on networks that use private
+	address ranges.  If you use the local_unbound service, run
+	"service local_unbound setup" as root to regenerate your
+	configuration, then "service local_unbound reload" to load the
+	new configuration.
+
 20140709:
 	The GNU texinfo and GNU info pages are not built and installed
 	anymore, WITH_INFO knob has been added to allow to built and install

Modified: projects/sendfile/bin/sh/eval.c
==============================================================================
--- projects/sendfile/bin/sh/eval.c	Tue Aug  5 09:59:16 2014	(r269578)
+++ projects/sendfile/bin/sh/eval.c	Tue Aug  5 10:08:59 2014	(r269579)
@@ -1250,8 +1250,16 @@ bltincmd(int argc, char **argv)
 int
 breakcmd(int argc, char **argv)
 {
-	int n = argc > 1 ? number(argv[1]) : 1;
+	long n;
+	char *end;
 
+	if (argc > 1) {
+		/* Allow arbitrarily large numbers. */
+		n = strtol(argv[1], &end, 10);
+		if (!is_digit(argv[1][0]) || *end != '\0')
+			error("Illegal number: %s", argv[1]);
+	} else
+		n = 1;
 	if (n > loopnest)
 		n = loopnest;
 	if (n > 0) {

Modified: projects/sendfile/bin/sh/exec.c
==============================================================================
--- projects/sendfile/bin/sh/exec.c	Tue Aug  5 09:59:16 2014	(r269578)
+++ projects/sendfile/bin/sh/exec.c	Tue Aug  5 10:08:59 2014	(r269579)
@@ -365,7 +365,7 @@ find_command(const char *name, struct cm
 	for (;(fullname = padvance(&path, name)) != NULL; stunalloc(fullname)) {
 		idx++;
 		if (pathopt) {
-			if (prefix("func", pathopt)) {
+			if (strncmp(pathopt, "func", 4) == 0) {
 				/* handled below */
 			} else {
 				continue; /* ignore unimplemented options */

Modified: projects/sendfile/bin/sh/jobs.c
==============================================================================
--- projects/sendfile/bin/sh/jobs.c	Tue Aug  5 09:59:16 2014	(r269578)
+++ projects/sendfile/bin/sh/jobs.c	Tue Aug  5 10:08:59 2014	(r269579)
@@ -562,6 +562,7 @@ getjob_nonotfound(const char *name)
 {
 	int jobno;
 	struct job *found, *jp;
+	size_t namelen;
 	pid_t pid;
 	int i;
 
@@ -603,10 +604,12 @@ currentjob:	if ((jp = getcurjob(NULL)) =
 			if (found != NULL)
 				return (found);
 		} else {
+			namelen = strlen(name);
 			found = NULL;
 			for (jp = jobtab, i = njobs ; --i >= 0 ; jp++) {
 				if (jp->used && jp->nprocs > 0
-				 && prefix(name + 1, jp->ps[0].cmd)) {
+				 && strncmp(jp->ps[0].cmd, name + 1,
+				 namelen - 1) == 0) {
 					if (found)
 						error("%s: ambiguous", name);
 					found = jp;

Modified: projects/sendfile/bin/sh/miscbltin.c
==============================================================================
--- projects/sendfile/bin/sh/miscbltin.c	Tue Aug  5 09:59:16 2014	(r269578)
+++ projects/sendfile/bin/sh/miscbltin.c	Tue Aug  5 10:08:59 2014	(r269579)
@@ -411,12 +411,32 @@ static const struct limits limits[] = {
 	{ (char *) 0,		(char *)0,	0,		   0, '\0' }
 };
 
+enum limithow { SOFT = 0x1, HARD = 0x2 };
+
+static void
+printlimit(enum limithow how, const struct rlimit *limit,
+    const struct limits *l)
+{
+	rlim_t val = 0;
+
+	if (how & SOFT)
+		val = limit->rlim_cur;
+	else if (how & HARD)
+		val = limit->rlim_max;
+	if (val == RLIM_INFINITY)
+		out1str("unlimited\n");
+	else
+	{
+		val /= l->factor;
+		out1fmt("%jd\n", (intmax_t)val);
+	}
+}
+
 int
 ulimitcmd(int argc __unused, char **argv __unused)
 {
 	rlim_t val = 0;
-	enum { SOFT = 0x1, HARD = 0x2 }
-			how = SOFT | HARD;
+	enum limithow how = SOFT | HARD;
 	const struct limits	*l;
 	int		set, all = 0;
 	int		optc, what;
@@ -475,10 +495,6 @@ ulimitcmd(int argc __unused, char **argv
 			char optbuf[40];
 			if (getrlimit(l->cmd, &limit) < 0)
 				error("can't get limit: %s", strerror(errno));
-			if (how & SOFT)
-				val = limit.rlim_cur;
-			else if (how & HARD)
-				val = limit.rlim_max;
 
 			if (l->units)
 				snprintf(optbuf, sizeof(optbuf),
@@ -487,13 +503,7 @@ ulimitcmd(int argc __unused, char **argv
 				snprintf(optbuf, sizeof(optbuf),
 					"(-%c) ", l->option);
 			out1fmt("%-18s %18s ", l->name, optbuf);
-			if (val == RLIM_INFINITY)
-				out1str("unlimited\n");
-			else
-			{
-				val /= l->factor;
-				out1fmt("%jd\n", (intmax_t)val);
-			}
+			printlimit(how, &limit, l);
 		}
 		return 0;
 	}
@@ -507,19 +517,7 @@ ulimitcmd(int argc __unused, char **argv
 			limit.rlim_max = val;
 		if (setrlimit(l->cmd, &limit) < 0)
 			error("bad limit: %s", strerror(errno));
-	} else {
-		if (how & SOFT)
-			val = limit.rlim_cur;
-		else if (how & HARD)
-			val = limit.rlim_max;
-
-		if (val == RLIM_INFINITY)
-			out1str("unlimited\n");
-		else
-		{
-			val /= l->factor;
-			out1fmt("%jd\n", (intmax_t)val);
-		}
-	}
+	} else
+		printlimit(how, &limit, l);
 	return 0;
 }

Modified: projects/sendfile/bin/sh/mystring.c
==============================================================================
--- projects/sendfile/bin/sh/mystring.c	Tue Aug  5 09:59:16 2014	(r269578)
+++ projects/sendfile/bin/sh/mystring.c	Tue Aug  5 10:08:59 2014	(r269579)
@@ -61,21 +61,6 @@ char nullstr[1];		/* zero length string 
 
 
 /*
- * prefix -- see if pfx is a prefix of string.
- */
-
-int
-prefix(const char *pfx, const char *string)
-{
-	while (*pfx) {
-		if (*pfx++ != *string++)
-			return 0;
-	}
-	return 1;
-}
-
-
-/*
  * Convert a string of digits to an integer, printing an error message on
  * failure.
  */

Modified: projects/sendfile/bin/sh/mystring.h
==============================================================================
--- projects/sendfile/bin/sh/mystring.h	Tue Aug  5 09:59:16 2014	(r269578)
+++ projects/sendfile/bin/sh/mystring.h	Tue Aug  5 10:08:59 2014	(r269579)
@@ -35,7 +35,6 @@
 
 #include <string.h>
 
-int prefix(const char *, const char *);
 int number(const char *);
 int is_number(const char *);
 

Modified: projects/sendfile/bin/sh/tests/builtins/Makefile
==============================================================================
--- projects/sendfile/bin/sh/tests/builtins/Makefile	Tue Aug  5 09:59:16 2014	(r269578)
+++ projects/sendfile/bin/sh/tests/builtins/Makefile	Tue Aug  5 10:08:59 2014	(r269579)
@@ -14,6 +14,7 @@ FILES+=		break2.0 break2.0.stdout
 FILES+=		break3.0
 FILES+=		break4.4
 FILES+=		break5.4
+FILES+=		break6.0
 FILES+=		builtin1.0
 FILES+=		case1.0
 FILES+=		case2.0

Copied: projects/sendfile/bin/sh/tests/builtins/break6.0 (from r269578, head/bin/sh/tests/builtins/break6.0)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/sendfile/bin/sh/tests/builtins/break6.0	Tue Aug  5 10:08:59 2014	(r269579, copy of r269578, head/bin/sh/tests/builtins/break6.0)
@@ -0,0 +1,8 @@
+# $FreeBSD$
+# Per POSIX, this need only work if LONG_MAX > 4294967295.
+
+while :; do
+	break 4294967296
+	echo bad
+	exit 3
+done

Modified: projects/sendfile/cddl/contrib/dtracetoolkit/Apps/shellsnoop
==============================================================================
--- projects/sendfile/cddl/contrib/dtracetoolkit/Apps/shellsnoop	Tue Aug  5 09:59:16 2014	(r269578)
+++ projects/sendfile/cddl/contrib/dtracetoolkit/Apps/shellsnoop	Tue Aug  5 10:08:59 2014	(r269579)
@@ -1,4 +1,4 @@
-#!/usr/bin/sh
+#!/bin/sh
 #
 # shellsnoop - A program to print read/write details from shells,
 #	       such as keystrokes and command outputs.
@@ -140,18 +140,14 @@ dtrace -n '
  /*
   * Remember this PID is a shell child
   */
- syscall::exec:entry, syscall::exece:entry
+ syscall::execve:entry
  /execname == "sh"   || execname == "ksh"  || execname == "csh"  || 
   execname == "tcsh" || execname == "zsh"  || execname == "bash"/
  {
 	child[pid] = 1;
  
-	/* debug */
-	this->parent = (char *)curthread->t_procp->p_parent->p_user.u_comm;
-	OPT_debug == 1 ? printf("PID %d CMD %s started. (%s)\n",
-	    pid, execname, stringof(this->parent)) : 1;
  }
- syscall::exec:entry, syscall::exece:entry
+ syscall::execve:entry
  /(OPT_pid == 1 && PID != ppid) || (OPT_uid == 1 && UID != uid)/
  {
 	/* forget if filtered */
@@ -256,12 +252,12 @@ dtrace -n '
  /*
   *  Cleanup
   */
- syscall::rexit:entry
+ syscall::exit:entry
  {
 	child[pid] = 0;
 
 	/* debug */
-	this->parent = (char *)curthread->t_procp->p_parent->p_user.u_comm;
+	this->parent = (char *)curthread->td_proc->p_pptr->p_comm;
 	OPT_debug == 1 ? printf("PID %d CMD %s exited. (%s)\n",
 	 pid, execname, stringof(this->parent)) : 1;
  }

Modified: projects/sendfile/cddl/contrib/dtracetoolkit/rwsnoop
==============================================================================
--- projects/sendfile/cddl/contrib/dtracetoolkit/rwsnoop	Tue Aug  5 09:59:16 2014	(r269578)
+++ projects/sendfile/cddl/contrib/dtracetoolkit/rwsnoop	Tue Aug  5 10:08:59 2014	(r269579)
@@ -1,10 +1,10 @@
-#!/usr/bin/ksh
+#!/bin/sh
 #
 # rwsnoop - snoop read/write events.
-#           Written using DTrace (Solaris 10 3/05).
+#           Originally written using DTrace (Solaris 10 3/05).
 #
 # This is measuring reads and writes at the application level. This matches
-# the syscalls read, write, pread and pwrite.
+# the syscalls read, and write.
 #
 # $Id: rwsnoop 3 2007-08-01 10:50:08Z brendan $
 #
@@ -12,15 +12,14 @@
 # 
 #		rwsnoop		# default output
 #
-#		-j		# print project ID
 #		-P		# print parent process ID
 #		-t		# print timestamp, us
 #		-v		# print time, string
-#		-Z		# print zone ID
+#		-J		# print jail ID
 #		-n name		# this process name only
 #		-p PID		# this PID only
 #	eg,
-#		rwsnoop -Z		# print zone ID
+#		rwsnoop -J		# print jail ID
 #		rwsnoop -n bash 	# monitor processes named "bash"
 #		rwsnoop > out.txt	# recommended
 #
@@ -32,8 +31,7 @@
 # FIELDS:
 #		TIME		Timestamp, us
 #		TIMESTR		Time, string
-#		ZONE		Zone ID
-#		PROJ		Project ID
+#		JAIL		JAIL ID
 #		UID		User ID
 #		PID		Process ID
 #		PPID		Parent Process ID
@@ -71,6 +69,7 @@
 # 24-Jul-2005   Brendan Gregg   Created this.
 # 17-Sep-2005	   "      "	Increased switchrate.
 # 17-Sep-2005	   "      "	Last update.
+# 26-Jul-2014   George Neville-Neil	Port to FreeBSD
 #
 
 
@@ -79,8 +78,8 @@
 #
 
 ### default variables
-opt_name=0; opt_pid=0; opt_proj=0; opt_zone=0; opt_time=0; opt_timestr=0
-opt_bytes=1; filter=0; pname=.; pid=0; opt_ppid=0
+opt_name=0; opt_pid=0; opt_jailid=0; opt_time=0; opt_timestr=0
+opt_bytes=1; filter=0; pname=.; pid=0; opt_ppid=0;
 
 ### process options
 while getopts n:Pp:jtvZ name
@@ -89,23 +88,21 @@ do
 	n)	opt_name=1; pname=$OPTARG ;;
 	p)	opt_pid=1; pid=$OPTARG ;;
 	P)	opt_ppid=1 ;;
-	j)	opt_proj=1 ;;
 	t)	opt_time=1 ;;
 	v)	opt_timestr=1 ;;
-	Z)	opt_zone=1 ;;
+	J)	opt_jailid=1 ;;
 	h|?)	cat <<-END >&2
 		USAGE: rwsnoop [-jPtvZ] [-n name] [-p pid]
  
-		                -j       # print project ID
 		                -P       # print parent process ID
 		                -t       # print timestamp, us
 		                -v       # print time, string
-		                -Z       # print zone ID
+		                -J       # print jail ID
 		                -n name  # this process name only
 		                -p PID   # this PID only
 		   eg,
 		        rwsnoop          # default output
-		        rwsnoop -Z       # print zone ID
+		        rwsnoop -J       # print jail ID
 		        rwsnoop -n bash  # monitor processes named "bash"
 		END
 		exit 1
@@ -115,11 +112,13 @@ done
 shift $(( $OPTIND - 1 ))
 
 ### option logic
-if (( opt_name || opt_pid )); then
+if [ $opt_name -ne 0 ]; then
 	filter=1
 fi
 
-
+if [ $opt_pid -ne 0 ]; then
+	filter=1
+fi
 
 #################################
 # --- Main Program, DTrace ---
@@ -128,8 +127,7 @@ fi
  /*
   * Command line arguments
   */
- inline int OPT_proj 	= '$opt_proj';
- inline int OPT_zone 	= '$opt_zone';
+ inline int OPT_jailid 	= '$opt_jailid';
  inline int OPT_bytes 	= '$opt_bytes';
  inline int OPT_name 	= '$opt_name';
  inline int OPT_ppid 	= '$opt_ppid';
@@ -151,11 +149,10 @@ fi
 	/* print header */
 	OPT_time    ? printf("%-14s ", "TIME") : 1;
 	OPT_timestr ? printf("%-20s ", "TIMESTR") : 1;
-	OPT_proj    ? printf("%5s ", "PROJ") : 1;
-	OPT_zone    ? printf("%5s ", "ZONE") : 1;
+	OPT_jailid    ? printf("%5s ", "JAILID") : 1;
 	OPT_ppid    ? printf("%6s ", "PPID") : 1;
-	printf("%5s %6s %-12s %1s %7s %s\n",
-	    "UID", "PID", "CMD", "D", "BYTES", "FILE");
+	printf("%5s %6s %-12s %4s %1s %7s\n",
+	    "UID", "PID", "CMD", "FD", "D", "BYTES");
  }
 
  /*
@@ -205,7 +202,10 @@ fi
  {
 	/*
 	 * Fetch filename
+         * XXX Not yet implemented.
 	 */
+/*
+
 	this->filistp = curthread->t_procp->p_user.u_finfo.fi_list;
 	this->ufentryp = (uf_entry_t *)((uint64_t)this->filistp +
 	    (uint64_t)self->fd * (uint64_t)sizeof(uf_entry_t));
@@ -213,17 +213,16 @@ fi
 	this->vnodep = this->filep != 0 ? this->filep->f_vnode : 0;
 	self->vpath = this->vnodep ? (this->vnodep->v_path != 0 ? 
 	    cleanpath(this->vnodep->v_path) : "<unknown>") : "<unknown>";
-
+*/
 	/*
 	 * Print details
 	 */
 	OPT_time    ? printf("%-14d ", timestamp / 1000) : 1;
 	OPT_timestr ? printf("%-20Y ", walltimestamp) : 1;
-	OPT_proj    ? printf("%5d ", curpsinfo->pr_projid) : 1;
-	OPT_zone    ? printf("%5d ", curpsinfo->pr_zoneid) : 1;
+	OPT_jailid    ? printf("%5d ", curpsinfo->pr_jailid) : 1;
 	OPT_ppid    ? printf("%6d ", ppid) : 1;
-	printf("%5d %6d %-12.12s %1s %7d %s\n",
-	    uid, pid, execname, self->rw, (int)self->size, self->vpath);
+	printf("%5d %6d %-12.12s %4d %1s %7d\n",
+	    uid, pid, execname, self->fd, self->rw, (int)self->size);
 	
 	self->ok = 0;
 	self->fd = 0;

Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/zdb/zdb.8
==============================================================================
--- projects/sendfile/cddl/contrib/opensolaris/cmd/zdb/zdb.8	Tue Aug  5 09:59:16 2014	(r269578)
+++ projects/sendfile/cddl/contrib/opensolaris/cmd/zdb/zdb.8	Tue Aug  5 10:08:59 2014	(r269579)
@@ -19,7 +19,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 1, 2014
+.Dd July 26, 2014
 .Dt ZDB 8
 .Os
 .Sh NAME
@@ -27,11 +27,11 @@
 .Nd Display zpool debugging and consistency information
 .Sh SYNOPSIS
 .Nm
-.Op Fl CumdibcsDvhLXFPA
+.Op Fl CumdibcsDvhLMXFPA
 .Op Fl e Op Fl p Ar path...
 .Op Fl t Ar txg
 .Op Fl U Ar cache
-.Op Fl M Ar inflight I/Os
+.Op Fl I Ar inflight I/Os
 .Op Fl x Ar dumpdir
 .Ar poolname
 .Op Ar object ...
@@ -42,7 +42,7 @@
 .Ar dataset
 .Op Ar object ...
 .Nm
-.Fl m Op Fl LXFPA
+.Fl m Op Fl MLXFPA
 .Op Fl t Ar txg
 .Op Fl e Op Fl p Ar path...
 .Op Fl U Ar cache
@@ -155,6 +155,13 @@ 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 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.
@@ -229,7 +236,7 @@ all metadata on the pool.
 .It Fl F
 Attempt to make an unreadable pool readable by trying progressively older
 transactions.
-.It Fl M Ar inflight I/Os
+.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
 .Fl c

Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/zdb/zdb.c
==============================================================================
--- projects/sendfile/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Tue Aug  5 09:59:16 2014	(r269578)
+++ projects/sendfile/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Tue Aug  5 10:08:59 2014	(r269579)
@@ -111,11 +111,11 @@ static void
 usage(void)
 {
 	(void) fprintf(stderr,
-	    "Usage: %s [-CumdibcsDvhLXFPA] [-t txg] [-e [-p path...]] "
-	    "[-U config] [-M inflight I/Os] [-x dumpdir] poolname [object...]\n"
+	    "Usage: %s [-CumMdibcsDvhLXFPA] [-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 -m [-LXFPA] [-t txg] [-e [-p path...]] [-U config] "
+	    "       %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"
@@ -138,6 +138,7 @@ usage(void)
 	(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");
@@ -168,7 +169,7 @@ usage(void)
 	(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, "        -M <number of inflight I/Os> -- "
+	(void) fprintf(stderr, "        -I <number of inflight I/Os> -- "
 	    "specify the maximum number of "
 	    "checksumming I/Os [default is 200]\n");
 	(void) fprintf(stderr, "Specify an option more than once (e.g. -bb) "
@@ -548,7 +549,7 @@ get_metaslab_refcount(vdev_t *vd)
 {
 	int refcount = 0;
 
-	if (vd->vdev_top == vd) {
+	if (vd->vdev_top == vd && !vd->vdev_removing) {
 		for (int m = 0; m < vd->vdev_ms_count; m++) {
 			space_map_t *sm = vd->vdev_ms[m]->ms_sm;
 
@@ -686,9 +687,10 @@ dump_metaslab(metaslab_t *msp)
 		 * The space map histogram represents free space in chunks
 		 * of sm_shift (i.e. bucket 0 refers to 2^sm_shift).
 		 */
-		(void) printf("\tOn-disk histogram:\n");
+		(void) printf("\tOn-disk histogram:\t\tfragmentation %llu\n",
+		    (u_longlong_t)msp->ms_fragmentation);
 		dump_histogram(sm->sm_phys->smp_histogram,
-		    SPACE_MAP_HISTOGRAM_SIZE(sm), sm->sm_shift);
+		    SPACE_MAP_HISTOGRAM_SIZE, sm->sm_shift);
 	}
 
 	if (dump_opt['d'] > 5 || dump_opt['m'] > 3) {
@@ -713,6 +715,47 @@ print_vdev_metaslab_header(vdev_t *vd)
 }
 
 static void
+dump_metaslab_groups(spa_t *spa)
+{
+	vdev_t *rvd = spa->spa_root_vdev;
+	metaslab_class_t *mc = spa_normal_class(spa);
+	uint64_t fragmentation;
+
+	metaslab_class_histogram_verify(mc);
+
+	for (int c = 0; c < rvd->vdev_children; c++) {
+		vdev_t *tvd = rvd->vdev_child[c];
+		metaslab_group_t *mg = tvd->vdev_mg;
+
+		if (mg->mg_class != mc)
+			continue;
+
+		metaslab_group_histogram_verify(mg);
+		mg->mg_fragmentation = metaslab_group_fragmentation(mg);
+
+		(void) printf("\tvdev %10llu\t\tmetaslabs%5llu\t\t"
+		    "fragmentation",
+		    (u_longlong_t)tvd->vdev_id,
+		    (u_longlong_t)tvd->vdev_ms_count);
+		if (mg->mg_fragmentation == ZFS_FRAG_INVALID) {
+			(void) printf("%3s\n", "-");
+		} else {
+			(void) printf("%3llu%%\n",
+			    (u_longlong_t)mg->mg_fragmentation);
+		}
+		dump_histogram(mg->mg_histogram, RANGE_TREE_HISTOGRAM_SIZE, 0);
+	}
+
+	(void) printf("\tpool %s\tfragmentation", spa_name(spa));
+	fragmentation = metaslab_class_fragmentation(mc);
+	if (fragmentation == ZFS_FRAG_INVALID)
+		(void) printf("\t%3s\n", "-");
+	else
+		(void) printf("\t%3llu%%\n", (u_longlong_t)fragmentation);
+	dump_histogram(mc->mc_histogram, RANGE_TREE_HISTOGRAM_SIZE, 0);
+}
+
+static void
 dump_metaslabs(spa_t *spa)
 {
 	vdev_t *vd, *rvd = spa->spa_root_vdev;
@@ -2369,8 +2412,7 @@ zdb_leak(void *arg, uint64_t start, uint
 }
 
 static metaslab_ops_t zdb_metaslab_ops = {
-	NULL,	/* alloc */
-	NULL	/* fragmented */
+	NULL	/* alloc */
 };
 
 static void
@@ -2865,6 +2907,8 @@ dump_zpool(spa_t *spa)
 
 	if (dump_opt['d'] > 2 || dump_opt['m'])
 		dump_metaslabs(spa);
+	if (dump_opt['M'])
+		dump_metaslab_groups(spa);
 
 	if (dump_opt['d'] || dump_opt['i']) {
 		dump_dir(dp->dp_meta_objset);
@@ -3360,7 +3404,7 @@ main(int argc, char **argv)
 	dprintf_setup(&argc, argv);
 
 	while ((c = getopt(argc, argv,
-	    "bcdhilmM:suCDRSAFLXx:evp:t:U:P")) != -1) {
+	    "bcdhilmMI:suCDRSAFLXx:evp:t:U:P")) != -1) {
 		switch (c) {
 		case 'b':
 		case 'c':
@@ -3373,6 +3417,7 @@ main(int argc, char **argv)
 		case 'u':
 		case 'C':
 		case 'D':
+		case 'M':
 		case 'R':
 		case 'S':
 			dump_opt[c]++;
@@ -3386,10 +3431,7 @@ main(int argc, char **argv)
 		case 'P':
 			dump_opt[c]++;
 			break;
-		case 'v':
-			verbose++;
-			break;
-		case 'M':
+		case 'I':
 			max_inflight = strtoull(optarg, NULL, 0);
 			if (max_inflight == 0) {
 				(void) fprintf(stderr, "maximum number "
@@ -3413,9 +3455,6 @@ main(int argc, char **argv)
 			}
 			searchdirs[nsearch++] = optarg;
 			break;
-		case 'x':
-			vn_dumpdir = optarg;
-			break;
 		case 't':
 			max_txg = strtoull(optarg, NULL, 0);
 			if (max_txg < TXG_INITIAL) {
@@ -3427,6 +3466,12 @@ main(int argc, char **argv)
 		case 'U':
 			spa_config_path = optarg;
 			break;
+		case 'v':
+			verbose++;
+			break;
+		case 'x':
+			vn_dumpdir = optarg;
+			break;
 		default:
 			usage();
 			break;

Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool.8
==============================================================================
--- projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool.8	Tue Aug  5 09:59:16 2014	(r269578)
+++ projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool.8	Tue Aug  5 10:08:59 2014	(r269579)
@@ -21,12 +21,12 @@
 .\" Copyright (c) 2010, Sun Microsystems, Inc. All Rights Reserved.
 .\" Copyright 2011, Nexenta Systems, Inc. All Rights Reserved.
 .\" Copyright (c) 2011, Justin T. Gibbs <gibbs at FreeBSD.org>
-.\" Copyright (c) 2012 by Delphix. All Rights Reserved.
+.\" Copyright (c) 2013 by Delphix. All Rights Reserved.
 .\" Copyright (c) 2012, Glen Barber <gjb at FreeBSD.org>
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 14, 2014
+.Dd July 26, 2014
 .Dt ZPOOL 8
 .Os
 .Sh NAME
@@ -543,6 +543,15 @@ For example, a
 value of 1.76 indicates that 1.76 units of data were stored but only 1 unit of disk space was actually consumed. See
 .Xr zfs 8
 for a description of the deduplication feature.
+.It Sy expandsize
+Amount of uninitialized space within the pool or device that can be used to
+increase the total capacity of the pool.
+Uninitialized space consists of
+any space on an EFI labeled vdev which has not been brought online
+.Pq i.e. zpool online -e .
+This space occurs when a LUN is dynamically expanded.
+.It Sy fragmentation
+The amount of fragmentation in the pool.
 .It Sy free
 Number of blocks within the pool that are not allocated.
 .It Sy freeing
@@ -555,8 +564,6 @@ Over time
 will decrease while
 .Sy free
 increases.
-.It Sy expandsize
-This property has currently no value on FreeBSD.
 .It Sy guid
 A unique identifier for the pool.
 .It Sy health
@@ -1391,7 +1398,10 @@ instead of arbitrary space.
 .It Fl p
 Display numbers in parsable (exact) values.
 .It Fl v
-Show more detailed information.
+Verbose statistics. Reports usage statistics for individual
+.Em vdevs
+within
+the pool, in addition to the pool-wide statistics.
 .It Fl o Ar property Ns Op , Ns Ar ...
 Comma-separated list of properties to display. See the
 .Qq Sx Properties
@@ -1400,6 +1410,8 @@ section for a list of valid properties. 
 .Sy size ,
 .Sy used ,
 .Sy available ,
+.Sy fragmentation ,
+.Sy expandsize ,
 .Sy capacity  ,
 .Sy health ,
 .Sy altroot .
@@ -1785,9 +1797,9 @@ is immediately available to any datasets
 The following command lists all available pools on the system.
 .Bd -literal -offset 2n
 .Li # Ic zpool list
-NAME   SIZE  ALLOC   FREE    CAP  DEDUP  HEALTH  ALTROOT
-pool  2.70T   473G  2.24T    17%  1.00x  ONLINE  -
-test  1.98G  89.5K  1.98G     0%  1.00x  ONLINE  -
+NAME   SIZE  ALLOC   FREE   FRAG  EXPANDSZ    CAP  DEDUP  HEALTH  ALTROOT
+pool  2.70T   473G  2.24T    33%         -    17%  1.00x  ONLINE  -
+test  1.98G  89.5K  1.98G    48%         -     0%  1.00x  ONLINE  -
 .Ed
 .It Sy Example 7 No Listing All Properties for a Pool
 .Pp
@@ -1915,7 +1927,35 @@ subcommand as follows:
 .Bd -literal -offset 2n
 .Li # Ic zpool iostat -v pool 5
 .Ed
-.It Sy Example 15 No Removing a Mirrored Log Device
+.It Xo
+.Sy Example 15
+Displaying expanded space on a device
+.Xc
+.Pp
+The following command dipslays the detailed information for the
+.Em data
+pool.
+This pool is comprised of a single
+.Em raidz
+vdev where one of its
+devices increased its capacity by 10GB.
+In this example, the pool will not
+be able to utilized this extra capacity until all the devices under the
+.Em raidz
+vdev have been expanded.
+.Bd -literal -offset 2n
+.Li # Ic zpool list -v data
+NAME       SIZE  ALLOC   FREE   FRAG  EXPANDSZ    CAP  DEDUP  HEALTH  ALTROOT
+data      23.9G  14.6G  9.30G    48%         -    61%  1.00x  ONLINE  -
+  raidz1  23.9G  14.6G  9.30G    48%         -
+    ada0      -      -      -      -         -
+    ada1      -      -      -      -       10G
+    ada2      -      -      -      -         -
+.Ed
+.It Xo
+.Sy Example 16
+Removing a Mirrored Log Device
+.Xc
 .Pp
 The following command removes the mirrored log device
 .Em mirror-2 .
@@ -1947,7 +1987,12 @@ is:
 .Bd -literal -offset 2n
 .Li # Ic zpool remove tank mirror-2
 .Ed
-.It Sy Example 16 No Recovering a Faulted Tn ZFS No Pool
+.It Xo
+.Sy Example 17
+Recovering a Faulted
+.Tn ZFS
+Pool
+.Xc
 .Pp
 If a pool is faulted but recoverable, a message indicating this state is
 provided by

Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
==============================================================================
--- projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Tue Aug  5 09:59:16 2014	(r269578)
+++ projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Tue Aug  5 10:08:59 2014	(r269579)
@@ -2900,10 +2900,15 @@ print_one_column(zpool_prop_t prop, uint
 	boolean_t fixed;
 	size_t width = zprop_width(prop, &fixed, ZFS_TYPE_POOL);
 
-	zfs_nicenum(value, propval, sizeof (propval));
 
 	if (prop == ZPOOL_PROP_EXPANDSZ && value == 0)
 		(void) strlcpy(propval, "-", sizeof (propval));
+	else if (prop == ZPOOL_PROP_FRAGMENTATION && value == ZFS_FRAG_INVALID)
+		(void) strlcpy(propval, "-", sizeof (propval));
+	else if (prop == ZPOOL_PROP_FRAGMENTATION)
+		(void) snprintf(propval, sizeof (propval), "%llu%%", value);
+	else
+		zfs_nicenum(value, propval, sizeof (propval));
 
 	if (scripted)
 		(void) printf("\t%s", propval);
@@ -2936,9 +2941,9 @@ print_list_stats(zpool_handle_t *zhp, co
 		/* only toplevel vdevs have capacity stats */
 		if (vs->vs_space == 0) {
 			if (scripted)
-				(void) printf("\t-\t-\t-");
+				(void) printf("\t-\t-\t-\t-");
 			else
-				(void) printf("      -      -      -");
+				(void) printf("      -      -      -      -");
 		} else {
 			print_one_column(ZPOOL_PROP_SIZE, vs->vs_space,
 			    scripted);
@@ -2946,6 +2951,8 @@ print_list_stats(zpool_handle_t *zhp, co
 			    scripted);
 			print_one_column(ZPOOL_PROP_FREE,
 			    vs->vs_space - vs->vs_alloc, scripted);
+			print_one_column(ZPOOL_PROP_FRAGMENTATION,
+			    vs->vs_fragmentation, scripted);
 		}
 		print_one_column(ZPOOL_PROP_EXPANDSZ, vs->vs_esize,
 		    scripted);
@@ -3031,8 +3038,8 @@ zpool_do_list(int argc, char **argv)
 	int ret;
 	list_cbdata_t cb = { 0 };
 	static char default_props[] =
-	    "name,size,allocated,free,capacity,dedupratio,"
-	    "health,altroot";
+	    "name,size,allocated,free,fragmentation,expandsize,capacity,"
+	    "dedupratio,health,altroot";
 	char *props = default_props;
 	unsigned long interval = 0, count = 0;
 	zpool_list_t *list;

Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/ztest/ztest.c
==============================================================================
--- projects/sendfile/cddl/contrib/opensolaris/cmd/ztest/ztest.c	Tue Aug  5 09:59:16 2014	(r269578)
+++ projects/sendfile/cddl/contrib/opensolaris/cmd/ztest/ztest.c	Tue Aug  5 10:08:59 2014	(r269579)
@@ -172,7 +172,7 @@ static const ztest_shared_opts_t ztest_o
 	.zo_mirrors = 2,
 	.zo_raidz = 4,
 	.zo_raidz_parity = 1,
-	.zo_vdev_size = SPA_MINDEVSIZE,
+	.zo_vdev_size = SPA_MINDEVSIZE * 2,
 	.zo_datasets = 7,
 	.zo_threads = 23,
 	.zo_passtime = 60,		/* 60 seconds */
@@ -810,7 +810,7 @@ static uint64_t
 ztest_get_ashift(void)
 {
 	if (ztest_opts.zo_ashift == 0)
-		return (SPA_MINBLOCKSHIFT + ztest_random(3));
+		return (SPA_MINBLOCKSHIFT + ztest_random(5));
 	return (ztest_opts.zo_ashift);
 }
 
@@ -969,11 +969,28 @@ ztest_random_spa_version(uint64_t initia
 	return (version);

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

More information about the svn-src-projects mailing list