svn commit: r323636 - in projects/runtime-coverage: . cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise cddl/contrib/opensolaris/cm...
Ngie Cooper
ngie at FreeBSD.org
Sat Sep 16 03:54:25 UTC 2017
Author: ngie
Date: Sat Sep 16 03:54:20 2017
New Revision: 323636
URL: https://svnweb.freebsd.org/changeset/base/323636
Log:
MFhead at r323635
Added:
projects/runtime-coverage/share/man/man4/liquidio.4
- copied unchanged from r323635, head/share/man/man4/liquidio.4
projects/runtime-coverage/sys/amd64/conf/GENERIC-MMCCAM
- copied unchanged from r323635, head/sys/amd64/conf/GENERIC-MMCCAM
projects/runtime-coverage/sys/arm/arm/ptrace_machdep.c
- copied unchanged from r323635, head/sys/arm/arm/ptrace_machdep.c
projects/runtime-coverage/sys/arm/conf/IMX6-MMCCAM
- copied unchanged from r323635, head/sys/arm/conf/IMX6-MMCCAM
projects/runtime-coverage/sys/arm64/arm64/undefined.c
- copied unchanged from r323635, head/sys/arm64/arm64/undefined.c
projects/runtime-coverage/sys/arm64/conf/GENERIC-MMCCAM
- copied unchanged from r323635, head/sys/arm64/conf/GENERIC-MMCCAM
projects/runtime-coverage/sys/arm64/include/undefined.h
- copied unchanged from r323635, head/sys/arm64/include/undefined.h
projects/runtime-coverage/sys/boot/efi/boot1/fat-amd64.tmpl.xz
- copied unchanged from r323635, head/sys/boot/efi/boot1/fat-amd64.tmpl.xz
projects/runtime-coverage/sys/boot/efi/boot1/fat-arm.tmpl.xz
- copied unchanged from r323635, head/sys/boot/efi/boot1/fat-arm.tmpl.xz
projects/runtime-coverage/sys/boot/efi/boot1/fat-arm64.tmpl.xz
- copied unchanged from r323635, head/sys/boot/efi/boot1/fat-arm64.tmpl.xz
projects/runtime-coverage/sys/boot/efi/boot1/fat-i386.tmpl.xz
- copied unchanged from r323635, head/sys/boot/efi/boot1/fat-i386.tmpl.xz
projects/runtime-coverage/sys/contrib/dev/liquidio/
- copied from r323635, head/sys/contrib/dev/liquidio/
projects/runtime-coverage/sys/dev/liquidio/
- copied from r323635, head/sys/dev/liquidio/
projects/runtime-coverage/sys/dev/uart/uart_dev_mvebu.c
- copied unchanged from r323635, head/sys/dev/uart/uart_dev_mvebu.c
projects/runtime-coverage/sys/modules/lio/
- copied from r323635, head/sys/modules/lio/
Deleted:
projects/runtime-coverage/etc/periodic/weekly/330.catman
projects/runtime-coverage/sys/amd64/conf/MMCCAM
projects/runtime-coverage/sys/boot/efi/boot1/fat-amd64.tmpl.bz2.uu
projects/runtime-coverage/sys/boot/efi/boot1/fat-arm.tmpl.bz2.uu
projects/runtime-coverage/sys/boot/efi/boot1/fat-arm64.tmpl.bz2.uu
projects/runtime-coverage/sys/boot/efi/boot1/fat-i386.tmpl.bz2.uu
projects/runtime-coverage/sys/cam/mmc/mmc_sdio.c
projects/runtime-coverage/sys/cam/mmc/mmc_sdio.h
projects/runtime-coverage/sys/dev/cxgb/ulp/
projects/runtime-coverage/sys/modules/cxgb/iw_cxgb/
projects/runtime-coverage/sys/modules/cxgb/tom/
projects/runtime-coverage/usr.bin/catman/
Modified:
projects/runtime-coverage/ObsoleteFiles.inc
projects/runtime-coverage/UPDATING
projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d
projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.c
projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.d
projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.c
projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.d
projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.c
projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.d
projects/runtime-coverage/cddl/contrib/opensolaris/cmd/zpool/zpool.8
projects/runtime-coverage/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
projects/runtime-coverage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c
projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c
projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c
projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
projects/runtime-coverage/cddl/lib/libzpool/Makefile
projects/runtime-coverage/contrib/elftoolchain/readelf/readelf.c
projects/runtime-coverage/contrib/one-true-awk/awk.h
projects/runtime-coverage/contrib/one-true-awk/lex.c
projects/runtime-coverage/contrib/one-true-awk/run.c
projects/runtime-coverage/contrib/zlib/deflate.c
projects/runtime-coverage/contrib/zlib/zlib.h
projects/runtime-coverage/etc/defaults/periodic.conf
projects/runtime-coverage/etc/periodic/weekly/Makefile
projects/runtime-coverage/gnu/usr.bin/binutils/libbfd/Makefile.amd64
projects/runtime-coverage/lib/libc/net/getaddrinfo.3
projects/runtime-coverage/lib/libc/net/getaddrinfo.c
projects/runtime-coverage/lib/libc/sys/open.2
projects/runtime-coverage/lib/libc/sys/ptrace.2
projects/runtime-coverage/lib/libc/sys/rename.2
projects/runtime-coverage/lib/libedit/Makefile
projects/runtime-coverage/lib/libedit/chartype.c
projects/runtime-coverage/lib/libefivar/efivar.c
projects/runtime-coverage/lib/libstand/tftp.c
projects/runtime-coverage/libexec/makewhatis.local/Makefile
projects/runtime-coverage/libexec/makewhatis.local/makewhatis.local.8
projects/runtime-coverage/libexec/makewhatis.local/makewhatis.local.sh
projects/runtime-coverage/libexec/rtld-elf/arm/reloc.c
projects/runtime-coverage/libexec/rtld-elf/arm/rtld_machdep.h
projects/runtime-coverage/libexec/rtld-elf/mips/reloc.c
projects/runtime-coverage/libexec/rtld-elf/mips/rtld_start.S
projects/runtime-coverage/libexec/rtld-elf/rtld.c
projects/runtime-coverage/libexec/rtld-elf/rtld.h
projects/runtime-coverage/release/amd64/make-memstick.sh
projects/runtime-coverage/release/arm/BEAGLEBONE.conf
projects/runtime-coverage/release/arm/CUBIEBOARD.conf
projects/runtime-coverage/release/arm/GUMSTIX.conf
projects/runtime-coverage/release/arm/PANDABOARD.conf
projects/runtime-coverage/release/arm/RPI-B.conf
projects/runtime-coverage/release/arm64/RPI3.conf
projects/runtime-coverage/release/arm64/make-memstick.sh
projects/runtime-coverage/release/i386/make-memstick.sh
projects/runtime-coverage/release/powerpc/make-memstick.sh
projects/runtime-coverage/share/man/man4/Makefile
projects/runtime-coverage/share/man/man4/altq.4
projects/runtime-coverage/share/man/man4/siba.4
projects/runtime-coverage/share/man/man4/vlan.4
projects/runtime-coverage/share/man/man5/periodic.conf.5
projects/runtime-coverage/share/man/man5/rc.conf.5
projects/runtime-coverage/share/man/man5/src.conf.5
projects/runtime-coverage/share/misc/committers-ports.dot
projects/runtime-coverage/share/misc/committers-src.dot
projects/runtime-coverage/share/mk/bsd.sys.mk
projects/runtime-coverage/share/mk/src.opts.mk
projects/runtime-coverage/sys/arm/allwinner/a10_gpio.c
projects/runtime-coverage/sys/arm/arm/elf_machdep.c
projects/runtime-coverage/sys/arm/arm/machdep.c
projects/runtime-coverage/sys/arm/arm/vfp.c
projects/runtime-coverage/sys/arm/at91/at91_twi.c
projects/runtime-coverage/sys/arm/broadcom/bcm2835/bcm2835_bsc.c
projects/runtime-coverage/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
projects/runtime-coverage/sys/arm/conf/BEAGLEBONE-MMCCAM
projects/runtime-coverage/sys/arm/freescale/imx/imx_gpio.c
projects/runtime-coverage/sys/arm/freescale/imx/imx_i2c.c
projects/runtime-coverage/sys/arm/include/elf.h
projects/runtime-coverage/sys/arm/include/md_var.h
projects/runtime-coverage/sys/arm/include/ptrace.h
projects/runtime-coverage/sys/arm/include/vfp.h
projects/runtime-coverage/sys/arm/ti/ti_cpuid.c
projects/runtime-coverage/sys/arm/ti/ti_cpuid.h
projects/runtime-coverage/sys/arm/ti/ti_i2c.c
projects/runtime-coverage/sys/arm/ti/ti_scm.c
projects/runtime-coverage/sys/arm64/arm64/identcpu.c
projects/runtime-coverage/sys/arm64/arm64/machdep.c
projects/runtime-coverage/sys/arm64/arm64/trap.c
projects/runtime-coverage/sys/arm64/conf/GENERIC
projects/runtime-coverage/sys/arm64/include/armreg.h
projects/runtime-coverage/sys/arm64/include/elf.h
projects/runtime-coverage/sys/boot/common/loader.8
projects/runtime-coverage/sys/boot/efi/boot1/Makefile
projects/runtime-coverage/sys/boot/efi/boot1/Makefile.fat
projects/runtime-coverage/sys/boot/efi/boot1/generate-fat.sh
projects/runtime-coverage/sys/boot/efi/include/efilib.h
projects/runtime-coverage/sys/boot/efi/include/efizfs.h
projects/runtime-coverage/sys/boot/efi/libefi/efipart.c
projects/runtime-coverage/sys/boot/efi/libefi/efizfs.c
projects/runtime-coverage/sys/boot/efi/loader/main.c
projects/runtime-coverage/sys/boot/i386/libi386/biosmem.c
projects/runtime-coverage/sys/boot/zfs/zfsimpl.c
projects/runtime-coverage/sys/cam/cam_iosched.c
projects/runtime-coverage/sys/cam/ctl/ctl_backend_block.c
projects/runtime-coverage/sys/cam/ctl/ctl_backend_ramdisk.c
projects/runtime-coverage/sys/cam/mmc/mmc.h
projects/runtime-coverage/sys/cam/mmc/mmc_da.c
projects/runtime-coverage/sys/cam/mmc/mmc_xpt.c
projects/runtime-coverage/sys/cam/nvme/nvme_da.c
projects/runtime-coverage/sys/cddl/boot/zfs/zfsimpl.h
projects/runtime-coverage/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c
projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/abd.c
projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c
projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c
projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c
projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/abd.h
projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h
projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_scan.h
projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h
projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h
projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h
projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h
projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c
projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c
projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c
projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h
projects/runtime-coverage/sys/compat/linuxkpi/common/include/linux/file.h
projects/runtime-coverage/sys/compat/linuxkpi/common/include/linux/fs.h
projects/runtime-coverage/sys/compat/linuxkpi/common/include/linux/inetdevice.h
projects/runtime-coverage/sys/compat/linuxkpi/common/include/linux/poll.h
projects/runtime-coverage/sys/compat/linuxkpi/common/src/linux_compat.c
projects/runtime-coverage/sys/conf/NOTES
projects/runtime-coverage/sys/conf/files
projects/runtime-coverage/sys/conf/files.arm
projects/runtime-coverage/sys/conf/files.arm64
projects/runtime-coverage/sys/conf/kern.mk
projects/runtime-coverage/sys/conf/newvers.sh
projects/runtime-coverage/sys/contrib/ipfilter/netinet/ip_state.c
projects/runtime-coverage/sys/contrib/octeon-sdk/cvmx-l2c.c
projects/runtime-coverage/sys/dev/ahci/ahci_generic.c
projects/runtime-coverage/sys/dev/amdsmn/amdsmn.c
projects/runtime-coverage/sys/dev/amdtemp/amdtemp.c
projects/runtime-coverage/sys/dev/cxgbe/crypto/t4_crypto.c
projects/runtime-coverage/sys/dev/cxgbe/t4_main.c
projects/runtime-coverage/sys/dev/cxgbe/tom/t4_ddp.c
projects/runtime-coverage/sys/dev/cxgbe/tom/t4_tom.h
projects/runtime-coverage/sys/dev/glxiic/glxiic.c
projects/runtime-coverage/sys/dev/gpio/gpio_if.m
projects/runtime-coverage/sys/dev/gpio/gpioc.c
projects/runtime-coverage/sys/dev/ichwd/ichwd.h
projects/runtime-coverage/sys/dev/iicbus/iicbus_if.m
projects/runtime-coverage/sys/dev/intpm/intpm.c
projects/runtime-coverage/sys/dev/ioat/ioat.c
projects/runtime-coverage/sys/dev/jedec_ts/jedec_ts.c
projects/runtime-coverage/sys/dev/mmc/host/dwmmc.c
projects/runtime-coverage/sys/dev/mpr/mpr.c
projects/runtime-coverage/sys/dev/mpr/mpr_pci.c
projects/runtime-coverage/sys/dev/mpr/mpr_sas.c
projects/runtime-coverage/sys/dev/mpr/mpr_table.c
projects/runtime-coverage/sys/dev/mpr/mpr_table.h
projects/runtime-coverage/sys/dev/mpr/mprvar.h
projects/runtime-coverage/sys/dev/mps/mps.c
projects/runtime-coverage/sys/dev/mps/mps_pci.c
projects/runtime-coverage/sys/dev/mps/mps_sas.c
projects/runtime-coverage/sys/dev/mps/mps_table.c
projects/runtime-coverage/sys/dev/mps/mps_table.h
projects/runtime-coverage/sys/dev/mps/mpsvar.h
projects/runtime-coverage/sys/dev/neta/if_mvneta.c
projects/runtime-coverage/sys/dev/neta/if_mvneta_fdt.c
projects/runtime-coverage/sys/dev/neta/if_mvnetavar.h
projects/runtime-coverage/sys/dev/ntb/ntb_hw/ntb_hw_intel.c
projects/runtime-coverage/sys/dev/ntb/ntb_hw/ntb_hw_plx.c
projects/runtime-coverage/sys/dev/usb/controller/ehci_mv.c
projects/runtime-coverage/sys/dev/usb/controller/xhci_mv.c
projects/runtime-coverage/sys/geom/mirror/g_mirror.c
projects/runtime-coverage/sys/geom/mirror/g_mirror.h
projects/runtime-coverage/sys/kern/imgact_elf.c
projects/runtime-coverage/sys/kern/kern_fork.c
projects/runtime-coverage/sys/kern/kern_sendfile.c
projects/runtime-coverage/sys/kern/subr_blist.c
projects/runtime-coverage/sys/kern/uipc_socket.c
projects/runtime-coverage/sys/kern/uipc_usrreq.c
projects/runtime-coverage/sys/kern/vfs_cache.c
projects/runtime-coverage/sys/kern/vfs_mount.c
projects/runtime-coverage/sys/mips/include/cpufunc.h
projects/runtime-coverage/sys/mips/include/cpuregs.h
projects/runtime-coverage/sys/mips/include/elf.h
projects/runtime-coverage/sys/mips/rmi/rootfs_list.txt
projects/runtime-coverage/sys/modules/Makefile
projects/runtime-coverage/sys/modules/cxgb/Makefile
projects/runtime-coverage/sys/modules/uart/Makefile
projects/runtime-coverage/sys/net/if_vlan.c
projects/runtime-coverage/sys/netinet/sctp_input.c
projects/runtime-coverage/sys/netinet/sctp_output.c
projects/runtime-coverage/sys/netinet/sctp_pcb.c
projects/runtime-coverage/sys/netinet/sctp_sysctl.c
projects/runtime-coverage/sys/netinet/sctp_uio.h
projects/runtime-coverage/sys/netinet/sctp_usrreq.c
projects/runtime-coverage/sys/netinet/tcp_var.h
projects/runtime-coverage/sys/netinet6/sctp6_usrreq.c
projects/runtime-coverage/sys/ofed/drivers/infiniband/core/ucm.c
projects/runtime-coverage/sys/ofed/drivers/infiniband/core/ucma.c
projects/runtime-coverage/sys/ofed/drivers/infiniband/core/user_mad.c
projects/runtime-coverage/sys/ofed/drivers/infiniband/core/uverbs_main.c
projects/runtime-coverage/sys/powerpc/include/elf.h
projects/runtime-coverage/sys/powerpc/powerpc/machdep.c
projects/runtime-coverage/sys/riscv/include/elf.h
projects/runtime-coverage/sys/riscv/riscv/machdep.c
projects/runtime-coverage/sys/sparc64/include/elf.h
projects/runtime-coverage/sys/sys/blist.h
projects/runtime-coverage/sys/sys/elf_common.h
projects/runtime-coverage/sys/sys/gpio.h
projects/runtime-coverage/sys/sys/param.h
projects/runtime-coverage/sys/sys/sysent.h
projects/runtime-coverage/sys/sys/vmmeter.h
projects/runtime-coverage/sys/vm/swap_pager.c
projects/runtime-coverage/sys/vm/uma_core.c
projects/runtime-coverage/sys/vm/uma_int.h
projects/runtime-coverage/sys/vm/vm_meter.c
projects/runtime-coverage/sys/vm/vm_object.c
projects/runtime-coverage/sys/vm/vm_object.h
projects/runtime-coverage/sys/vm/vm_page.c
projects/runtime-coverage/sys/vm/vm_page.h
projects/runtime-coverage/sys/x86/include/elf.h
projects/runtime-coverage/sys/x86/include/specialreg.h
projects/runtime-coverage/sys/x86/x86/identcpu.c
projects/runtime-coverage/sys/x86/x86/io_apic.c
projects/runtime-coverage/sys/x86/x86/mca.c
projects/runtime-coverage/targets/pseudo/userland/Makefile.depend
projects/runtime-coverage/tools/build/mk/OptionalObsoleteFiles.inc
projects/runtime-coverage/tools/build/options/WITHOUT_MAN_UTILS
projects/runtime-coverage/usr.bin/Makefile
projects/runtime-coverage/usr.bin/awk/awk.1
projects/runtime-coverage/usr.bin/calendar/calendars/calendar.freebsd
projects/runtime-coverage/usr.bin/gcore/elfcore.c
projects/runtime-coverage/usr.bin/getconf/confstr.gperf
projects/runtime-coverage/usr.bin/getconf/getconf.1
projects/runtime-coverage/usr.bin/getconf/getconf.c
projects/runtime-coverage/usr.bin/getconf/getconf.h
projects/runtime-coverage/usr.bin/getconf/pathconf.gperf
projects/runtime-coverage/usr.bin/getconf/sysconf.gperf
projects/runtime-coverage/usr.bin/grep/regex/fastmatch.h
projects/runtime-coverage/usr.bin/ktrdump/ktrdump.c
projects/runtime-coverage/usr.bin/netstat/netstat.1
projects/runtime-coverage/usr.bin/sockstat/sockstat.1
projects/runtime-coverage/usr.bin/sockstat/sockstat.c
projects/runtime-coverage/usr.bin/su/su.1
projects/runtime-coverage/usr.bin/svn/lib/libsvn_client/Makefile
projects/runtime-coverage/usr.bin/tail/tests/tail_test.sh
projects/runtime-coverage/usr.sbin/acpi/acpidump/acpi.c
projects/runtime-coverage/usr.sbin/acpi/acpidump/acpidump.8
projects/runtime-coverage/usr.sbin/bsdinstall/partedit/gpart_ops.c
projects/runtime-coverage/usr.sbin/bsdinstall/scripts/config
projects/runtime-coverage/usr.sbin/crunch/examples/really-big.conf
projects/runtime-coverage/usr.sbin/cxgbetool/cxgbetool.c
projects/runtime-coverage/usr.sbin/i2c/i2c.c
projects/runtime-coverage/usr.sbin/iovctl/iovctl.c
projects/runtime-coverage/usr.sbin/tcpdrop/tcpdrop.8
projects/runtime-coverage/usr.sbin/tcpdrop/tcpdrop.c
projects/runtime-coverage/usr.sbin/zic/zic/Makefile
Directory Properties:
projects/runtime-coverage/ (props changed)
projects/runtime-coverage/cddl/ (props changed)
projects/runtime-coverage/cddl/contrib/opensolaris/ (props changed)
projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/ (props changed)
projects/runtime-coverage/contrib/elftoolchain/ (props changed)
projects/runtime-coverage/contrib/one-true-awk/ (props changed)
projects/runtime-coverage/contrib/zlib/ (props changed)
projects/runtime-coverage/gnu/usr.bin/binutils/ (props changed)
projects/runtime-coverage/lib/libedit/ (props changed)
projects/runtime-coverage/sys/cddl/contrib/opensolaris/ (props changed)
projects/runtime-coverage/sys/contrib/ipfilter/ (props changed)
projects/runtime-coverage/sys/contrib/octeon-sdk/ (props changed)
Modified: projects/runtime-coverage/ObsoleteFiles.inc
==============================================================================
--- projects/runtime-coverage/ObsoleteFiles.inc Sat Sep 16 02:41:38 2017 (r323635)
+++ projects/runtime-coverage/ObsoleteFiles.inc Sat Sep 16 03:54:20 2017 (r323636)
@@ -38,6 +38,13 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20170913: remove unneeded catman utility
+OLD_FILES+=etc/periodic/weekly/330.catman
+OLD_FILES+=usr/bin/catman
+OLD_FILES+=usr/libexec/catman.local
+OLD_FILES+=usr/share/man/man1/catman.1.gz
+OLD_FILES+=usr/share/man/man8/catman.local.8.gz
+
# 20170802: ksyms(4) ioctl interface was removed
OLD_FILES+=usr/include/sys/ksyms.h
Modified: projects/runtime-coverage/UPDATING
==============================================================================
--- projects/runtime-coverage/UPDATING Sat Sep 16 02:41:38 2017 (r323635)
+++ projects/runtime-coverage/UPDATING Sat Sep 16 03:54:20 2017 (r323636)
@@ -51,6 +51,20 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW:
****************************** SPECIAL WARNING: ******************************
+20170912:
+ The default serial number format for CTL LUNs has changed. This will
+ affect users who use /dev/diskid/* device nodes, or whose FibreChannel
+ or iSCSI clients care about their LUNs' serial numbers. Users who
+ require serial number stability should hardcode serial numbers in
+ /etc/ctl.conf .
+
+20170912:
+ For 32-bit arm compiled for hard-float support, soft-floating point
+ binaries now always get their shared libraries from
+ LD_SOFT_LIBRARY_PATH (in the past, this was only used if
+ /usr/libsoft also existed). Only users with a hard-float ld.so, but
+ soft-float everything else should be affected.
+
20170826:
During boot the geli passphrase will be hidden. To restore previous
behavior see geli(8) configuration options.
Modified: projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d
==============================================================================
--- projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d Sat Sep 16 02:41:38 2017 (r323635)
+++ projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d Sat Sep 16 03:54:20 2017 (r323636)
@@ -28,9 +28,6 @@
#pragma D option quiet
-inline int AF_INET = 2;
-inline int AF_INET6 = 28;
-
in_addr_t *ip4a;
in_addr_t *ip4b;
in_addr_t *ip4c;
Modified: projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.c
==============================================================================
--- projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.c Sat Sep 16 02:41:38 2017 (r323635)
+++ projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.c Sat Sep 16 03:54:20 2017 (r323636)
@@ -35,13 +35,13 @@ main(int argc, char **argv)
sigset_t ss;
(void) sigemptyset(&ss);
- (void) sigaddset(&ss, SIGINT);
+ (void) sigaddset(&ss, SIGUSR1);
(void) sigprocmask(SIG_BLOCK, &ss, NULL);
do {
(void) getpid();
(void) sigpending(&ss);
- } while (!sigismember(&ss, SIGINT));
+ } while (!sigismember(&ss, SIGUSR1));
return (0);
}
Modified: projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.d
==============================================================================
--- projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.d Sat Sep 16 02:41:38 2017 (r323635)
+++ projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.d Sat Sep 16 03:54:20 2017 (r323636)
@@ -47,7 +47,7 @@ syscall::getpid:entry
/pid == $1/
{
trace("raised");
- raise(SIGINT);
+ raise(SIGUSR1);
/*
* Wait no more than half a second for the process to die.
*/
@@ -55,6 +55,7 @@ syscall::getpid:entry
}
syscall::exit:entry
+/pid == $1/
{
exit(0);
}
Modified: projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.c
==============================================================================
--- projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.c Sat Sep 16 02:41:38 2017 (r323635)
+++ projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.c Sat Sep 16 03:54:20 2017 (r323636)
@@ -45,7 +45,7 @@ main(int argc, char **argv)
sigemptyset(&sa.sa_mask);
sa.sa_flags = 0;
- (void) sigaction(SIGINT, &sa, NULL);
+ (void) sigaction(SIGUSR1, &sa, NULL);
for (;;) {
(void) getpid();
Modified: projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.d
==============================================================================
--- projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.d Sat Sep 16 02:41:38 2017 (r323635)
+++ projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.d Sat Sep 16 03:54:20 2017 (r323636)
@@ -47,7 +47,7 @@ syscall::getpid:return
/pid == $1/
{
trace("raised");
- raise(SIGINT);
+ raise(SIGUSR1);
/*
* Wait no more than half a second for the process to die.
*/
@@ -55,6 +55,7 @@ syscall::getpid:return
}
syscall::exit:entry
+/pid == $1/
{
exit(0);
}
Modified: projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.c
==============================================================================
--- projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.c Sat Sep 16 02:41:38 2017 (r323635)
+++ projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.c Sat Sep 16 03:54:20 2017 (r323636)
@@ -45,7 +45,7 @@ main(int argc, char **argv)
sigemptyset(&sa.sa_mask);
sa.sa_flags = 0;
- (void) sigaction(SIGINT, &sa, NULL);
+ (void) sigaction(SIGUSR1, &sa, NULL);
for (;;) {
(void) getpid();
Modified: projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.d
==============================================================================
--- projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.d Sat Sep 16 02:41:38 2017 (r323635)
+++ projects/runtime-coverage/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.d Sat Sep 16 03:54:20 2017 (r323636)
@@ -47,7 +47,7 @@ syscall::getpid:entry
/pid == $1/
{
trace("raised");
- raise(SIGINT);
+ raise(SIGUSR1);
/*
* Wait no more than half a second for the process to die.
*/
@@ -55,6 +55,7 @@ syscall::getpid:entry
}
syscall::exit:entry
+/pid == $1/
{
exit(0);
}
Modified: projects/runtime-coverage/cddl/contrib/opensolaris/cmd/zpool/zpool.8
==============================================================================
--- projects/runtime-coverage/cddl/contrib/opensolaris/cmd/zpool/zpool.8 Sat Sep 16 02:41:38 2017 (r323635)
+++ projects/runtime-coverage/cddl/contrib/opensolaris/cmd/zpool/zpool.8 Sat Sep 16 03:54:20 2017 (r323636)
@@ -19,14 +19,15 @@
.\" information: Portions Copyright [yyyy] [name of copyright owner]
.\"
.\" Copyright (c) 2010, Sun Microsystems, Inc. All Rights Reserved.
-.\" Copyright 2011, Nexenta Systems, Inc. All Rights Reserved.
.\" Copyright (c) 2011, Justin T. Gibbs <gibbs at FreeBSD.org>
-.\" Copyright (c) 2013 by Delphix. All Rights Reserved.
.\" Copyright (c) 2012, Glen Barber <gjb at FreeBSD.org>
+.\" Copyright (c) 2013 by Delphix. All Rights Reserved.
+.\" Copyright 2017 Nexenta Systems, Inc.
+.\" Copyright (c) 2017 Datto Inc.
.\"
.\" $FreeBSD$
.\"
-.Dd July 26, 2014
+.Dd September 08, 2017
.Dt ZPOOL 8
.Os
.Sh NAME
@@ -153,7 +154,7 @@
.Op Ar new_device
.Nm
.Cm scrub
-.Op Fl s
+.Op Fl s | Fl p
.Ar pool ...
.Nm
.Cm set
@@ -1543,42 +1544,53 @@ manner.
.It Xo
.Nm
.Cm scrub
-.Op Fl s
+.Op Fl s | Fl p
.Ar pool ...
.Xc
.Pp
-Begins a scrub. The scrub examines all data in the specified pools to verify
-that it checksums correctly. For replicated (mirror or
-.No raidz )
-devices,
-.Tn ZFS
-automatically repairs any damage discovered during the scrub. The
-.Qq Nm Cm status
+Begins a scrub or resumes a paused scrub.
+The scrub examines all data in the specified pools to verify that it checksums
+correctly.
+For replicated
+.Pq mirror or raidz
+devices, ZFS automatically repairs any damage discovered during the scrub.
+The
+.Nm zpool Cm status
command reports the progress of the scrub and summarizes the results of the
scrub upon completion.
.Pp
-Scrubbing and resilvering are very similar operations. The difference is that
-resilvering only examines data that
-.Tn ZFS
-knows to be out of date (for example, when attaching a new device to a mirror
-or replacing an existing device), whereas scrubbing examines all data to
-discover silent errors due to hardware faults or disk failure.
+Scrubbing and resilvering are very similar operations.
+The difference is that resilvering only examines data that ZFS knows to be out
+of date
+.Po
+for example, when attaching a new device to a mirror or replacing an existing
+device
+.Pc ,
+whereas scrubbing examines all data to discover silent errors due to hardware
+faults or disk failure.
.Pp
-Because scrubbing and resilvering are
-.Tn I/O Ns -intensive
-operations,
-.Tn ZFS
-only allows one at a time. If a scrub is already in progress, the
-.Qq Nm Cm scrub
-command returns an error. To start a new scrub, you have to stop the old scrub
-with the
-.Qq Nm Cm scrub Fl s
-command first. If a resilver is in progress,
-.Tn ZFS
-does not allow a scrub to be started until the resilver completes.
-.Bl -tag -width indent
+Because scrubbing and resilvering are I/O-intensive operations, ZFS only allows
+one at a time.
+If a scrub is paused, the
+.Nm zpool Cm scrub
+resumes it.
+If a resilver is in progress, ZFS does not allow a scrub to be started until the
+resilver completes.
+.Bl -tag -width Ds
.It Fl s
Stop scrubbing.
+.El
+.Bl -tag -width Ds
+.It Fl p
+Pause scrubbing.
+Scrub pause state and progress are periodically synced to disk.
+If the system is restarted or pool is exported during a paused scrub,
+even after import, scrub will remain paused until it is resumed.
+Once resumed the scrub will pick up from the place where it was last
+checkpointed to disk.
+To resume a paused scrub issue
+.Nm zpool Cm scrub
+again.
.El
.It Xo
.Nm
Modified: projects/runtime-coverage/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
==============================================================================
--- projects/runtime-coverage/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Sat Sep 16 02:41:38 2017 (r323635)
+++ projects/runtime-coverage/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Sat Sep 16 03:54:20 2017 (r323636)
@@ -27,6 +27,7 @@
* Copyright (c) 2013 by Prasad Joshi (sTec). All rights reserved.
* Copyright 2016 Igor Kozhukhov <ikozhukhov at gmail.com>.
* Copyright 2016 Nexenta Systems, Inc.
+ * Copyright (c) 2017 Datto Inc.
*/
#include <solaris.h>
@@ -252,7 +253,7 @@ get_usage(zpool_help_t idx)
case HELP_REOPEN:
return (gettext("\treopen <pool>\n"));
case HELP_SCRUB:
- return (gettext("\tscrub [-s] <pool> ...\n"));
+ return (gettext("\tscrub [-s | -p] <pool> ...\n"));
case HELP_STATUS:
return (gettext("\tstatus [-vx] [-T d|u] [pool] ... [interval "
"[count]]\n"));
@@ -3825,6 +3826,7 @@ typedef struct scrub_cbdata {
int cb_type;
int cb_argc;
char **cb_argv;
+ pool_scrub_cmd_t cb_scrub_cmd;
} scrub_cbdata_t;
int
@@ -3842,15 +3844,16 @@ scrub_callback(zpool_handle_t *zhp, void *data)
return (1);
}
- err = zpool_scan(zhp, cb->cb_type);
+ err = zpool_scan(zhp, cb->cb_type, cb->cb_scrub_cmd);
return (err != 0);
}
/*
- * zpool scrub [-s] <pool> ...
+ * zpool scrub [-s | -p] <pool> ...
*
* -s Stop. Stops any in-progress scrub.
+ * -p Pause. Pause in-progress scrub.
*/
int
zpool_do_scrub(int argc, char **argv)
@@ -3859,13 +3862,17 @@ zpool_do_scrub(int argc, char **argv)
scrub_cbdata_t cb;
cb.cb_type = POOL_SCAN_SCRUB;
+ cb.cb_scrub_cmd = POOL_SCRUB_NORMAL;
/* check options */
- while ((c = getopt(argc, argv, "s")) != -1) {
+ while ((c = getopt(argc, argv, "sp")) != -1) {
switch (c) {
case 's':
cb.cb_type = POOL_SCAN_NONE;
break;
+ case 'p':
+ cb.cb_scrub_cmd = POOL_SCRUB_PAUSE;
+ break;
case '?':
(void) fprintf(stderr, gettext("invalid option '%c'\n"),
optopt);
@@ -3873,6 +3880,13 @@ zpool_do_scrub(int argc, char **argv)
}
}
+ if (cb.cb_type == POOL_SCAN_NONE &&
+ cb.cb_scrub_cmd == POOL_SCRUB_PAUSE) {
+ (void) fprintf(stderr, gettext("invalid option combination: "
+ "-s and -p are mutually exclusive\n"));
+ usage(B_FALSE);
+ }
+
cb.cb_argc = argc;
cb.cb_argv = argv;
argc -= optind;
@@ -3901,7 +3915,7 @@ typedef struct status_cbdata {
void
print_scan_status(pool_scan_stat_t *ps)
{
- time_t start, end;
+ time_t start, end, pause;
uint64_t elapsed, mins_left, hours_left;
uint64_t pass_exam, examined, total;
uint_t rate;
@@ -3919,6 +3933,7 @@ print_scan_status(pool_scan_stat_t *ps)
start = ps->pss_start_time;
end = ps->pss_end_time;
+ pause = ps->pss_pass_scrub_pause;
zfs_nicenum(ps->pss_processed, processed_buf, sizeof (processed_buf));
assert(ps->pss_func == POOL_SCAN_SCRUB ||
@@ -3961,8 +3976,17 @@ print_scan_status(pool_scan_stat_t *ps)
* Scan is in progress.
*/
if (ps->pss_func == POOL_SCAN_SCRUB) {
- (void) printf(gettext("scrub in progress since %s"),
- ctime(&start));
+ if (pause == 0) {
+ (void) printf(gettext("scrub in progress since %s"),
+ ctime(&start));
+ } else {
+ char buf[32];
+ struct tm *p = localtime(&pause);
+ (void) strftime(buf, sizeof (buf), "%a %b %e %T %Y", p);
+ (void) printf(gettext("scrub paused since %s\n"), buf);
+ (void) printf(gettext("\tscrub started on %s"),
+ ctime(&start));
+ }
} else if (ps->pss_func == POOL_SCAN_RESILVER) {
(void) printf(gettext("resilver in progress since %s"),
ctime(&start));
@@ -3974,6 +3998,7 @@ print_scan_status(pool_scan_stat_t *ps)
/* elapsed time for this pass */
elapsed = time(NULL) - ps->pss_pass_start;
+ elapsed -= ps->pss_pass_scrub_spent_paused;
elapsed = elapsed ? elapsed : 1;
pass_exam = ps->pss_pass_exam ? ps->pss_pass_exam : 1;
rate = pass_exam / elapsed;
@@ -3983,19 +4008,25 @@ print_scan_status(pool_scan_stat_t *ps)
zfs_nicenum(examined, examined_buf, sizeof (examined_buf));
zfs_nicenum(total, total_buf, sizeof (total_buf));
- zfs_nicenum(rate, rate_buf, sizeof (rate_buf));
/*
* do not print estimated time if hours_left is more than 30 days
+ * or we have a paused scrub
*/
- (void) printf(gettext(" %s scanned out of %s at %s/s"),
- examined_buf, total_buf, rate_buf);
- if (hours_left < (30 * 24)) {
- (void) printf(gettext(", %lluh%um to go\n"),
- (u_longlong_t)hours_left, (uint_t)(mins_left % 60));
+ if (pause == 0) {
+ zfs_nicenum(rate, rate_buf, sizeof (rate_buf));
+ (void) printf(gettext("\t%s scanned out of %s at %s/s"),
+ examined_buf, total_buf, rate_buf);
+ if (hours_left < (30 * 24)) {
+ (void) printf(gettext(", %lluh%um to go\n"),
+ (u_longlong_t)hours_left, (uint_t)(mins_left % 60));
+ } else {
+ (void) printf(gettext(
+ ", (scan is slow, no estimated time)\n"));
+ }
} else {
- (void) printf(gettext(
- ", (scan is slow, no estimated time)\n"));
+ (void) printf(gettext("\t%s scanned out of %s\n"),
+ examined_buf, total_buf);
}
if (ps->pss_func == POOL_SCAN_RESILVER) {
Modified: projects/runtime-coverage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c
==============================================================================
--- projects/runtime-coverage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c Sat Sep 16 02:41:38 2017 (r323635)
+++ projects/runtime-coverage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c Sat Sep 16 03:54:20 2017 (r323636)
@@ -1109,7 +1109,7 @@ dt_vopen(int version, int flags, int *errp,
*/
if (err == ENOENT && modfind("dtraceall") < 0) {
kldload("dtraceall"); /* ignore the error */
- dtfd = open("/dev/dtrace/dtrace", O_RDWR);
+ dtfd = open("/dev/dtrace/dtrace", O_RDWR | O_CLOEXEC);
err = errno;
}
#endif
Modified: projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
==============================================================================
--- projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h Sat Sep 16 02:41:38 2017 (r323635)
+++ projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h Sat Sep 16 03:54:20 2017 (r323636)
@@ -28,6 +28,7 @@
* Copyright (c) 2013 Steven Hartland. All rights reserved.
* Copyright (c) 2014 Integros [integros.com]
* Copyright 2016 Nexenta Systems, Inc.
+ * Copyright (c) 2017 Datto Inc.
*/
#ifndef _LIBZFS_H
@@ -129,6 +130,7 @@ typedef enum zfs_error {
EZFS_DIFF, /* general failure of zfs diff */
EZFS_DIFFDATA, /* bad zfs diff data */
EZFS_POOLREADONLY, /* pool is in read-only mode */
+ EZFS_SCRUB_PAUSED, /* scrub currently paused */
EZFS_UNKNOWN
} zfs_error_t;
@@ -241,7 +243,7 @@ typedef struct splitflags {
/*
* Functions to manipulate pool and vdev state
*/
-extern int zpool_scan(zpool_handle_t *, pool_scan_func_t);
+extern int zpool_scan(zpool_handle_t *, pool_scan_func_t, pool_scrub_cmd_t);
extern int zpool_clear(zpool_handle_t *, const char *, nvlist_t *);
extern int zpool_reguid(zpool_handle_t *);
extern int zpool_reopen(zpool_handle_t *);
Modified: projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c
==============================================================================
--- projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c Sat Sep 16 02:41:38 2017 (r323635)
+++ projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c Sat Sep 16 03:54:20 2017 (r323636)
@@ -20,9 +20,11 @@
*/
/*
+ * Copyright 2015 Nexenta Systems, Inc. All rights reserved.
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014 by Delphix. All rights reserved.
* Copyright 2016 Igor Kozhukhov <ikozhukhov at gmail.com>
+ * Copyright 2017 RackTop Systems.
*/
/*
@@ -87,7 +89,7 @@ zfs_share_type_t zfs_is_shared_proto(zfs_handle_t *, c
zfs_share_proto_t);
/*
- * The share protocols table must be in the same order as the zfs_share_prot_t
+ * The share protocols table must be in the same order as the zfs_share_proto_t
* enum in libzfs_impl.h
*/
typedef struct {
@@ -872,7 +874,7 @@ unshare_one(libzfs_handle_t *hdl, const char *name, co
/* make sure libshare initialized */
if ((err = zfs_init_libshare(hdl, SA_INIT_SHARE_API)) != SA_OK) {
free(mntpt); /* don't need the copy anymore */
- return (zfs_error_fmt(hdl, EZFS_SHARENFSFAILED,
+ return (zfs_error_fmt(hdl, proto_table[proto].p_unshare_err,
dgettext(TEXT_DOMAIN, "cannot unshare '%s': %s"),
name, _sa_errorstr(err)));
}
@@ -883,12 +885,13 @@ unshare_one(libzfs_handle_t *hdl, const char *name, co
if (share != NULL) {
err = zfs_sa_disable_share(share, proto_table[proto].p_name);
if (err != SA_OK) {
- return (zfs_error_fmt(hdl, EZFS_UNSHARENFSFAILED,
+ return (zfs_error_fmt(hdl,
+ proto_table[proto].p_unshare_err,
dgettext(TEXT_DOMAIN, "cannot unshare '%s': %s"),
name, _sa_errorstr(err)));
}
} else {
- return (zfs_error_fmt(hdl, EZFS_UNSHARENFSFAILED,
+ return (zfs_error_fmt(hdl, proto_table[proto].p_unshare_err,
dgettext(TEXT_DOMAIN, "cannot unshare '%s': not found"),
name));
}
Modified: projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
==============================================================================
--- projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c Sat Sep 16 02:41:38 2017 (r323635)
+++ projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c Sat Sep 16 03:54:20 2017 (r323636)
@@ -25,6 +25,7 @@
* Copyright (c) 2013, Joyent, Inc. All rights reserved.
* Copyright 2016 Nexenta Systems, Inc.
* Copyright 2016 Igor Kozhukhov <ikozhukhov at gmail.com>
+ * Copyright (c) 2017 Datto Inc.
*/
#include <sys/types.h>
@@ -1841,22 +1842,39 @@ zpool_import_props(libzfs_handle_t *hdl, nvlist_t *con
* Scan the pool.
*/
int
-zpool_scan(zpool_handle_t *zhp, pool_scan_func_t func)
+zpool_scan(zpool_handle_t *zhp, pool_scan_func_t func, pool_scrub_cmd_t cmd)
{
zfs_cmd_t zc = { 0 };
char msg[1024];
+ int err;
libzfs_handle_t *hdl = zhp->zpool_hdl;
(void) strlcpy(zc.zc_name, zhp->zpool_name, sizeof (zc.zc_name));
zc.zc_cookie = func;
+ zc.zc_flags = cmd;
- if (zfs_ioctl(hdl, ZFS_IOC_POOL_SCAN, &zc) == 0 ||
- (errno == ENOENT && func != POOL_SCAN_NONE))
+ if (zfs_ioctl(hdl, ZFS_IOC_POOL_SCAN, &zc) == 0)
return (0);
+ err = errno;
+
+ /* ECANCELED on a scrub means we resumed a paused scrub */
+ if (err == ECANCELED && func == POOL_SCAN_SCRUB &&
+ cmd == POOL_SCRUB_NORMAL)
+ return (0);
+
+ if (err == ENOENT && func != POOL_SCAN_NONE && cmd == POOL_SCRUB_NORMAL)
+ return (0);
+
if (func == POOL_SCAN_SCRUB) {
- (void) snprintf(msg, sizeof (msg),
- dgettext(TEXT_DOMAIN, "cannot scrub %s"), zc.zc_name);
+ if (cmd == POOL_SCRUB_PAUSE) {
+ (void) snprintf(msg, sizeof (msg), dgettext(TEXT_DOMAIN,
+ "cannot pause scrubbing %s"), zc.zc_name);
+ } else {
+ assert(cmd == POOL_SCRUB_NORMAL);
+ (void) snprintf(msg, sizeof (msg), dgettext(TEXT_DOMAIN,
+ "cannot scrub %s"), zc.zc_name);
+ }
} else if (func == POOL_SCAN_NONE) {
(void) snprintf(msg, sizeof (msg),
dgettext(TEXT_DOMAIN, "cannot cancel scrubbing %s"),
@@ -1865,7 +1883,7 @@ zpool_scan(zpool_handle_t *zhp, pool_scan_func_t func)
assert(!"unexpected result");
}
- if (errno == EBUSY) {
+ if (err == EBUSY) {
nvlist_t *nvroot;
pool_scan_stat_t *ps = NULL;
uint_t psc;
@@ -1874,14 +1892,18 @@ zpool_scan(zpool_handle_t *zhp, pool_scan_func_t func)
ZPOOL_CONFIG_VDEV_TREE, &nvroot) == 0);
(void) nvlist_lookup_uint64_array(nvroot,
ZPOOL_CONFIG_SCAN_STATS, (uint64_t **)&ps, &psc);
- if (ps && ps->pss_func == POOL_SCAN_SCRUB)
- return (zfs_error(hdl, EZFS_SCRUBBING, msg));
- else
+ if (ps && ps->pss_func == POOL_SCAN_SCRUB) {
+ if (cmd == POOL_SCRUB_PAUSE)
+ return (zfs_error(hdl, EZFS_SCRUB_PAUSED, msg));
+ else
+ return (zfs_error(hdl, EZFS_SCRUBBING, msg));
+ } else {
return (zfs_error(hdl, EZFS_RESILVERING, msg));
- } else if (errno == ENOENT) {
+ }
+ } else if (err == ENOENT) {
return (zfs_error(hdl, EZFS_NO_SCRUB, msg));
} else {
- return (zpool_standard_error(hdl, errno, msg));
+ return (zpool_standard_error(hdl, err, msg));
}
}
Modified: projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c
==============================================================================
--- projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c Sat Sep 16 02:41:38 2017 (r323635)
+++ projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c Sat Sep 16 03:54:20 2017 (r323636)
@@ -24,6 +24,7 @@
* Copyright (c) 2013, Joyent, Inc. All rights reserved.
* Copyright (c) 2011, 2015 by Delphix. All rights reserved.
* Copyright 2016 Igor Kozhukhov <ikozhukhov at gmail.com>
+ * Copyright (c) 2017 Datto Inc.
*/
/*
@@ -224,6 +225,9 @@ libzfs_error_description(libzfs_handle_t *hdl)
case EZFS_POSTSPLIT_ONLINE:
return (dgettext(TEXT_DOMAIN, "disk was split from this pool "
"into a new one"));
+ case EZFS_SCRUB_PAUSED:
+ return (dgettext(TEXT_DOMAIN, "scrub is paused; "
+ "use 'zpool scrub' to resume"));
case EZFS_SCRUBBING:
return (dgettext(TEXT_DOMAIN, "currently scrubbing; "
"use 'zpool scrub -s' to cancel current scrub"));
Modified: projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
==============================================================================
--- projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c Sat Sep 16 02:41:38 2017 (r323635)
+++ projects/runtime-coverage/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c Sat Sep 16 03:54:20 2017 (r323636)
@@ -735,11 +735,9 @@ static char ce_suffix[CE_IGNORE][2] = { "", "\n", "\n"
void
vpanic(const char *fmt, va_list adx)
{
- (void) fprintf(stderr, "error: ");
- (void) vfprintf(stderr, fmt, adx);
- (void) fprintf(stderr, "\n");
-
- abort(); /* think of it as a "user-level crash dump" */
+ char buf[512];
+ (void) vsnprintf(buf, 512, fmt, adx);
+ assfail(buf, NULL, 0);
}
void
Modified: projects/runtime-coverage/cddl/lib/libzpool/Makefile
==============================================================================
--- projects/runtime-coverage/cddl/lib/libzpool/Makefile Sat Sep 16 02:41:38 2017 (r323635)
+++ projects/runtime-coverage/cddl/lib/libzpool/Makefile Sat Sep 16 03:54:20 2017 (r323636)
@@ -26,7 +26,7 @@ ATOMIC_SRCS= opensolaris_atomic.c
LIB= zpool
-ZFS_COMMON_SRCS= ${ZFS_COMMON_OBJS:C/.o$/.c/} vdev_file.c trim_map.c
+ZFS_COMMON_SRCS= ${ZFS_COMMON_OBJS:C/.o$/.c/} trim_map.c
ZFS_SHARED_SRCS= ${ZFS_SHARED_OBJS:C/.o$/.c/}
KERNEL_SRCS= kernel.c taskq.c util.c
LIST_SRCS= list.c
Modified: projects/runtime-coverage/contrib/elftoolchain/readelf/readelf.c
==============================================================================
--- projects/runtime-coverage/contrib/elftoolchain/readelf/readelf.c Sat Sep 16 02:41:38 2017 (r323635)
+++ projects/runtime-coverage/contrib/elftoolchain/readelf/readelf.c Sat Sep 16 03:54:20 2017 (r323636)
@@ -1141,7 +1141,9 @@ note_type_freebsd_core(unsigned int nt)
case 14: return "NT_PROCSTAT_OSREL";
case 15: return "NT_PROCSTAT_PSSTRINGS";
case 16: return "NT_PROCSTAT_AUXV";
+ case 17: return "NT_PTLWPINFO";
case 0x202: return "NT_X86_XSTATE (x86 XSAVE extended state)";
+ case 0x400: return "NT_ARM_VFP (arm VFP registers)";
default: return (note_type_unknown(nt));
}
}
@@ -2692,6 +2694,9 @@ dump_arch_dyn_val(struct readelf *re, GElf_Dyn *dyn)
case DT_MIPS_PERF_SUFFIX:
case DT_MIPS_TIME_STAMP:
printf(" %s\n", timestamp(dyn->d_un.d_val));
+ break;
+ default:
+ printf("\n");
break;
}
break;
Modified: projects/runtime-coverage/contrib/one-true-awk/awk.h
==============================================================================
--- projects/runtime-coverage/contrib/one-true-awk/awk.h Sat Sep 16 02:41:38 2017 (r323635)
+++ projects/runtime-coverage/contrib/one-true-awk/awk.h Sat Sep 16 03:54:20 2017 (r323636)
@@ -126,6 +126,12 @@ extern Cell *rlengthloc; /* RLENGTH */
#define FTOUPPER 12
#define FTOLOWER 13
#define FFLUSH 14
+#define FAND 15
+#define FFOR 16
+#define FXOR 17
+#define FCOMPL 18
+#define FLSHIFT 19
+#define FRSHIFT 20
/* Node: parse tree is made of nodes, with Cell's at bottom */
Modified: projects/runtime-coverage/contrib/one-true-awk/lex.c
==============================================================================
--- projects/runtime-coverage/contrib/one-true-awk/lex.c Sat Sep 16 02:41:38 2017 (r323635)
+++ projects/runtime-coverage/contrib/one-true-awk/lex.c Sat Sep 16 03:54:20 2017 (r323636)
@@ -47,9 +47,11 @@ Keyword keywords[] ={ /* keep sorted: binary searched
{ "BEGIN", XBEGIN, XBEGIN },
{ "END", XEND, XEND },
{ "NF", VARNF, VARNF },
+ { "and", FAND, BLTIN },
{ "atan2", FATAN, BLTIN },
{ "break", BREAK, BREAK },
{ "close", CLOSE, CLOSE },
+ { "compl", FCOMPL, BLTIN },
{ "continue", CONTINUE, CONTINUE },
{ "cos", FCOS, BLTIN },
{ "delete", DELETE, DELETE },
@@ -69,13 +71,16 @@ Keyword keywords[] ={ /* keep sorted: binary searched
{ "int", FINT, BLTIN },
{ "length", FLENGTH, BLTIN },
{ "log", FLOG, BLTIN },
+ { "lshift", FLSHIFT, BLTIN },
{ "match", MATCHFCN, MATCHFCN },
{ "next", NEXT, NEXT },
{ "nextfile", NEXTFILE, NEXTFILE },
+ { "or", FFOR, BLTIN },
{ "print", PRINT, PRINT },
{ "printf", PRINTF, PRINTF },
{ "rand", FRAND, BLTIN },
{ "return", RETURN, RETURN },
+ { "rshift", FRSHIFT, BLTIN },
{ "sin", FSIN, BLTIN },
{ "split", SPLIT, SPLIT },
{ "sprintf", SPRINTF, SPRINTF },
@@ -87,6 +92,7 @@ Keyword keywords[] ={ /* keep sorted: binary searched
{ "tolower", FTOLOWER, BLTIN },
{ "toupper", FTOUPPER, BLTIN },
{ "while", WHILE, WHILE },
+ { "xor", FXOR, BLTIN },
};
#define RET(x) { if(dbg)printf("lex %s\n", tokname(x)); return(x); }
Modified: projects/runtime-coverage/contrib/one-true-awk/run.c
==============================================================================
--- projects/runtime-coverage/contrib/one-true-awk/run.c Sat Sep 16 02:41:38 2017 (r323635)
+++ projects/runtime-coverage/contrib/one-true-awk/run.c Sat Sep 16 03:54:20 2017 (r323636)
@@ -1476,7 +1476,7 @@ Cell *bltin(Node **a, int n) /* builtin functions. a[0
{
Cell *x, *y;
Awkfloat u;
- int t;
+ int t, i;
Awkfloat tmp;
char *p, *buf;
Node *nextarg;
@@ -1515,6 +1515,76 @@ Cell *bltin(Node **a, int n) /* builtin functions. a[0
tempfree(y);
nextarg = nextarg->nnext;
}
+ break;
+ case FCOMPL:
+ u = ~((int)getfval(x));
+ break;
+ case FAND:
+ if (nextarg == NULL) {
+ WARNING("and requires two arguments; returning 0");
+ u = 0;
+ break;
+ }
+ i = ((int)getfval(x));
+ while (nextarg != NULL) {
+ y = execute(nextarg);
+ i &= (int)getfval(y);
+ tempfree(y);
+ nextarg = nextarg->nnext;
+ }
+ u = i;
+ break;
+ case FFOR:
+ if (nextarg == NULL) {
+ WARNING("or requires two arguments; returning 0");
+ u = 0;
+ break;
+ }
+ i = ((int)getfval(x));
+ while (nextarg != NULL) {
+ y = execute(nextarg);
+ i |= (int)getfval(y);
+ tempfree(y);
+ nextarg = nextarg->nnext;
+ }
+ u = i;
+ break;
+ case FXOR:
+ if (nextarg == NULL) {
+ WARNING("xor requires two arguments; returning 0");
+ u = 0;
+ break;
+ }
+ i = ((int)getfval(x));
+ while (nextarg != NULL) {
+ y = execute(nextarg);
+ i ^= (int)getfval(y);
+ tempfree(y);
+ nextarg = nextarg->nnext;
+ }
+ u = i;
+ break;
+ case FLSHIFT:
+ if (nextarg == NULL) {
+ WARNING("lshift requires two arguments; returning 0");
+ u = 0;
+ break;
+ }
+ y = execute(a[1]->nnext);
+ u = ((int)getfval(x)) << ((int)getfval(y));
+ tempfree(y);
+ nextarg = nextarg->nnext;
+ break;
+ case FRSHIFT:
+ if (nextarg == NULL) {
+ WARNING("rshift requires two arguments; returning 0");
+ u = 0;
+ break;
+ }
+ y = execute(a[1]->nnext);
+ u = ((int)getfval(x)) >> ((int)getfval(y));
+ tempfree(y);
+ nextarg = nextarg->nnext;
break;
case FSYSTEM:
fflush(stdout); /* in case something is buffered already */
Modified: projects/runtime-coverage/contrib/zlib/deflate.c
==============================================================================
--- projects/runtime-coverage/contrib/zlib/deflate.c Sat Sep 16 02:41:38 2017 (r323635)
+++ projects/runtime-coverage/contrib/zlib/deflate.c Sat Sep 16 03:54:20 2017 (r323636)
@@ -494,7 +494,7 @@ int ZEXPORT deflateResetKeep (strm)
s->wrap == 2 ? crc32(0L, Z_NULL, 0) :
#endif
adler32(0L, Z_NULL, 0);
- s->last_flush = Z_NO_FLUSH;
+ s->last_flush = -2;
_tr_init(s);
@@ -587,12 +587,12 @@ int ZEXPORT deflateParams(strm, level, strategy)
func = configuration_table[s->level].func;
if ((strategy != s->strategy || func != configuration_table[level].func) &&
- s->high_water) {
+ s->last_flush != -2) {
/* Flush the last buffer: */
int err = deflate(strm, Z_BLOCK);
if (err == Z_STREAM_ERROR)
return err;
- if (strm->avail_out == 0)
+ if (strm->avail_in || (s->strstart - s->block_start) + s->lookahead)
return Z_BUF_ERROR;
}
if (s->level != level) {
Modified: projects/runtime-coverage/contrib/zlib/zlib.h
==============================================================================
--- projects/runtime-coverage/contrib/zlib/zlib.h Sat Sep 16 02:41:38 2017 (r323635)
+++ projects/runtime-coverage/contrib/zlib/zlib.h Sat Sep 16 03:54:20 2017 (r323636)
@@ -712,11 +712,12 @@ ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
used to switch between compression and straight copy of the input data, or
to switch to a different kind of input data requiring a different strategy.
If the compression approach (which is a function of the level) or the
- strategy is changed, and if any input has been consumed in a previous
- deflate() call, then the input available so far is compressed with the old
- level and strategy using deflate(strm, Z_BLOCK). There are three approaches
- for the compression levels 0, 1..3, and 4..9 respectively. The new level
- and strategy will take effect at the next call of deflate().
+ strategy is changed, and if there have been any deflate() calls since the
+ state was initialized or reset, then the input available so far is
+ compressed with the old level and strategy using deflate(strm, Z_BLOCK).
+ There are three approaches for the compression levels 0, 1..3, and 4..9
+ respectively. The new level and strategy will take effect at the next call
+ of deflate().
If a deflate(strm, Z_BLOCK) is performed by deflateParams(), and it does
not have enough output space to complete, then the parameter change will not
Modified: projects/runtime-coverage/etc/defaults/periodic.conf
==============================================================================
--- projects/runtime-coverage/etc/defaults/periodic.conf Sat Sep 16 02:41:38 2017 (r323635)
+++ projects/runtime-coverage/etc/defaults/periodic.conf Sat Sep 16 03:54:20 2017 (r323636)
@@ -181,9 +181,6 @@ weekly_locate_enable="YES" # Update locate weekly
# 320.whatis
weekly_whatis_enable="YES" # Update whatis weekly
-# 330.catman
-weekly_catman_enable="NO" # Preformat man pages
-
# 340.noid
weekly_noid_enable="NO" # Find unowned files
weekly_noid_dirs="/" # Look here
Modified: projects/runtime-coverage/etc/periodic/weekly/Makefile
==============================================================================
--- projects/runtime-coverage/etc/periodic/weekly/Makefile Sat Sep 16 02:41:38 2017 (r323635)
+++ projects/runtime-coverage/etc/periodic/weekly/Makefile Sat Sep 16 03:54:20 2017 (r323636)
@@ -13,7 +13,7 @@ FILES+= 310.locate
.endif
.if ${MK_MAN_UTILS} != "no"
-FILES+= 320.whatis 330.catman
+FILES+= 320.whatis
.endif
.include <bsd.prog.mk>
Modified: projects/runtime-coverage/gnu/usr.bin/binutils/libbfd/Makefile.amd64
==============================================================================
--- projects/runtime-coverage/gnu/usr.bin/binutils/libbfd/Makefile.amd64 Sat Sep 16 02:41:38 2017 (r323635)
+++ projects/runtime-coverage/gnu/usr.bin/binutils/libbfd/Makefile.amd64 Sat Sep 16 03:54:20 2017 (r323636)
@@ -9,7 +9,6 @@ DEFAULT_VECTOR= bfd_elf64_x86_64_freebsd_vec
SRCS+= elf64-x86-64.c \
efi-app-x86_64.c \
- efi-app-ia32.c \
elf64.c \
elf64-gen.c \
elf64-target.h \
Modified: projects/runtime-coverage/lib/libc/net/getaddrinfo.3
==============================================================================
--- projects/runtime-coverage/lib/libc/net/getaddrinfo.3 Sat Sep 16 02:41:38 2017 (r323635)
+++ projects/runtime-coverage/lib/libc/net/getaddrinfo.3 Sat Sep 16 03:54:20 2017 (r323636)
@@ -18,7 +18,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd December 21, 2015
+.Dd September 13, 2017
.Dt GETADDRINFO 3
.Os
.Sh NAME
@@ -351,6 +351,17 @@ pointer should be a
.Li addrinfo
structure created by a call to
.Fn getaddrinfo .
+.Sh IMPLEMENTATION NOTES
+The behavior of
+.Li freeadrinfo(NULL)
+is left unspecified by both
+.St -susv4
+and
+.Dv "RFC 3493" .
+The current implementation ignores a
+.Dv NULL
+argument for compatibility with programs that rely on the implementation
+details of other operating systems.
.Sh RETURN VALUES
.Fn getaddrinfo
returns zero on success or one of the error codes listed in
Modified: projects/runtime-coverage/lib/libc/net/getaddrinfo.c
==============================================================================
--- projects/runtime-coverage/lib/libc/net/getaddrinfo.c Sat Sep 16 02:41:38 2017 (r323635)
+++ projects/runtime-coverage/lib/libc/net/getaddrinfo.c Sat Sep 16 03:54:20 2017 (r323636)
@@ -35,7 +35,7 @@
* in the source code. This is because RFC2553 is silent about which error
* code must be returned for which situation.
* - freeaddrinfo(NULL). RFC2553 is silent about it. XNET 5.2 says it is
- * invalid. current code - SEGV on freeaddrinfo(NULL)
+ * invalid. Current code accepts NULL to be compatible with other OSes.
*
* Note:
* - The code filters out AFs that are not supported by the kernel,
@@ -359,14 +359,13 @@ freeaddrinfo(struct addrinfo *ai)
{
struct addrinfo *next;
- do {
+ while (ai != NULL) {
next = ai->ai_next;
- if (ai->ai_canonname)
- free(ai->ai_canonname);
+ free(ai->ai_canonname);
/* no need to free(ai->ai_addr) */
free(ai);
ai = next;
- } while (ai);
+ }
}
static int
Modified: projects/runtime-coverage/lib/libc/sys/open.2
==============================================================================
--- projects/runtime-coverage/lib/libc/sys/open.2 Sat Sep 16 02:41:38 2017 (r323635)
+++ projects/runtime-coverage/lib/libc/sys/open.2 Sat Sep 16 03:54:20 2017 (r323636)
@@ -28,7 +28,7 @@
.\" @(#)open.2 8.2 (Berkeley) 11/16/93
.\" $FreeBSD$
.\"
-.Dd November 22, 2016
+.Dd September 15, 2017
.Dt OPEN 2
.Os
.Sh NAME
@@ -487,7 +487,9 @@ is specified and the process is in capability mode.
was called and the process is in capability mode.
.It Bq Er ENOTCAPABLE
.Fa path
-is an absolute path or contained "..".
+is an absolute path or contained a ".." component leading to a
+directory outside of the directory hierarchy specified by
+.Fa fd .
.El
.Sh SEE ALSO
.Xr chmod 2 ,
Modified: projects/runtime-coverage/lib/libc/sys/ptrace.2
==============================================================================
--- projects/runtime-coverage/lib/libc/sys/ptrace.2 Sat Sep 16 02:41:38 2017 (r323635)
+++ projects/runtime-coverage/lib/libc/sys/ptrace.2 Sat Sep 16 03:54:20 2017 (r323636)
@@ -2,7 +2,7 @@
.\" $NetBSD: ptrace.2,v 1.2 1995/02/27 12:35:37 cgd Exp $
.\"
.\" This file is in the public domain.
-.Dd June 11, 2017
+.Dd September 14, 2017
.Dt PTRACE 2
.Os
.Sh NAME
@@ -762,6 +762,28 @@ The
.Fa data
argument is ignored.
.El
+.Sh ARM MACHINE-SPECIFIC REQUESTS
+.Bl -tag -width "Dv PT_SETVFPREGS"
+.It Dv PT_GETVFPREGS
+Return the thread's
+.Dv VFP
+machine state in the buffer pointed to by
+.Fa addr .
+.Pp
+The
+.Fa data
+argument is ignored.
+.It Dv PT_SETVFPREGS
+Set the thread's
+.Dv VFP
+machine state from the buffer pointed to by
+.Fa addr .
+.Pp
+The
+.Fa data
+argument is ignored.
+.El
+.Pp
.Sh x86 MACHINE-SPECIFIC REQUESTS
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-projects
mailing list