Date: Fri, 21 Nov 2014 01:22:35 +0000 (UTC) From: "Alexander V. Chernikov" <melifaro@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274768 - in projects/routing: . bin/sh cddl/contrib/opensolaris/cmd/zdb cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/cmd/zpool cddl/contrib/opensolaris/cmd/zstreamdump cdd... Message-ID: <201411210122.sAL1MZkL001392@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: melifaro Date: Fri Nov 21 01:22:33 2014 New Revision: 274768 URL: https://svnweb.freebsd.org/changeset/base/274768 Log: Sync to HEAD@r274766 Added: projects/routing/contrib/llvm/patches/patch-r274442-llvm-r221709-debug-oom.diff - copied unchanged from r274766, head/contrib/llvm/patches/patch-r274442-llvm-r221709-debug-oom.diff projects/routing/contrib/telnet/telnet/baud.h - copied unchanged from r274766, head/contrib/telnet/telnet/baud.h projects/routing/lib/libc/tests/gen/arc4random_test.c - copied unchanged from r274766, head/lib/libc/tests/gen/arc4random_test.c projects/routing/lib/libc/tests/gen/fpclassify2_test.c - copied unchanged from r274766, head/lib/libc/tests/gen/fpclassify2_test.c projects/routing/lib/libc/tests/stdio/fmemopen2_test.c - copied unchanged from r274766, head/lib/libc/tests/stdio/fmemopen2_test.c projects/routing/lib/librt/Makefile.amd64 - copied unchanged from r274766, head/lib/librt/Makefile.amd64 projects/routing/lib/librt/Makefile.i386 - copied unchanged from r274766, head/lib/librt/Makefile.i386 projects/routing/lib/librt/tests/ - copied from r274766, head/lib/librt/tests/ projects/routing/lib/libthr/Makefile.amd64 - copied unchanged from r274766, head/lib/libthr/Makefile.amd64 projects/routing/lib/libthr/Makefile.i386 - copied unchanged from r274766, head/lib/libthr/Makefile.i386 projects/routing/lib/libthr/tests/ - copied from r274766, head/lib/libthr/tests/ projects/routing/lib/msun/Makefile.amd64 - copied unchanged from r274766, head/lib/msun/Makefile.amd64 projects/routing/lib/msun/Makefile.i386 - copied unchanged from r274766, head/lib/msun/Makefile.i386 projects/routing/lib/msun/tests/ - copied from r274766, head/lib/msun/tests/ projects/routing/share/man/man9/vnet.9 - copied unchanged from r274766, head/share/man/man9/vnet.9 projects/routing/sys/dev/altera/pio/ - copied from r274766, head/sys/dev/altera/pio/ projects/routing/sys/dev/beri/virtio/ - copied from r274766, head/sys/dev/beri/virtio/ projects/routing/sys/dev/virtio/mmio/ - copied from r274766, head/sys/dev/virtio/mmio/ projects/routing/tools/build/options/WITHOUT_INCLUDES - copied unchanged from r274766, head/tools/build/options/WITHOUT_INCLUDES projects/routing/tools/build/options/WITHOUT_TESTS_SUPPORT - copied unchanged from r274766, head/tools/build/options/WITHOUT_TESTS_SUPPORT projects/routing/tools/build/options/WITHOUT_USB_GADGET_EXAMPLES - copied unchanged from r274766, head/tools/build/options/WITHOUT_USB_GADGET_EXAMPLES projects/routing/usr.sbin/pw/tests/pw_etcdir.sh - copied unchanged from r274766, head/usr.sbin/pw/tests/pw_etcdir.sh projects/routing/usr.sbin/pw/tests/pw_lock.sh - copied unchanged from r274766, head/usr.sbin/pw/tests/pw_lock.sh Deleted: projects/routing/etc/rc.d/faith projects/routing/lib/libc/posix1e/acl_size.c projects/routing/share/man/man4/faith.4 projects/routing/sys/dev/dpt/dpt_isa.c projects/routing/sys/modules/if_faith/ projects/routing/sys/sys/sf_base.h projects/routing/sys/sys/sf_sync.h projects/routing/tools/regression/lib/libc/gen/test-arc4random.c projects/routing/tools/regression/lib/libc/gen/test-fpclassify.c projects/routing/tools/regression/lib/libc/stdio/test-fmemopen.c projects/routing/usr.sbin/faithd/ Modified: projects/routing/MAINTAINERS (contents, props changed) projects/routing/Makefile.inc1 projects/routing/ObsoleteFiles.inc projects/routing/UPDATING projects/routing/bin/sh/sh.1 projects/routing/cddl/contrib/opensolaris/cmd/zdb/zdb.c projects/routing/cddl/contrib/opensolaris/cmd/zfs/zfs.8 projects/routing/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c projects/routing/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 projects/routing/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.c projects/routing/cddl/contrib/opensolaris/cmd/ztest/ztest.c projects/routing/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dof.c projects/routing/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c projects/routing/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.h projects/routing/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h projects/routing/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c projects/routing/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c projects/routing/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c projects/routing/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h projects/routing/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c projects/routing/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c projects/routing/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c projects/routing/contrib/byacc/test/yacc/calc.tab.c projects/routing/contrib/byacc/test/yacc/calc1.tab.c projects/routing/contrib/byacc/test/yacc/calc2.tab.c projects/routing/contrib/byacc/test/yacc/calc3.tab.c projects/routing/contrib/byacc/test/yacc/code_calc.code.c projects/routing/contrib/byacc/test/yacc/code_calc.tab.c projects/routing/contrib/byacc/test/yacc/code_error.code.c projects/routing/contrib/byacc/test/yacc/code_error.tab.c projects/routing/contrib/byacc/test/yacc/empty.tab.c projects/routing/contrib/byacc/test/yacc/err_syntax10.tab.c projects/routing/contrib/byacc/test/yacc/err_syntax11.tab.c projects/routing/contrib/byacc/test/yacc/err_syntax12.tab.c projects/routing/contrib/byacc/test/yacc/err_syntax18.tab.c projects/routing/contrib/byacc/test/yacc/err_syntax20.tab.c projects/routing/contrib/byacc/test/yacc/error.tab.c projects/routing/contrib/byacc/test/yacc/grammar.tab.c projects/routing/contrib/byacc/test/yacc/ok_syntax1.tab.c projects/routing/contrib/byacc/test/yacc/pure_calc.tab.c projects/routing/contrib/byacc/test/yacc/pure_error.tab.c projects/routing/contrib/byacc/test/yacc/quote_calc-s.tab.c projects/routing/contrib/byacc/test/yacc/quote_calc.tab.c projects/routing/contrib/byacc/test/yacc/quote_calc2-s.tab.c projects/routing/contrib/byacc/test/yacc/quote_calc2.tab.c projects/routing/contrib/byacc/test/yacc/quote_calc3-s.tab.c projects/routing/contrib/byacc/test/yacc/quote_calc3.tab.c projects/routing/contrib/byacc/test/yacc/quote_calc4-s.tab.c projects/routing/contrib/byacc/test/yacc/quote_calc4.tab.c projects/routing/contrib/byacc/test/yacc/rename_debug.c projects/routing/contrib/byacc/test/yacc/varsyntax_calc1.tab.c projects/routing/contrib/hyperv/tools/hv_kvp_daemon.c projects/routing/contrib/libxo/README.md projects/routing/contrib/libxo/configure.ac projects/routing/contrib/libxo/libxo/libxo.c projects/routing/contrib/libxo/libxo/xoconfig.h projects/routing/contrib/libxo/libxo/xoversion.h projects/routing/contrib/libxo/tests/core/Makefile.am projects/routing/contrib/libxo/tests/core/saved/test_07.J.out projects/routing/contrib/libxo/tests/core/saved/test_07.JP.out projects/routing/contrib/libxo/tests/core/saved/test_07.X.out projects/routing/contrib/libxo/tests/core/saved/test_07.XP.out projects/routing/contrib/libxo/tests/core/test_07.c projects/routing/contrib/libxo/xolint/xolint.pl projects/routing/contrib/llvm/include/llvm/CodeGen/SelectionDAG.h projects/routing/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp projects/routing/contrib/netbsd-tests/lib/libc/gen/posix_spawn/t_fileactions.c projects/routing/contrib/netbsd-tests/lib/libc/gen/t_getcwd.c projects/routing/contrib/netbsd-tests/lib/libc/gen/t_glob.c projects/routing/contrib/netbsd-tests/lib/libc/gen/t_humanize_number.c projects/routing/contrib/netbsd-tests/lib/libc/gen/t_nice.c projects/routing/contrib/netbsd-tests/lib/libc/gen/t_raise.c projects/routing/contrib/netbsd-tests/lib/libc/gen/t_setdomainname.c projects/routing/contrib/netbsd-tests/lib/libc/gen/t_siginfo.c projects/routing/contrib/netbsd-tests/lib/libc/gen/t_time.c projects/routing/contrib/netbsd-tests/lib/libc/gen/t_ttyname.c projects/routing/contrib/netbsd-tests/lib/libc/locale/t_mbrtowc.c projects/routing/contrib/netbsd-tests/lib/libc/locale/t_mbstowcs.c projects/routing/contrib/netbsd-tests/lib/libc/locale/t_mbtowc.c projects/routing/contrib/netbsd-tests/lib/libc/locale/t_wcstod.c projects/routing/contrib/netbsd-tests/lib/libc/locale/t_wctomb.c projects/routing/contrib/netbsd-tests/lib/libc/net/t_ether_aton.c projects/routing/contrib/netbsd-tests/lib/libc/regex/debug.c projects/routing/contrib/netbsd-tests/lib/libc/regex/t_exhaust.c projects/routing/contrib/netbsd-tests/lib/libc/regex/t_regex_att.c projects/routing/contrib/netbsd-tests/lib/libc/stdlib/h_atexit.c projects/routing/contrib/netbsd-tests/lib/libc/stdlib/h_getopt.c projects/routing/contrib/netbsd-tests/lib/libc/stdlib/h_getopt_long.c projects/routing/contrib/netbsd-tests/lib/libc/stdlib/t_getenv.c projects/routing/contrib/netbsd-tests/lib/libc/stdlib/t_hsearch.c projects/routing/contrib/netbsd-tests/lib/libc/string/t_memcpy.c projects/routing/contrib/netbsd-tests/lib/libc/string/t_strerror.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_access.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_clock_gettime.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_getgroups.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_getrusage.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_kevent.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_listen.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_msgrcv.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_msgsnd.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_nanosleep.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_pipe2.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_poll.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_revoke.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_sigqueue.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_stat.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_timer_create.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_unlink.c projects/routing/contrib/netbsd-tests/lib/libc/sys/t_write.c projects/routing/contrib/netbsd-tests/lib/libc/time/t_strptime.c projects/routing/contrib/netbsd-tests/lib/libc/tls/dso/h_tls_dlopen.c projects/routing/contrib/netbsd-tests/lib/libc/tls/t_tls_dlopen.c projects/routing/contrib/netbsd-tests/lib/libc/tls/t_tls_dynamic.c projects/routing/contrib/netbsd-tests/lib/libc/tls/t_tls_static.c projects/routing/contrib/netbsd-tests/lib/libc/tls/t_tls_static_helper.c projects/routing/contrib/netbsd-tests/lib/libc/tls_dso/h_tls_dynamic.c projects/routing/contrib/netbsd-tests/lib/libm/t_cbrt.c projects/routing/contrib/netbsd-tests/lib/libm/t_exp.c projects/routing/contrib/netbsd-tests/lib/libm/t_pow.c projects/routing/contrib/netbsd-tests/lib/libm/t_precision.c projects/routing/contrib/netbsd-tests/lib/libm/t_scalbn.c projects/routing/contrib/netbsd-tests/lib/libpthread/h_atexit.c projects/routing/contrib/netbsd-tests/lib/libpthread/h_cancel.c projects/routing/contrib/netbsd-tests/lib/libpthread/t_condwait.c projects/routing/contrib/netbsd-tests/lib/libpthread/t_detach.c projects/routing/contrib/netbsd-tests/lib/libpthread/t_fork.c projects/routing/contrib/netbsd-tests/lib/libpthread/t_join.c projects/routing/contrib/netbsd-tests/lib/libpthread/t_mutex.c projects/routing/contrib/netbsd-tests/lib/libpthread/t_once.c projects/routing/contrib/netbsd-tests/lib/libpthread/t_sem.c projects/routing/contrib/netbsd-tests/lib/librt/t_sem.c projects/routing/contrib/ofed/librdmacm/examples/rping.c projects/routing/contrib/telnet/arpa/telnet.h projects/routing/contrib/telnet/telnet/commands.c projects/routing/contrib/telnet/telnet/externs.h projects/routing/contrib/telnet/telnet/main.c projects/routing/contrib/telnet/telnet/sys_bsd.c projects/routing/contrib/telnet/telnet/telnet.1 projects/routing/contrib/telnet/telnet/telnet.c projects/routing/contrib/telnet/telnet/types.h projects/routing/contrib/telnet/telnetd/sys_term.c projects/routing/contrib/tzdata/africa projects/routing/contrib/tzdata/asia projects/routing/contrib/tzdata/australasia projects/routing/contrib/tzdata/europe projects/routing/contrib/tzdata/northamerica projects/routing/contrib/tzdata/southamerica projects/routing/etc/defaults/rc.conf projects/routing/etc/devd/apple.conf projects/routing/etc/mtree/BSD.tests.dist projects/routing/etc/network.subr projects/routing/etc/rc.d/Makefile projects/routing/etc/rc.d/NETWORKING projects/routing/etc/rc.d/bridge projects/routing/etc/rc.d/defaultroute projects/routing/etc/rc.d/routing projects/routing/gnu/usr.bin/gdb/kgdb/kgdb.h projects/routing/gnu/usr.bin/gdb/kgdb/trgt_i386.c projects/routing/lib/libc/net/getaddrinfo.c projects/routing/lib/libc/net/getnameinfo.c projects/routing/lib/libc/sys/Makefile.inc projects/routing/lib/libc/sys/Symbol.map projects/routing/lib/libc/sys/poll.2 projects/routing/lib/libc/tests/gen/Makefile projects/routing/lib/libc/tests/stdio/Makefile projects/routing/lib/libexpat/Makefile projects/routing/lib/librt/Makefile projects/routing/lib/libthr/Makefile projects/routing/lib/msun/Makefile projects/routing/libexec/fingerd/fingerd.8 projects/routing/libexec/telnetd/Makefile projects/routing/release/picobsd/bridge/PICOBSD projects/routing/release/picobsd/qemu/PICOBSD projects/routing/sbin/camcontrol/camcontrol.c projects/routing/sbin/gbde/gbde.8 projects/routing/sbin/gbde/gbde.c projects/routing/sbin/geom/core/geom.c projects/routing/sbin/growfs/growfs.8 projects/routing/sbin/ifconfig/ifgroup.c projects/routing/sbin/reboot/boot_i386.8 projects/routing/sbin/route/keywords projects/routing/sbin/route/route.8 projects/routing/sbin/route/route.c projects/routing/share/man/man4/Makefile projects/routing/share/man/man4/acpi.4 projects/routing/share/man/man4/dpt.4 projects/routing/share/man/man4/inet.4 projects/routing/share/man/man4/inet6.4 projects/routing/share/man/man4/ip6.4 projects/routing/share/man/man4/ipheth.4 projects/routing/share/man/man4/iscsi_initiator.4 projects/routing/share/man/man4/rsu.4 projects/routing/share/man/man4/splash.4 projects/routing/share/man/man4/virtio_console.4 projects/routing/share/man/man5/rc.conf.5 projects/routing/share/man/man7/hier.7 projects/routing/share/man/man7/security.7 projects/routing/share/man/man9/Makefile projects/routing/share/mk/bsd.incs.mk projects/routing/share/mk/bsd.lib.mk projects/routing/share/mk/bsd.opts.mk projects/routing/share/mk/bsd.own.mk projects/routing/share/mk/bsd.prog.mk projects/routing/share/mk/src.opts.mk projects/routing/share/mk/sys.mk projects/routing/sys/amd64/amd64/genassym.c projects/routing/sys/amd64/amd64/pmap.c projects/routing/sys/amd64/amd64/support.S projects/routing/sys/amd64/conf/GENERIC projects/routing/sys/amd64/include/asmacros.h projects/routing/sys/amd64/include/vmparam.h projects/routing/sys/arm/allwinner/a10_gpio.c projects/routing/sys/arm/arm/busdma_machdep-v6.c projects/routing/sys/arm/arm/gic.c projects/routing/sys/arm/arm/stdatomic.c projects/routing/sys/arm/broadcom/bcm2835/bcm2835_bsc.c projects/routing/sys/arm/broadcom/bcm2835/bcm2835_common.c projects/routing/sys/arm/broadcom/bcm2835/bcm2835_gpio.c projects/routing/sys/arm/broadcom/bcm2835/bcm2835_machdep.c projects/routing/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c projects/routing/sys/arm/conf/ATMEL projects/routing/sys/arm/conf/DOCKSTAR projects/routing/sys/arm/conf/DREAMPLUG-1001 projects/routing/sys/arm/conf/EFIKA_MX projects/routing/sys/arm/conf/ETHERNUT5 projects/routing/sys/arm/conf/IMX53 projects/routing/sys/arm/conf/IMX6 projects/routing/sys/arm/conf/SAM9260EK projects/routing/sys/arm/freescale/imx/imx_common.c projects/routing/sys/arm/freescale/imx/imx_gpio.c projects/routing/sys/arm/freescale/imx/imx_i2c.c projects/routing/sys/arm/freescale/imx/imx_iomux.c projects/routing/sys/arm/freescale/vybrid/vf_gpio.c projects/routing/sys/arm/include/asmacros.h projects/routing/sys/arm/mv/mv_common.c projects/routing/sys/arm/rockchip/rk30xx_gpio.c projects/routing/sys/arm/samsung/exynos/exynos5_pad.c projects/routing/sys/arm/ti/ti_common.c projects/routing/sys/arm/ti/ti_gpio.c projects/routing/sys/arm/ti/ti_i2c.c projects/routing/sys/arm/versatile/versatile_common.c projects/routing/sys/arm/versatile/versatile_machdep.c projects/routing/sys/arm/xilinx/uart_dev_cdnc.c projects/routing/sys/arm/xilinx/zy7_machdep.c projects/routing/sys/arm/xscale/ixp425/avila_gpio.c projects/routing/sys/arm/xscale/ixp425/cambria_gpio.c projects/routing/sys/boot/common/load_elf.c projects/routing/sys/boot/efi/include/efiapi.h projects/routing/sys/boot/ficl/amd64/sysdep.c projects/routing/sys/boot/ficl/arm/sysdep.c projects/routing/sys/boot/ficl/i386/sysdep.c projects/routing/sys/boot/ficl/mips/sysdep.c projects/routing/sys/boot/ficl/mips64/sysdep.c projects/routing/sys/boot/ficl/powerpc/sysdep.c projects/routing/sys/boot/ficl/sparc64/sysdep.c projects/routing/sys/boot/forth/loader.conf projects/routing/sys/boot/i386/loader/conf.c projects/routing/sys/boot/pc98/loader/conf.c projects/routing/sys/boot/zfs/zfsimpl.c projects/routing/sys/cam/ctl/ctl.c projects/routing/sys/cam/ctl/ctl_cmd_table.c projects/routing/sys/cam/ctl/ctl_frontend_iscsi.c projects/routing/sys/cam/scsi/scsi_all.c projects/routing/sys/cam/scsi/scsi_all.h projects/routing/sys/cam/scsi/scsi_low.c projects/routing/sys/cam/scsi/scsi_low.h projects/routing/sys/cam/scsi/scsi_xpt.c projects/routing/sys/cddl/boot/zfs/zfsimpl.h projects/routing/sys/cddl/compat/opensolaris/sys/vnode.h projects/routing/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c projects/routing/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h projects/routing/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c projects/routing/sys/cddl/contrib/opensolaris/common/zfs/zpool_prop.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bptree.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deadlist.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_send.h projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/trim_map.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c projects/routing/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h projects/routing/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h projects/routing/sys/compat/freebsd32/freebsd32_misc.c projects/routing/sys/compat/freebsd32/freebsd32_proto.h projects/routing/sys/compat/freebsd32/freebsd32_syscall.h projects/routing/sys/compat/freebsd32/freebsd32_syscalls.c projects/routing/sys/compat/freebsd32/freebsd32_sysent.c projects/routing/sys/compat/freebsd32/freebsd32_systrace_args.c projects/routing/sys/compat/freebsd32/syscalls.master projects/routing/sys/compat/linux/linux_file.c projects/routing/sys/compat/linux/linux_misc.c projects/routing/sys/compat/linux/linux_socket.c projects/routing/sys/compat/linux/linux_stats.c projects/routing/sys/compat/linux/linux_uid16.c projects/routing/sys/compat/svr4/svr4_fcntl.c projects/routing/sys/compat/svr4/svr4_misc.c projects/routing/sys/compat/svr4/svr4_stat.c projects/routing/sys/compat/svr4/svr4_stream.c projects/routing/sys/conf/NOTES projects/routing/sys/conf/files projects/routing/sys/conf/kern.opts.mk projects/routing/sys/conf/newvers.sh projects/routing/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c (contents, props changed) projects/routing/sys/contrib/ngatm/netnatm/saal/saal_sscop.c projects/routing/sys/crypto/rijndael/rijndael-api-fst.c projects/routing/sys/crypto/rijndael/rijndael-api-fst.h projects/routing/sys/dev/acpica/acpi.c projects/routing/sys/dev/agp/agp_i810.c projects/routing/sys/dev/ath/if_ath.c projects/routing/sys/dev/ct/bshw_machdep.c projects/routing/sys/dev/ct/ct.c projects/routing/sys/dev/ct/ct_isa.c projects/routing/sys/dev/ct/ct_machdep.h projects/routing/sys/dev/ct/ctvar.h projects/routing/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c projects/routing/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c projects/routing/sys/dev/cxgbe/common/common.h projects/routing/sys/dev/cxgbe/common/t4_hw.c projects/routing/sys/dev/cxgbe/firmware/t4fw_cfg.txt projects/routing/sys/dev/cxgbe/firmware/t4fw_cfg_uwire.txt projects/routing/sys/dev/cxgbe/firmware/t5fw_cfg.txt projects/routing/sys/dev/cxgbe/firmware/t5fw_cfg_fpga.txt projects/routing/sys/dev/cxgbe/firmware/t5fw_cfg_uwire.txt projects/routing/sys/dev/cxgbe/iw_cxgbe/cm.c projects/routing/sys/dev/cxgbe/t4_main.c projects/routing/sys/dev/cxgbe/tom/t4_cpl_io.c projects/routing/sys/dev/cxgbe/tom/t4_ddp.c projects/routing/sys/dev/drm2/radeon/radeon_connectors.c projects/routing/sys/dev/fdt/fdt_common.c projects/routing/sys/dev/fdt/fdt_pinctrl.c projects/routing/sys/dev/gpio/gpio_if.m projects/routing/sys/dev/gpio/gpiobus.c projects/routing/sys/dev/gpio/gpiobusvar.h projects/routing/sys/dev/gpio/gpioc.c projects/routing/sys/dev/gpio/ofw_gpiobus.c projects/routing/sys/dev/hwpmc/hwpmc_mod.c projects/routing/sys/dev/iicbus/iicbus.c projects/routing/sys/dev/iicbus/iicbus.h projects/routing/sys/dev/iicbus/iicbus_if.m projects/routing/sys/dev/iir/iir.c projects/routing/sys/dev/iir/iir.h projects/routing/sys/dev/iir/iir_ctrl.c projects/routing/sys/dev/iir/iir_pci.c projects/routing/sys/dev/ips/ips.c projects/routing/sys/dev/ips/ips.h projects/routing/sys/dev/ips/ips_pci.c projects/routing/sys/dev/iscsi/icl.c projects/routing/sys/dev/isp/isp_freebsd.c projects/routing/sys/dev/isp/isp_freebsd.h projects/routing/sys/dev/ixgbe/ixgbe.c projects/routing/sys/dev/mcd/mcd.c projects/routing/sys/dev/mcd/mcd_isa.c projects/routing/sys/dev/mcd/mcdvar.h projects/routing/sys/dev/mly/mly.c projects/routing/sys/dev/mly/mlyvar.h projects/routing/sys/dev/ncv/ncr53c500.c projects/routing/sys/dev/ncv/ncr53c500_pccard.c projects/routing/sys/dev/ncv/ncr53c500var.h projects/routing/sys/dev/netmap/netmap.c projects/routing/sys/dev/netmap/netmap_freebsd.c projects/routing/sys/dev/netmap/netmap_generic.c projects/routing/sys/dev/netmap/netmap_kern.h projects/routing/sys/dev/netmap/netmap_monitor.c projects/routing/sys/dev/netmap/netmap_pipe.c projects/routing/sys/dev/nsp/nsp.c projects/routing/sys/dev/nsp/nsp_pccard.c projects/routing/sys/dev/nsp/nspvar.h projects/routing/sys/dev/null/null.c projects/routing/sys/dev/ofw/ofw_iicbus.c projects/routing/sys/dev/pccbb/pccbb.c projects/routing/sys/dev/pci/pci.c projects/routing/sys/dev/pst/pst-pci.c projects/routing/sys/dev/pst/pst-raid.c projects/routing/sys/dev/random/fortuna.c projects/routing/sys/dev/random/hash.c projects/routing/sys/dev/random/hash.h projects/routing/sys/dev/random/ivy.c projects/routing/sys/dev/rp/rp.c projects/routing/sys/dev/rp/rp_pci.c projects/routing/sys/dev/rp/rpreg.h projects/routing/sys/dev/rp/rpvar.h projects/routing/sys/dev/scd/scd.c projects/routing/sys/dev/scd/scd_isa.c projects/routing/sys/dev/scd/scdvar.h projects/routing/sys/dev/stg/tmc18c30.c projects/routing/sys/dev/stg/tmc18c30_isa.c projects/routing/sys/dev/stg/tmc18c30_pccard.c projects/routing/sys/dev/stg/tmc18c30_pci.c projects/routing/sys/dev/stg/tmc18c30_subr.c projects/routing/sys/dev/stg/tmc18c30var.h projects/routing/sys/dev/streams/streams.c projects/routing/sys/dev/uart/uart_bus_fdt.c projects/routing/sys/dev/uart/uart_dev_pl011.c projects/routing/sys/dev/usb/usbdevs projects/routing/sys/dev/usb/wlan/if_rsu.c projects/routing/sys/dev/virtio/block/virtio_blk.c projects/routing/sys/dev/virtio/network/if_vtnet.c projects/routing/sys/dev/wds/wd7000.c projects/routing/sys/dev/wl/if_wl.c projects/routing/sys/dev/wl/if_wl.h projects/routing/sys/dev/xen/netback/netback.c projects/routing/sys/fs/ext2fs/ext2_extern.h projects/routing/sys/fs/ext2fs/ext2_inode_cnv.c projects/routing/sys/fs/ext2fs/ext2_vfsops.c projects/routing/sys/geom/bde/g_bde.c projects/routing/sys/geom/bde/g_bde.h projects/routing/sys/geom/geom_dev.c projects/routing/sys/geom/part/g_part.c projects/routing/sys/geom/part/g_part_bsd.c projects/routing/sys/geom/part/g_part_if.m projects/routing/sys/i386/conf/GENERIC projects/routing/sys/i386/conf/XBOX projects/routing/sys/i386/conf/XEN projects/routing/sys/i386/i386/pmap.c projects/routing/sys/i386/ibcs2/ibcs2_fcntl.c projects/routing/sys/i386/ibcs2/ibcs2_misc.c projects/routing/sys/i386/ibcs2/ibcs2_other.c projects/routing/sys/i386/ibcs2/ibcs2_stat.c projects/routing/sys/i386/ibcs2/ibcs2_xenix.c projects/routing/sys/i386/include/vmparam.h projects/routing/sys/i386/isa/spic.c projects/routing/sys/i386/xen/locore.s projects/routing/sys/kern/init_main.c projects/routing/sys/kern/init_sysent.c projects/routing/sys/kern/kern_clock.c projects/routing/sys/kern/kern_cons.c projects/routing/sys/kern/kern_descrip.c projects/routing/sys/kern/kern_event.c projects/routing/sys/kern/kern_fork.c projects/routing/sys/kern/kern_lock.c projects/routing/sys/kern/kern_mutex.c projects/routing/sys/kern/kern_shutdown.c projects/routing/sys/kern/kern_umtx.c projects/routing/sys/kern/subr_prof.c projects/routing/sys/kern/sys_generic.c projects/routing/sys/kern/sys_socket.c projects/routing/sys/kern/syscalls.c projects/routing/sys/kern/syscalls.master projects/routing/sys/kern/systrace_args.c projects/routing/sys/kern/uipc_sockbuf.c projects/routing/sys/kern/uipc_socket.c projects/routing/sys/kern/uipc_syscalls.c projects/routing/sys/kern/uipc_usrreq.c projects/routing/sys/kern/vfs_mountroot.c projects/routing/sys/kern/vfs_syscalls.c projects/routing/sys/kern/vfs_vnops.c projects/routing/sys/libkern/strncmp.c projects/routing/sys/mips/atheros/ar71xx_gpio.c projects/routing/sys/mips/cavium/octeon_gpio.c projects/routing/sys/mips/conf/GXEMUL projects/routing/sys/mips/conf/GXEMUL32 projects/routing/sys/mips/conf/MALTA projects/routing/sys/mips/conf/MALTA64 projects/routing/sys/mips/conf/OCTEON1 projects/routing/sys/mips/include/cache_mipsNN.h projects/routing/sys/mips/include/cpuinfo.h projects/routing/sys/mips/include/cpuregs.h projects/routing/sys/mips/mips/cache.c projects/routing/sys/mips/mips/cache_mipsNN.c projects/routing/sys/mips/mips/cpu.c projects/routing/sys/mips/mips/stdatomic.c projects/routing/sys/mips/mips/trap.c projects/routing/sys/mips/rmi/rootfs_list.txt projects/routing/sys/mips/rt305x/rt305x_gpio.c projects/routing/sys/modules/Makefile projects/routing/sys/modules/cxgb/tom/Makefile projects/routing/sys/modules/dpt/Makefile projects/routing/sys/modules/geom/geom_part/geom_part_bsd/Makefile projects/routing/sys/modules/if_gif/Makefile projects/routing/sys/modules/if_gre/Makefile projects/routing/sys/modules/lmc/Makefile projects/routing/sys/net/ethernet.h projects/routing/sys/net/if.c projects/routing/sys/net/if_clone.c projects/routing/sys/net/if_clone.h projects/routing/sys/net/if_ethersubr.c projects/routing/sys/net/if_types.h projects/routing/sys/net/if_var.h projects/routing/sys/net/if_vlan_var.h projects/routing/sys/net/netmap_user.h projects/routing/sys/net/route.c projects/routing/sys/net/route.h projects/routing/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c projects/routing/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c projects/routing/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c projects/routing/sys/netinet/accf_dns.c projects/routing/sys/netinet/accf_http.c projects/routing/sys/netinet/in.h projects/routing/sys/netinet/in_pcb.c projects/routing/sys/netinet/in_pcb.h projects/routing/sys/netinet/in_rmx.c projects/routing/sys/netinet/in_var.h projects/routing/sys/netinet/ip_fastfwd.c projects/routing/sys/netinet/ip_icmp.c projects/routing/sys/netinet/ip_input.c projects/routing/sys/netinet/ip_output.c projects/routing/sys/netinet/siftr.c projects/routing/sys/netinet/tcp_input.c projects/routing/sys/netinet/tcp_output.c projects/routing/sys/netinet/tcp_subr.c projects/routing/sys/netinet/tcp_var.h projects/routing/sys/netinet6/frag6.c projects/routing/sys/netinet6/icmp6.c projects/routing/sys/netinet6/in6.c projects/routing/sys/netinet6/in6.h projects/routing/sys/netinet6/in6_ifattach.c projects/routing/sys/netinet6/in6_pcb.c projects/routing/sys/netinet6/in6_proto.c projects/routing/sys/netinet6/in6_rmx.c projects/routing/sys/netinet6/in6_src.c projects/routing/sys/netinet6/ip6_input.c projects/routing/sys/netinet6/ip6_ipsec.c projects/routing/sys/netinet6/ip6_output.c projects/routing/sys/netinet6/ip6_var.h projects/routing/sys/netinet6/nd6.c projects/routing/sys/netinet6/nd6.h projects/routing/sys/netinet6/nd6_nbr.c projects/routing/sys/netinet6/raw_ip6.c projects/routing/sys/netinet6/scope6.c projects/routing/sys/netinet6/scope6_var.h projects/routing/sys/netinet6/sctp6_usrreq.c projects/routing/sys/netinet6/udp6_usrreq.c projects/routing/sys/netipsec/ipsec_input.c projects/routing/sys/netipsec/ipsec_output.c projects/routing/sys/netipsec/xform_ipip.c projects/routing/sys/netpfil/ipfw/ip_fw_private.h projects/routing/sys/netpfil/pf/pf.c projects/routing/sys/netpfil/pf/pf_ioctl.c projects/routing/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c projects/routing/sys/ofed/drivers/infiniband/ulp/sdp/sdp_rx.c projects/routing/sys/pc98/conf/GENERIC projects/routing/sys/powerpc/aim/trap_subr32.S projects/routing/sys/powerpc/aim/trap_subr64.S projects/routing/sys/powerpc/conf/GENERIC projects/routing/sys/powerpc/conf/GENERIC64 projects/routing/sys/powerpc/conf/WII projects/routing/sys/powerpc/powermac/pmu.c projects/routing/sys/powerpc/powermac/pmuvar.h projects/routing/sys/powerpc/powerpc/db_trace.c projects/routing/sys/powerpc/wii/wii_gpio.c projects/routing/sys/rpc/clnt_vc.c projects/routing/sys/rpc/svc_vc.c projects/routing/sys/sparc64/conf/GENERIC projects/routing/sys/sys/conf.h projects/routing/sys/sys/event.h projects/routing/sys/sys/file.h projects/routing/sys/sys/filedesc.h projects/routing/sys/sys/param.h projects/routing/sys/sys/poll.h projects/routing/sys/sys/protosw.h projects/routing/sys/sys/sockbuf.h projects/routing/sys/sys/socket.h projects/routing/sys/sys/socketvar.h projects/routing/sys/sys/syscall.h projects/routing/sys/sys/syscall.mk projects/routing/sys/sys/syscallsubr.h projects/routing/sys/sys/sysproto.h projects/routing/sys/vm/vm_page.c projects/routing/sys/vm/vm_pager.h projects/routing/sys/vm/vm_phys.c projects/routing/sys/vm/vm_phys.h projects/routing/sys/vm/vnode_pager.c projects/routing/sys/xen/gnttab.c projects/routing/tools/build/mk/OptionalObsoleteFiles.inc projects/routing/tools/build/options/WITHOUT_LIB32 projects/routing/tools/regression/lib/libc/gen/Makefile projects/routing/tools/regression/lib/libc/stdio/Makefile projects/routing/tools/regression/zfs/zpool/add/files.t projects/routing/tools/tools/nanobsd/pcengines/ALIX_DSK projects/routing/tools/tools/nanobsd/pcengines/ALIX_NFS projects/routing/tools/tools/sysbuild/sysbuild.sh projects/routing/tools/tools/sysdoc/tunables.mdoc projects/routing/tools/tools/tinybsd/conf/default/TINYBSD projects/routing/tools/tools/tinybsd/conf/vpn/TINYBSD projects/routing/tools/tools/tinybsd/conf/wrap/TINYBSD projects/routing/usr.bin/iscsictl/iscsictl.c projects/routing/usr.bin/man/man.1 projects/routing/usr.bin/mkimg/image.c projects/routing/usr.bin/mkimg/mkimg.1 projects/routing/usr.bin/sort/Makefile projects/routing/usr.bin/w/w.c projects/routing/usr.bin/yacc/Makefile projects/routing/usr.sbin/Makefile projects/routing/usr.sbin/autofs/auto_master.5 projects/routing/usr.sbin/bhyve/bhyve.8 projects/routing/usr.sbin/bhyve/block_if.c projects/routing/usr.sbin/bsdconfig/networking/share/device.subr projects/routing/usr.sbin/bsdconfig/timezone/timezone projects/routing/usr.sbin/ctld/chap.c projects/routing/usr.sbin/ctld/ctl.conf.5 projects/routing/usr.sbin/ctld/ctld.8 projects/routing/usr.sbin/ctld/ctld.c projects/routing/usr.sbin/ctld/ctld.h projects/routing/usr.sbin/ctld/login.c projects/routing/usr.sbin/ctld/parse.y projects/routing/usr.sbin/ctld/token.l projects/routing/usr.sbin/freebsd-update/freebsd-update.sh projects/routing/usr.sbin/i2c/i2c.c projects/routing/usr.sbin/inetd/inetd.c projects/routing/usr.sbin/iscsid/chap.c projects/routing/usr.sbin/pw/pw.c projects/routing/usr.sbin/pw/tests/Makefile projects/routing/usr.sbin/pw/tests/helper_functions.shin projects/routing/usr.sbin/pw/tests/pw_delete.sh projects/routing/usr.sbin/pw/tests/pw_modify.sh projects/routing/usr.sbin/tzsetup/tzsetup.c projects/routing/usr.sbin/usbconfig/dump.c projects/routing/usr.sbin/watchdogd/watchdogd.8 projects/routing/usr.sbin/watchdogd/watchdogd.c projects/routing/usr.sbin/wpa/wpa_cli/Makefile Directory Properties: projects/routing/ (props changed) projects/routing/cddl/ (props changed) projects/routing/cddl/contrib/opensolaris/ (props changed) projects/routing/cddl/contrib/opensolaris/cmd/zfs/ (props changed) projects/routing/cddl/contrib/opensolaris/lib/libzfs/ (props changed) projects/routing/contrib/byacc/ (props changed) projects/routing/contrib/llvm/ (props changed) projects/routing/contrib/tzdata/ (props changed) projects/routing/etc/ (props changed) projects/routing/gnu/usr.bin/gdb/ (props changed) projects/routing/lib/libc/ (props changed) projects/routing/sbin/ (props changed) projects/routing/share/ (props changed) projects/routing/share/man/man4/ (props changed) projects/routing/sys/ (props changed) projects/routing/sys/boot/ (props changed) projects/routing/sys/cddl/contrib/opensolaris/ (props changed) projects/routing/sys/conf/ (props changed) projects/routing/sys/contrib/ipfilter/ (props changed) projects/routing/usr.bin/mkimg/ (props changed) projects/routing/usr.sbin/bhyve/ (props changed) Modified: projects/routing/MAINTAINERS ============================================================================== --- projects/routing/MAINTAINERS Fri Nov 21 00:58:58 2014 (r274767) +++ projects/routing/MAINTAINERS Fri Nov 21 01:22:33 2014 (r274768) @@ -48,7 +48,6 @@ cd(4) ken Pre-commit review requested. pass(4) ken Pre-commit review requested. ch(4) ken Pre-commit review requested. em(4) jfv Pre-commit review requested. -bxe(4) davidch Pre-commit review requested. tdfx(4) cokane Just keep me informed of changes, try not to break it. sendmail gshapiro Pre-commit review requested. etc/mail gshapiro Pre-commit review requested. @@ -81,6 +80,8 @@ contrib/pf glebius Pre-commit review rec file obrien Insists to keep file blocked from other's unapproved commits contrib/bzip2 obrien Pre-commit review required. +contrib/netbsd-tests freebsd-testing,ngie Pre-commit review requested. +contrib/pjdfstest freebsd-testing,ngie Pre-commit review requested. geom_concat pjd Pre-commit review preferred. geom_eli pjd Pre-commit review preferred. geom_gate pjd Pre-commit review preferred. Modified: projects/routing/Makefile.inc1 ============================================================================== --- projects/routing/Makefile.inc1 Fri Nov 21 00:58:58 2014 (r274767) +++ projects/routing/Makefile.inc1 Fri Nov 21 01:22:33 2014 (r274768) @@ -1447,12 +1447,31 @@ NXBMAKE= ${NXBENV} ${MAKE} \ MK_CLANG_FULL=no MK_LLDB=no native-xtools: .MAKE + mkdir -p ${OBJTREE}/nxb-bin/bin + mkdir -p ${OBJTREE}/nxb-bin/sbin mkdir -p ${OBJTREE}/nxb-bin/usr mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ -p ${OBJTREE}/nxb-bin/usr >/dev/null mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ -p ${OBJTREE}/nxb-bin/usr/include >/dev/null .for _tool in \ + bin/cat \ + bin/chmod \ + bin/cp \ + bin/csh \ + bin/echo \ + bin/expr \ + bin/hostname \ + bin/ln \ + bin/ls \ + bin/mkdir \ + bin/mv \ + bin/ps \ + bin/realpath \ + bin/rm \ + bin/rmdir \ + bin/sh \ + bin/sleep \ ${_clang_tblgen} \ usr.bin/ar \ ${_binutils} \ @@ -1460,12 +1479,39 @@ native-xtools: .MAKE ${_gcc_tools} \ ${_clang_libs} \ ${_clang} \ + sbin/md5 \ + sbin/sysctl \ + gnu/usr.bin/diff \ usr.bin/awk \ + usr.bin/basename \ usr.bin/bmake \ + usr.bin/bzip2 \ + usr.bin/cmp \ + usr.bin/dirname \ + usr.bin/env \ + usr.bin/fetch \ + usr.bin/find \ + usr.bin/grep \ + usr.bin/gzip \ + usr.bin/id \ usr.bin/lex \ usr.bin/lorder \ + usr.bin/mktemp \ + usr.bin/mt \ + usr.bin/patch \ usr.bin/sed \ - usr.bin/yacc + usr.bin/sort \ + usr.bin/tar \ + usr.bin/touch \ + usr.bin/tr \ + usr.bin/true \ + usr.bin/uniq \ + usr.bin/unzip \ + usr.bin/xargs \ + usr.bin/xinstall \ + usr.bin/xz \ + usr.bin/yacc \ + usr.sbin/chown ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ cd ${.CURDIR}/${_tool} && \ ${NXBMAKE} DIRPRFX=${_tool}/ obj && \ Modified: projects/routing/ObsoleteFiles.inc ============================================================================== --- projects/routing/ObsoleteFiles.inc Fri Nov 21 00:58:58 2014 (r274767) +++ projects/routing/ObsoleteFiles.inc Fri Nov 21 01:22:33 2014 (r274768) @@ -38,6 +38,12 @@ # xargs -n1 | sort | uniq -d; # done +# 20141109: faith/faithd removal +OLD_FILES+=etc/rc.d/faith +OLD_FILES+=usr/share/man/man4/faith.4.gz +OLD_FILES+=usr/share/man/man4/if_faith.4.gz +OLD_FILES+=usr/sbin/faithd +OLD_FILES+=usr/share/man/man8/faithd.8.gz # 20141102: postrandom obsoleted by new /dev/random code OLD_FILES+=etc/rc.d/postrandom # 20141031: initrandom obsoleted by new /dev/random code Modified: projects/routing/UPDATING ============================================================================== --- projects/routing/UPDATING Fri Nov 21 00:58:58 2014 (r274767) +++ projects/routing/UPDATING Fri Nov 21 01:22:33 2014 (r274768) @@ -31,6 +31,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20141109: + faith(4) and faithd(8) has been removed from base system. It + has been obsolete for a very long time. + 20141104: vt(4), the new console driver, is enabled by default. It brings support for Unicode and double-width characters, as well as @@ -833,8 +837,8 @@ COMMON ITEMS: 2.) update the ZFS boot block on your boot drive The following example updates the ZFS boot block on the first - partition (freebsd-boot) of a GPT partitioned drive ad0: - "gpart bootcode -p /boot/gptzfsboot -i 1 ad0" + partition (freebsd-boot) of a GPT partitioned drive ada0: + "gpart bootcode -p /boot/gptzfsboot -i 1 ada0" Non-boot pools do not need these updates. Modified: projects/routing/bin/sh/sh.1 ============================================================================== --- projects/routing/bin/sh/sh.1 Fri Nov 21 00:58:58 2014 (r274767) +++ projects/routing/bin/sh/sh.1 Fri Nov 21 01:22:33 2014 (r274768) @@ -32,7 +32,7 @@ .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 .\" $FreeBSD$ .\" -.Dd November 7, 2014 +.Dd November 14, 2014 .Dt SH 1 .Os .Sh NAME @@ -795,10 +795,13 @@ should indicate the various exit codes a Additionally, the built-in commands return exit codes, as does an executed shell function. .Pp -If a command is terminated by a signal, its exit status is 128 plus -the signal number. -Signal numbers are defined in the header file -.In sys/signal.h . +If a command is terminated by a signal, its exit status is greater than 128. +The signal name can be found by passing the exit status to +.Li kill -l . +.Pp +If there is no command word, +the exit status is the exit status of the last command substitution executed, +or zero if the command does not contain any command substitutions. .Ss Complex Commands Complex commands are combinations of simple commands with control operators or keywords, together creating a larger complex @@ -818,7 +821,8 @@ function definition .El .Pp Unless otherwise stated, the exit status of a command is -that of the last simple command executed by the command. +that of the last simple command executed by the command, +or zero if no simple command was executed. .Ss Pipelines A pipeline is a sequence of one or more commands separated by the control operator @@ -902,6 +906,8 @@ The format for running a command in back If the shell is not interactive, the standard input of an asynchronous command is set to .Pa /dev/null . +.Pp +The exit status is zero. .Ss Lists (Generally Speaking) A list is a sequence of zero or more commands separated by newlines, semicolons, or ampersands, @@ -940,6 +946,13 @@ command is: .Ic fi .Ed .Pp +The exit status is that of selected +.Ic then +or +.Ic else +list, +or zero if no list was selected. +.Pp The syntax of the .Ic while command is: @@ -960,6 +973,9 @@ in place of which causes it to repeat until the exit status of the first list is zero. .Pp +The exit status is that of the last execution of the second list, +or zero if it was never executed. +.Pp The syntax of the .Ic for command is: @@ -1040,10 +1056,6 @@ continuing until a list terminated with or the end of the .Ic case command. -The exit code of the -.Ic case -command is the exit code of the last command executed in the list or -zero if no patterns were matched. .Ss Grouping Commands Together Commands may be grouped by writing either .Pp @@ -1131,6 +1143,8 @@ and the syntax is: The .Ic local command is implemented as a built-in command. +The exit status is zero +unless the command is not in a function or a variable name is invalid. .Pp When a variable is made local, it inherits the initial value and exported and readonly flags from the variable Modified: projects/routing/cddl/contrib/opensolaris/cmd/zdb/zdb.c ============================================================================== --- projects/routing/cddl/contrib/opensolaris/cmd/zdb/zdb.c Fri Nov 21 00:58:58 2014 (r274767) +++ projects/routing/cddl/contrib/opensolaris/cmd/zdb/zdb.c Fri Nov 21 01:22:33 2014 (r274768) @@ -2147,6 +2147,8 @@ dump_label(const char *dev) (void) close(fd); } +static uint64_t num_large_blocks; + /*ARGSUSED*/ static int dump_one_dir(const char *dsname, void *arg) @@ -2159,6 +2161,8 @@ dump_one_dir(const char *dsname, void *a (void) printf("Could not open %s, error %d\n", dsname, error); return (0); } + if (dmu_objset_ds(os)->ds_large_blocks) + num_large_blocks++; dump_dir(os); dmu_objset_disown(os, FTAG); fuid_table_destroy(); @@ -2169,7 +2173,7 @@ dump_one_dir(const char *dsname, void *a /* * Block statistics. */ -#define PSIZE_HISTO_SIZE (SPA_MAXBLOCKSIZE / SPA_MINBLOCKSIZE + 1) +#define PSIZE_HISTO_SIZE (SPA_OLD_MAXBLOCKSIZE / SPA_MINBLOCKSIZE + 2) typedef struct zdb_blkstats { uint64_t zb_asize; uint64_t zb_lsize; @@ -2234,7 +2238,15 @@ zdb_count_block(zdb_cb_t *zcb, zilog_t * zb->zb_lsize += BP_GET_LSIZE(bp); zb->zb_psize += BP_GET_PSIZE(bp); zb->zb_count++; - zb->zb_psize_histogram[BP_GET_PSIZE(bp) >> SPA_MINBLOCKSHIFT]++; + + /* + * The histogram is only big enough to record blocks up to + * SPA_OLD_MAXBLOCKSIZE; larger blocks go into the last, + * "other", bucket. + */ + int idx = BP_GET_PSIZE(bp) >> SPA_MINBLOCKSHIFT; + idx = MIN(idx, SPA_OLD_MAXBLOCKSIZE / SPA_MINBLOCKSIZE + 1); + zb->zb_psize_histogram[idx]++; zb->zb_gangs += BP_COUNT_GANG(bp); @@ -2946,6 +2958,7 @@ dump_zpool(spa_t *spa) dump_metaslab_groups(spa); if (dump_opt['d'] || dump_opt['i']) { + uint64_t refcount; dump_dir(dp->dp_meta_objset); if (dump_opt['d'] >= 3) { dump_bpobj(&spa->spa_deferred_bpobj, @@ -2965,8 +2978,21 @@ dump_zpool(spa_t *spa) } (void) dmu_objset_find(spa_name(spa), dump_one_dir, NULL, DS_FIND_SNAPSHOTS | DS_FIND_CHILDREN); + + (void) feature_get_refcount(spa, + &spa_feature_table[SPA_FEATURE_LARGE_BLOCKS], &refcount); + if (num_large_blocks != refcount) { + (void) printf("large_blocks feature refcount mismatch: " + "expected %lld != actual %lld\n", + (longlong_t)num_large_blocks, + (longlong_t)refcount); + rc = 2; + } else { + (void) printf("Verified large_blocks feature refcount " + "is correct (%llu)\n", (longlong_t)refcount); + } } - if (dump_opt['b'] || dump_opt['c']) + if (rc == 0 && (dump_opt['b'] || dump_opt['c'])) rc = dump_block_stats(spa); if (rc == 0) Modified: projects/routing/cddl/contrib/opensolaris/cmd/zfs/zfs.8 ============================================================================== --- projects/routing/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Fri Nov 21 00:58:58 2014 (r274767) +++ projects/routing/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Fri Nov 21 01:22:33 2014 (r274768) @@ -27,10 +27,11 @@ .\" Copyright (c) 2014, Joyent, Inc. All rights reserved. .\" Copyright (c) 2013, Steven Hartland <smh@FreeBSD.org> .\" Copyright (c) 2014, Xin LI <delphij@FreeBSD.org> +.\" Copyright (c) 2014, The FreeBSD Foundation, All Rights Reserved. .\" .\" $FreeBSD$ .\" -.Dd June 30, 2014 +.Dd November 12, 2014 .Dt ZFS 8 .Os .Sh NAME @@ -179,12 +180,12 @@ .Ar bookmark .Nm .Cm send -.Op Fl DnPpRve +.Op Fl DnPpRveL .Op Fl i Ar snapshot | Fl I Ar snapshot .Ar snapshot .Nm .Cm send -.Op Fl e +.Op Fl eL .Op Fl i Ar snapshot Ns | Ns bookmark .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot .Nm @@ -1187,6 +1188,12 @@ systems is strongly discouraged, and may .Pp The size specified must be a power of two greater than or equal to 512 and less than or equal to 128 Kbytes. +If the +.Sy large_blocks +feature is enabled on the pool, the size may be up to 1 Mbyte. +See +.Xr zpool-features 7 +for details on ZFS feature flags. .Pp Changing the file system's .Sy recordsize @@ -1785,7 +1792,7 @@ descendent file systems. Recursively destroy all clones of these snapshots, including the clones, snapshots, and children. If this flag is specified, the -.Op fl d +.Fl d flag will have no effect. .It Fl n Do a dry-run ("No-op") deletion. No data will be deleted. This is useful in @@ -2477,7 +2484,7 @@ feature. .It Xo .Nm .Cm send -.Op Fl DnPpRve +.Op Fl DnPpRveL .Op Fl i Ar snapshot | Fl I Ar snapshot .Ar snapshot .Xc @@ -2549,6 +2556,22 @@ be used regardless of the dataset's property, but performance will be much better if the filesystem uses a dedup-capable checksum (eg. .Sy sha256 ) . +.It Fl L +Generate a stream which may contain blocks larger than 128KB. +This flag +has no effect if the +.Sy large_blocks +pool feature is disabled, or if the +.Sy recordsize +property of this filesystem has never been set above 128KB. +The receiving system must have the +.Sy large_blocks +pool feature enabled as well. +See +.Xr zpool-features 7 +for details on ZFS feature flags and the +.Sy large_blocks +feature. .It Fl e Generate a more compact stream by using WRITE_EMBEDDED records for blocks which are stored more compactly on disk by the @@ -2596,7 +2619,7 @@ on future versions of .It Xo .Nm .Cm send -.Op Fl e +.Op Fl eL .Op Fl i Ar snapshot Ns | Ns Ar bookmark .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot .Xc @@ -2622,6 +2645,22 @@ specified as the last component of the n If the incremental target is a clone, the incremental source can be the origin snapshot, or an earlier snapshot in the origin's filesystem, or the origin's origin, etc. +.It Fl L +Generate a stream which may contain blocks larger than 128KB. +This flag +has no effect if the +.Sy large_blocks +pool feature is disabled, or if the +.Sy recordsize +property of this filesystem has never been set above 128KB. +The receiving system must have the +.Sy large_blocks +pool feature enabled as well. +See +.Xr zpool-features 7 +for details on ZFS feature flags and the +.Sy large_blocks +feature. .It Fl e Generate a more compact stream by using WRITE_EMBEDDED records for blocks which are stored more compactly on disk by the Modified: projects/routing/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c ============================================================================== --- projects/routing/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Fri Nov 21 00:58:58 2014 (r274767) +++ projects/routing/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Fri Nov 21 01:22:33 2014 (r274768) @@ -274,9 +274,9 @@ get_usage(zfs_help_t idx) case HELP_ROLLBACK: return (gettext("\trollback [-rRf] <snapshot>\n")); case HELP_SEND: - return (gettext("\tsend [-DnPpRve] [-[iI] snapshot] " + return (gettext("\tsend [-DnPpRvLe] [-[iI] snapshot] " "<snapshot>\n" - "\tsend [-e] [-i snapshot|bookmark] " + "\tsend [-Le] [-i snapshot|bookmark] " "<filesystem|volume|snapshot>\n")); case HELP_SET: return (gettext("\tset <property=value> " @@ -3709,7 +3709,7 @@ zfs_do_send(int argc, char **argv) boolean_t extraverbose = B_FALSE; /* check options */ - while ((c = getopt(argc, argv, ":i:I:RDpvnPe")) != -1) { + while ((c = getopt(argc, argv, ":i:I:RDpvnPLe")) != -1) { switch (c) { case 'i': if (fromname) @@ -3744,6 +3744,9 @@ zfs_do_send(int argc, char **argv) case 'n': flags.dryrun = B_TRUE; break; + case 'L': + flags.largeblock = B_TRUE; + break; case 'e': flags.embed_data = B_TRUE; break; @@ -3800,6 +3803,8 @@ zfs_do_send(int argc, char **argv) if (zhp == NULL) return (1); + if (flags.largeblock) + lzc_flags |= LZC_SEND_FLAG_LARGE_BLOCK; if (flags.embed_data) lzc_flags |= LZC_SEND_FLAG_EMBED_DATA; Modified: projects/routing/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 ============================================================================== --- projects/routing/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 Fri Nov 21 00:58:58 2014 (r274767) +++ projects/routing/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 Fri Nov 21 01:22:33 2014 (r274768) @@ -23,7 +23,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 1, 2014 +.Dd November 10, 2014 .Dt ZPOOL-FEATURES 7 .Os .Sh NAME @@ -427,6 +427,33 @@ This feature becomes as soon as it is enabled and will never return to being .Sy enabled . +.It Sy large_blocks +.Bl -column "READ\-ONLY COMPATIBLE" "org.open-zfs:large_block" +.It GUID Ta org.open-zfs:large_block +.It READ\-ONLY COMPATIBLE Ta no +.It DEPENDENCIES Ta extensible_dataset +.El +.Pp +The +.Sy large_block +feature allows the record size on a dataset to be +set larger than 128KB. +.Pp +This feature becomes +.Sy active +once a +.Sy recordsize +property has been set larger than 128KB, and will return to being +.Sy enabled +once all filesystems that have ever had their recordsize larger than 128KB +are destroyed. +.Pp +Please note that booting from datasets that have recordsize greater than +128KB is +.Em NOT +supported by the +.Fx +boot loader. .El .Sh SEE ALSO .Xr zpool 8 Modified: projects/routing/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.c ============================================================================== --- projects/routing/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.c Fri Nov 21 00:58:58 2014 (r274767) +++ projects/routing/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.c Fri Nov 21 01:22:33 2014 (r274768) @@ -54,7 +54,6 @@ uint64_t total_stream_len = 0; FILE *send_stream = 0; boolean_t do_byteswap = B_FALSE; boolean_t do_cksum = B_TRUE; -#define INITIAL_BUFLEN (1<<20) static void usage(void) @@ -67,6 +66,18 @@ usage(void) exit(1); } +static void * +safe_malloc(size_t size) +{ + void *rv = malloc(size); + if (rv == NULL) { + (void) fprintf(stderr, "ERROR; failed to allocate %zu bytes\n", + size); + abort(); + } + return (rv); +} + /* * ssread - send stream read. * @@ -158,7 +169,7 @@ print_block(char *buf, int length) int main(int argc, char *argv[]) { - char *buf = malloc(INITIAL_BUFLEN); + char *buf = safe_malloc(SPA_MAXBLOCKSIZE); uint64_t drr_record_count[DRR_NUMTYPES] = { 0 }; uint64_t total_records = 0; dmu_replay_record_t thedrr; @@ -307,9 +318,9 @@ main(int argc, char *argv[]) nvlist_t *nv; int sz = drr->drr_payloadlen; - if (sz > INITIAL_BUFLEN) { + if (sz > SPA_MAXBLOCKSIZE) { free(buf); - buf = malloc(sz); + buf = safe_malloc(sz); } (void) ssread(buf, sz, &zc); if (ferror(send_stream)) Modified: projects/routing/cddl/contrib/opensolaris/cmd/ztest/ztest.c ============================================================================== --- projects/routing/cddl/contrib/opensolaris/cmd/ztest/ztest.c Fri Nov 21 00:58:58 2014 (r274767) +++ projects/routing/cddl/contrib/opensolaris/cmd/ztest/ztest.c Fri Nov 21 01:22:33 2014 (r274768) @@ -987,9 +987,15 @@ ztest_spa_get_ashift() { static int ztest_random_blocksize(void) { - // Choose a block size >= the ashift. - uint64_t block_shift = - ztest_random(SPA_MAXBLOCKSHIFT - ztest_spa_get_ashift() + 1); + uint64_t block_shift; + /* + * Choose a block size >= the ashift. + * If the SPA supports new MAXBLOCKSIZE, test up to 1MB blocks. + */ + int maxbs = SPA_OLD_MAXBLOCKSHIFT; + if (spa_maxblocksize(ztest_spa) == SPA_MAXBLOCKSIZE) + maxbs = 20; + block_shift = ztest_random(maxbs - ztest_spa_get_ashift() + 1); return (1 << (SPA_MINBLOCKSHIFT + block_shift)); } @@ -4789,7 +4795,7 @@ ztest_fault_inject(ztest_ds_t *zd, uint6 char path0[MAXPATHLEN]; char pathrand[MAXPATHLEN]; size_t fsize; - int bshift = SPA_MAXBLOCKSHIFT + 2; /* don't scrog all labels */ + int bshift = SPA_OLD_MAXBLOCKSHIFT + 2; /* don't scrog all labels */ int iters = 1000; int maxfaults; int mirror_save; Modified: projects/routing/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dof.c ============================================================================== --- projects/routing/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dof.c Fri Nov 21 00:58:58 2014 (r274767) +++ projects/routing/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dof.c Fri Nov 21 01:22:33 2014 (r274768) @@ -469,7 +469,7 @@ dof_add_probe(dt_idhash_t *dhp, dt_ident * locally so an alternate symbol is added for the purpose * of this relocation. */ - if (pip->pi_rname[0] == '\0') + if (pip->pi_rname == NULL) dofr.dofr_name = dofpr.dofpr_func; else dofr.dofr_name = dof_add_string(ddo, pip->pi_rname); Modified: projects/routing/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c ============================================================================== --- projects/routing/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c Fri Nov 21 00:58:58 2014 (r274767) +++ projects/routing/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c Fri Nov 21 01:22:33 2014 (r274768) @@ -520,6 +520,8 @@ dt_probe_destroy(dt_probe_t *prp) for (pip = prp->pr_inst; pip != NULL; pip = pip_next) { pip_next = pip->pi_next; + dt_free(dtp, pip->pi_rname); + dt_free(dtp, pip->pi_fname); dt_free(dtp, pip->pi_offs); dt_free(dtp, pip->pi_enoffs); dt_free(dtp, pip); @@ -552,28 +554,18 @@ dt_probe_define(dt_provider_t *pvp, dt_p if ((pip = dt_zalloc(dtp, sizeof (*pip))) == NULL) return (-1); - if ((pip->pi_offs = dt_zalloc(dtp, - sizeof (uint32_t))) == NULL) { - dt_free(dtp, pip); - return (-1); - } + if ((pip->pi_offs = dt_zalloc(dtp, sizeof (uint32_t))) == NULL) + goto nomem; if ((pip->pi_enoffs = dt_zalloc(dtp, - sizeof (uint32_t))) == NULL) { - dt_free(dtp, pip->pi_offs); - dt_free(dtp, pip); - return (-1); - } + sizeof (uint32_t))) == NULL) + goto nomem; - (void) strlcpy(pip->pi_fname, fname, sizeof (pip->pi_fname)); - if (rname != NULL) { - if (strlen(rname) + 1 > sizeof (pip->pi_rname)) { - dt_free(dtp, pip->pi_offs); - dt_free(dtp, pip); - return (dt_set_errno(dtp, EDT_COMPILER)); - } - (void) strcpy(pip->pi_rname, rname); - } + if ((pip->pi_fname = strdup(fname)) == NULL) + goto nomem; + + if (rname != NULL && (pip->pi_rname = strdup(rname)) == NULL) + goto nomem; pip->pi_noffs = 0; pip->pi_maxoffs = 1; @@ -618,6 +610,13 @@ dt_probe_define(dt_provider_t *pvp, dt_p (*offs)[(*noffs)++] = offset; return (0); + +nomem: + dt_free(dtp, pip->pi_fname); + dt_free(dtp, pip->pi_enoffs); + dt_free(dtp, pip->pi_offs); + dt_free(dtp, pip); + return (dt_set_errno(dtp, EDT_NOMEM)); } /* Modified: projects/routing/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.h ============================================================================== --- projects/routing/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.h Fri Nov 21 00:58:58 2014 (r274767) +++ projects/routing/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.h Fri Nov 21 01:22:33 2014 (r274768) @@ -64,8 +64,8 @@ typedef struct dt_probe_iter { } dt_probe_iter_t; typedef struct dt_probe_instance { - char pi_fname[DTRACE_FUNCNAMELEN]; /* function name */ - char pi_rname[DTRACE_FUNCNAMELEN + 20]; /* mangled relocation name */ + char *pi_fname; /* function name */ + char *pi_rname; /* mangled relocation name */ uint32_t *pi_offs; /* offsets into the function */ uint32_t *pi_enoffs; /* is-enabled offsets */ uint_t pi_noffs; /* number of offsets */ Modified: projects/routing/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h ============================================================================== --- projects/routing/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h Fri Nov 21 00:58:58 2014 (r274767) +++ projects/routing/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h Fri Nov 21 01:22:33 2014 (r274768) @@ -609,6 +609,9 @@ typedef struct sendflags { /* show progress (ie. -v) */ boolean_t progress; + /* large blocks (>128K) are permitted */ + boolean_t largeblock; + /* WRITE_EMBEDDED records of type DATA are permitted */ boolean_t embed_data; } sendflags_t; Modified: projects/routing/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c ============================================================================== --- projects/routing/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Fri Nov 21 00:58:58 2014 (r274767) +++ projects/routing/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Fri Nov 21 01:22:33 2014 (r274768) @@ -1080,21 +1080,36 @@ zfs_valid_proplist(libzfs_handle_t *hdl, break; } - case ZFS_PROP_RECORDSIZE: case ZFS_PROP_VOLBLOCKSIZE: - /* must be power of two within SPA_{MIN,MAX}BLOCKSIZE */ + case ZFS_PROP_RECORDSIZE: + { + int maxbs = SPA_MAXBLOCKSIZE; + if (zhp != NULL) { + maxbs = zpool_get_prop_int(zhp->zpool_hdl, + ZPOOL_PROP_MAXBLOCKSIZE, NULL); + } + /* + * Volumes are limited to a volblocksize of 128KB, + * because they typically service workloads with + * small random writes, which incur a large performance + * penalty with large blocks. + */ + if (prop == ZFS_PROP_VOLBLOCKSIZE) + maxbs = SPA_OLD_MAXBLOCKSIZE; + /* + * The value must be a power of two between + * SPA_MINBLOCKSIZE and maxbs. + */ if (intval < SPA_MINBLOCKSIZE || - intval > SPA_MAXBLOCKSIZE || !ISP2(intval)) { + intval > maxbs || !ISP2(intval)) { zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, - "'%s' must be power of 2 from %u " - "to %uk"), propname, - (uint_t)SPA_MINBLOCKSIZE, - (uint_t)SPA_MAXBLOCKSIZE >> 10); + "'%s' must be power of 2 from 512B " + "to %uKB"), propname, maxbs >> 10); (void) zfs_error(hdl, EZFS_BADPROP, errbuf); goto error; } break; - + } case ZFS_PROP_MLSLABEL: { #ifdef sun @@ -1471,7 +1486,9 @@ zfs_setprop_error(libzfs_handle_t *hdl, break; case ERANGE: - if (prop == ZFS_PROP_COMPRESSION) { + case EDOM: + if (prop == ZFS_PROP_COMPRESSION || + prop == ZFS_PROP_RECORDSIZE) { (void) zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, "property setting is not allowed on " "bootable datasets")); @@ -3197,9 +3214,7 @@ zfs_create(libzfs_handle_t *hdl, const c case EDOM: zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, "volume block size must be power of 2 from " - "%u to %uk"), - (uint_t)SPA_MINBLOCKSIZE, - (uint_t)SPA_MAXBLOCKSIZE >> 10); + "512B to 128KB")); return (zfs_error(hdl, EZFS_BADPROP, errbuf)); Modified: projects/routing/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c ============================================================================== --- projects/routing/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c Fri Nov 21 00:58:58 2014 (r274767) +++ projects/routing/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c Fri Nov 21 01:22:33 2014 (r274768) @@ -215,7 +215,7 @@ static void * cksummer(void *arg) { dedup_arg_t *dda = arg; - char *buf = malloc(1<<20); + char *buf = zfs_alloc(dda->dedup_hdl, SPA_MAXBLOCKSIZE); dmu_replay_record_t thedrr; dmu_replay_record_t *drr = &thedrr; struct drr_begin *drrb = &thedrr.drr_u.drr_begin; @@ -280,9 +280,9 @@ cksummer(void *arg) DMU_COMPOUNDSTREAM && drr->drr_payloadlen != 0) { int sz = drr->drr_payloadlen; - if (sz > 1<<20) { - free(buf); - buf = malloc(sz); + if (sz > SPA_MAXBLOCKSIZE) { + buf = zfs_realloc(dda->dedup_hdl, buf, + SPA_MAXBLOCKSIZE, sz); } (void) ssread(buf, sz, ofp); if (ferror(stdin)) @@ -815,7 +815,7 @@ typedef struct send_dump_data { char prevsnap[ZFS_MAXNAMELEN]; uint64_t prevsnap_obj; boolean_t seenfrom, seento, replicate, doall, fromorigin; - boolean_t verbose, dryrun, parsable, progress, embed_data; + boolean_t verbose, dryrun, parsable, progress, embed_data, large_block; int outfd; boolean_t err; nvlist_t *fss; @@ -1163,6 +1163,8 @@ dump_snapshot(zfs_handle_t *zhp, void *a } enum lzc_send_flags flags = 0; + if (sdd->large_block) + flags |= LZC_SEND_FLAG_LARGE_BLOCK; if (sdd->embed_data) flags |= LZC_SEND_FLAG_EMBED_DATA; @@ -1511,6 +1513,7 @@ zfs_send(zfs_handle_t *zhp, const char * sdd.parsable = flags->parsable; sdd.progress = flags->progress; sdd.dryrun = flags->dryrun; + sdd.large_block = flags->largeblock; sdd.embed_data = flags->embed_data; sdd.filter_cb = filter_func; sdd.filter_cb_arg = cb_arg; @@ -2545,7 +2548,7 @@ static int recv_skip(libzfs_handle_t *hdl, int fd, boolean_t byteswap) { dmu_replay_record_t *drr; - void *buf = malloc(1<<20); + void *buf = zfs_alloc(hdl, SPA_MAXBLOCKSIZE); char errbuf[1024]; (void) snprintf(errbuf, sizeof (errbuf), dgettext(TEXT_DOMAIN, Modified: projects/routing/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c ============================================================================== --- projects/routing/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c Fri Nov 21 00:58:58 2014 (r274767) +++ projects/routing/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c Fri Nov 21 01:22:33 2014 (r274768) @@ -502,6 +502,10 @@ lzc_get_holds(const char *snapname, nvli * * "fd" is the file descriptor to write the send stream to. * + * If "flags" contains LZC_SEND_FLAG_LARGE_BLOCK, the stream is permitted + * to contain DRR_WRITE records with drr_length > 128K, and DRR_OBJECT + * records with drr_blksz > 128K. + * * If "flags" contains LZC_SEND_FLAG_EMBED_DATA, the stream is permitted * to contain DRR_WRITE_EMBEDDED records with drr_etype==BP_EMBEDDED_TYPE_DATA, * which the receiving system must support (as indicated by support @@ -518,6 +522,8 @@ lzc_send(const char *snapname, const cha fnvlist_add_int32(args, "fd", fd); if (from != NULL) fnvlist_add_string(args, "fromsnap", from); + if (flags & LZC_SEND_FLAG_LARGE_BLOCK) + fnvlist_add_boolean(args, "largeblockok"); if (flags & LZC_SEND_FLAG_EMBED_DATA) fnvlist_add_boolean(args, "embedok"); err = lzc_ioctl(ZFS_IOC_SEND_NEW, snapname, args, NULL); Modified: projects/routing/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h ============================================================================== --- projects/routing/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h Fri Nov 21 00:58:58 2014 (r274767) +++ projects/routing/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h Fri Nov 21 01:22:33 2014 (r274768) @@ -54,7 +54,8 @@ int lzc_release(nvlist_t *, nvlist_t **) int lzc_get_holds(const char *, nvlist_t **); enum lzc_send_flags { - LZC_SEND_FLAG_EMBED_DATA = 1 << 0 + LZC_SEND_FLAG_EMBED_DATA = 1 << 0, + LZC_SEND_FLAG_LARGE_BLOCK = 1 << 1 }; int lzc_send(const char *, const char *, int, enum lzc_send_flags); Modified: projects/routing/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c ============================================================================== --- projects/routing/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c Fri Nov 21 00:58:58 2014 (r274767) +++ projects/routing/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c Fri Nov 21 01:22:33 2014 (r274768) @@ -24,6 +24,8 @@ */ /* * Copyright 2011 Nexenta Systems, Inc. All rights reserved. + * Copyright 2012 Garrett D'Amore <garrett@damore.org>. All rights reserved. + * Copyright (c) 2014 by Delphix. All rights reserved. */ #include <sys/zfs_context.h> @@ -32,8 +34,10 @@ int taskq_now; taskq_t *system_taskq; #define TASKQ_ACTIVE 0x00010000 +#define TASKQ_NAMELEN 31 struct taskq { + char tq_name[TASKQ_NAMELEN + 1]; kmutex_t tq_lock; krwlock_t tq_threadlock; kcondvar_t tq_dispatch_cv; @@ -136,6 +140,7 @@ taskq_dispatch(taskq_t *tq, task_func_t t->tqent_prev->tqent_next = t; t->tqent_func = func; t->tqent_arg = arg; + t->tqent_flags = 0; cv_signal(&tq->tq_dispatch_cv); mutex_exit(&tq->tq_lock); return (1); @@ -245,6 +250,7 @@ taskq_create(const char *name, int nthre cv_init(&tq->tq_dispatch_cv, NULL, CV_DEFAULT, NULL); cv_init(&tq->tq_wait_cv, NULL, CV_DEFAULT, NULL); cv_init(&tq->tq_maxalloc_cv, NULL, CV_DEFAULT, NULL); + (void) strncpy(tq->tq_name, name, TASKQ_NAMELEN + 1); tq->tq_flags = flags | TASKQ_ACTIVE; tq->tq_active = nthreads; tq->tq_nthreads = nthreads; Modified: projects/routing/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c ============================================================================== --- projects/routing/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c Fri Nov 21 00:58:58 2014 (r274767) +++ projects/routing/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c Fri Nov 21 01:22:33 2014 (r274768) @@ -766,7 +766,8 @@ die_array_resolve(tdesc_t *tdp, tdesc_t debug(3, "trying to resolve array %d (cont %d)\n", tdp->t_id, tdp->t_ardef->ad_contents->t_id); - if ((sz = tdesc_size(tdp->t_ardef->ad_contents)) == 0) { + if ((sz = tdesc_size(tdp->t_ardef->ad_contents)) == 0 && + (tdp->t_ardef->ad_contents->t_flags & TDESC_F_RESOLVED) == 0) { debug(3, "unable to resolve array %s (%d) contents %d\n", tdesc_name(tdp), tdp->t_id, tdp->t_ardef->ad_contents->t_id); @@ -1138,12 +1139,17 @@ die_sou_resolve(tdesc_t *tdp, tdesc_t ** /* * For empty members, or GCC/C99 flexible array - * members, a size of 0 is correct. + * members, a size of 0 is correct. Structs and unions + * consisting of flexible array members will also have + * size 0. */ if (mt->t_members == NULL) continue; if (mt->t_type == ARRAY && mt->t_ardef->ad_nelems == 0) continue; + if ((mt->t_flags & TDESC_F_RESOLVED) != 0 && + (mt->t_type == STRUCT || mt->t_type == UNION)) + continue; dw->dw_nunres++; return (1); Modified: projects/routing/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c ============================================================================== --- projects/routing/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c Fri Nov 21 00:58:58 2014 (r274767) +++ projects/routing/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c Fri Nov 21 01:22:33 2014 (r274768) @@ -287,19 +287,11 @@ equiv_su(tdesc_t *stdp, tdesc_t *ttdp, e while (ml1 && ml2) { if (ml1->ml_offset != ml2->ml_offset || - strcmp(ml1->ml_name, ml2->ml_name) != 0) + strcmp(ml1->ml_name, ml2->ml_name) != 0 || + ml1->ml_size != ml2->ml_size || + !equiv_node(ml1->ml_type, ml2->ml_type, ed)) return (0); - /* - * Don't do the recursive equivalency checking more than - * we have to. - */ - if (olm1 == NULL || olm1->ml_type->t_id != ml1->ml_type->t_id) { - if (ml1->ml_size != ml2->ml_size || - !equiv_node(ml1->ml_type, ml2->ml_type, ed)) - return (0); - } - olm1 = ml1; ml1 = ml1->ml_next; ml2 = ml2->ml_next; @@ -357,7 +349,7 @@ equiv_node(tdesc_t *ctdp, tdesc_t *mtdp, int (*equiv)(tdesc_t *, tdesc_t *, equiv_data_t *); int mapping; - if (ctdp->t_emark > ed->ed_clear_mark || + if (ctdp->t_emark > ed->ed_clear_mark && mtdp->t_emark > ed->ed_clear_mark) return (ctdp->t_emark == mtdp->t_emark); Modified: projects/routing/contrib/byacc/test/yacc/calc.tab.c ============================================================================== --- projects/routing/contrib/byacc/test/yacc/calc.tab.c Fri Nov 21 00:58:58 2014 (r274767) +++ projects/routing/contrib/byacc/test/yacc/calc.tab.c Fri Nov 21 01:22:33 2014 (r274768) @@ -150,7 +150,7 @@ extern int YYPARSE_DECL(); #define LETTER 258 #define UMINUS 259 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT calc_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, Modified: projects/routing/contrib/byacc/test/yacc/calc1.tab.c ============================================================================== --- projects/routing/contrib/byacc/test/yacc/calc1.tab.c Fri Nov 21 00:58:58 2014 (r274767) +++ projects/routing/contrib/byacc/test/yacc/calc1.tab.c Fri Nov 21 01:22:33 2014 (r274768) @@ -175,7 +175,7 @@ extern int YYPARSE_DECL(); #define CONST 259 #define UMINUS 260 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT calc1_lhs[] = { -1, 3, 3, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, Modified: projects/routing/contrib/byacc/test/yacc/calc2.tab.c ============================================================================== --- projects/routing/contrib/byacc/test/yacc/calc2.tab.c Fri Nov 21 00:58:58 2014 (r274767) +++ projects/routing/contrib/byacc/test/yacc/calc2.tab.c Fri Nov 21 01:22:33 2014 (r274768) @@ -152,7 +152,7 @@ extern int YYPARSE_DECL(); #define LETTER 258 #define UMINUS 259 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT calc2_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, Modified: projects/routing/contrib/byacc/test/yacc/calc3.tab.c ============================================================================== --- projects/routing/contrib/byacc/test/yacc/calc3.tab.c Fri Nov 21 00:58:58 2014 (r274767) +++ projects/routing/contrib/byacc/test/yacc/calc3.tab.c Fri Nov 21 01:22:33 2014 (r274768) @@ -157,7 +157,7 @@ extern int YYPARSE_DECL(); #define LETTER 258 #define UMINUS 259 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT calc3_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, Modified: projects/routing/contrib/byacc/test/yacc/code_calc.code.c ============================================================================== --- projects/routing/contrib/byacc/test/yacc/code_calc.code.c Fri Nov 21 00:58:58 2014 (r274767) +++ projects/routing/contrib/byacc/test/yacc/code_calc.code.c Fri Nov 21 01:22:33 2014 (r274768) @@ -160,7 +160,7 @@ typedef int YYSTYPE; #define YYTRANSLATE(a) ((a) > YYMAXTOKEN ? YYUNDFTOKEN : (a)) extern int YYPARSE_DECL(); -typedef short YYINT; *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411210122.sAL1MZkL001392>