svn commit: r329608 - in user/jeff/numa: . bin/sh bin/uuidgen cddl/contrib/opensolaris/cmd/zdb cddl/contrib/opensolaris/cmd/ztest cddl/contrib/opensolaris/lib/libzfs/common cddl/contrib/opensolaris...

Jeff Roberson jeff at FreeBSD.org
Mon Feb 19 22:22:37 UTC 2018 

Author: jeff
Date: Mon Feb 19 22:22:35 2018
New Revision: 329608
URL: https://svnweb.freebsd.org/changeset/base/329608

Log:
  Merge from head
  > Description of fields to fill in above:                     76 columns --|
  > PR:                       If and which Problem Report is related.
  > Submitted by:             If someone else sent in the change.
  > Reported by:              If someone else reported the issue.
  > Reviewed by:              If someone else reviewed your modification.
  > Approved by:              If you needed approval for this commit.
  > Obtained from:            If the change is from a third party.
  > MFC after:                N [day[s]|week[s]|month[s]].  Request a reminder email.
  > MFH:                      Ports tree branch name.  Request approval for merge.
  > Relnotes:                 Set to 'yes' for mention in release notes.
  > Security:                 Vulnerability reference (one per line) or description.
  > Sponsored by:             If the change was sponsored by an organization.
  > Differential Revision:    https://reviews.freebsd.org/D### (*full* phabric URL needed).
  > Empty fields above will be automatically removed.
  
  _M   .
  MM   MAINTAINERS
  M    ObsoleteFiles.inc
  M    UPDATING
  M    bin/sh/var.c
  M    bin/uuidgen/uuidgen.c
  _M   cddl
  _M   cddl/contrib/opensolaris
  _M   cddl/contrib/opensolaris/cmd/zdb
  M    cddl/contrib/opensolaris/cmd/zdb/zdb.c
  A  + cddl/contrib/opensolaris/cmd/zdb/zdb.h
  M    cddl/contrib/opensolaris/cmd/zdb/zdb_il.c
  M    cddl/contrib/opensolaris/cmd/ztest/ztest.c
  _M   cddl/contrib/opensolaris/lib/libzfs
  M    cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c
  M    cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
  M    cddl/lib/libdtrace/errno.d
  M    cddl/lib/libdtrace/io.d
  M    cddl/lib/libdtrace/ip.d
  M    cddl/lib/libdtrace/libproc_compat.h
  M    cddl/lib/libdtrace/psinfo.d
  M    cddl/lib/libdtrace/regs_x86.d
  M    cddl/lib/libdtrace/sched.d
  M    cddl/lib/libdtrace/tcp.d
  M    cddl/lib/libdtrace/udp.d
  M    cddl/usr.sbin/zfsd/case_file.cc
  M    cddl/usr.sbin/zfsd/case_file.h
  M    cddl/usr.sbin/zfsd/zfsd.cc
  M    cddl/usr.sbin/zfsd/zfsd_event.cc
  M    cddl/usr.sbin/zfsd/zfsd_event.h
  _M   contrib/compiler-rt
  M    contrib/compiler-rt/lib/asan/asan_linux.cc
  _M   contrib/less
  M    contrib/less/NEWS
  M    contrib/less/README
  M    contrib/less/command.c
  M    contrib/less/help.c
  M    contrib/less/less.nro
  M    contrib/less/lessecho.nro
  M    contrib/less/lesskey.nro
  M    contrib/less/version.c
  _M   contrib/libc++
  _M   contrib/llvm
  M    contrib/llvm/include/llvm/IR/IntrinsicsAMDGPU.td
  M    contrib/llvm/include/llvm/IR/IntrinsicsX86.td
  A  + contrib/llvm/include/llvm/MC/MCAsmMacro.h
  M    contrib/llvm/include/llvm/MC/MCContext.h
  M    contrib/llvm/include/llvm/Support/GenericDomTreeConstruction.h
  M    contrib/llvm/lib/CodeGen/AsmPrinter/DebugHandlerBase.cpp
  M    contrib/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp
  M    contrib/llvm/lib/CodeGen/LivePhysRegs.cpp
  M    contrib/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
  M    contrib/llvm/lib/CodeGen/SplitKit.cpp
  M    contrib/llvm/lib/CodeGen/SplitKit.h
  M    contrib/llvm/lib/IR/AutoUpgrade.cpp
  M    contrib/llvm/lib/MC/MCParser/AsmParser.cpp
  M    contrib/llvm/lib/Target/AMDGPU/AMDGPUISelLowering.cpp
  M    contrib/llvm/lib/Target/AMDGPU/AMDGPUISelLowering.h
  M    contrib/llvm/lib/Target/AMDGPU/AMDGPUInstrInfo.cpp
  M    contrib/llvm/lib/Target/AMDGPU/AMDGPUInstrInfo.h
  M    contrib/llvm/lib/Target/AMDGPU/AMDGPUInstrInfo.td
  M    contrib/llvm/lib/Target/AMDGPU/AMDGPURegisterBankInfo.cpp
  M    contrib/llvm/lib/Target/AMDGPU/SIISelLowering.cpp
  M    contrib/llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp
  M    contrib/llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.h
  M    contrib/llvm/lib/Target/AMDGPU/VOP2Instructions.td
  M    contrib/llvm/lib/Target/X86/MCTargetDesc/X86MCCodeEmitter.cpp
  M    contrib/llvm/lib/Target/X86/X86AsmPrinter.cpp
  M    contrib/llvm/lib/Target/X86/X86DomainReassignment.cpp
  M    contrib/llvm/lib/Target/X86/X86ISelLowering.cpp
  M    contrib/llvm/lib/Target/X86/X86IntrinsicsInfo.h
  M    contrib/llvm/lib/Target/X86/X86RetpolineThunks.cpp
  M    contrib/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp
  _M   contrib/llvm/tools/clang
  M    contrib/llvm/tools/clang/include/clang/AST/DeclBase.h
  M    contrib/llvm/tools/clang/lib/AST/ASTContext.cpp
  M    contrib/llvm/tools/clang/lib/AST/DeclBase.cpp
  M    contrib/llvm/tools/clang/lib/AST/MicrosoftMangle.cpp
  M    contrib/llvm/tools/clang/lib/CodeGen/CodeGenModule.cpp
  M    contrib/llvm/tools/clang/lib/CodeGen/ItaniumCXXABI.cpp
  M    contrib/llvm/tools/clang/lib/Format/TokenAnnotator.cpp
  M    contrib/llvm/tools/clang/lib/Format/UnwrappedLineParser.cpp
  M    contrib/llvm/tools/clang/lib/Format/UnwrappedLineParser.h
  M    contrib/llvm/tools/clang/lib/Headers/avx512bwintrin.h
  M    contrib/llvm/tools/clang/lib/Headers/avx512fintrin.h
  M    contrib/llvm/tools/clang/lib/Lex/LiteralSupport.cpp
  M    contrib/llvm/tools/clang/lib/Sema/SemaChecking.cpp
  M    contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp
  M    contrib/llvm/tools/clang/lib/Sema/SemaInit.cpp
  _M   contrib/llvm/tools/lld
  M    contrib/llvm/tools/lld/COFF/PDB.cpp
  M    contrib/llvm/tools/lld/ELF/Driver.cpp
  M    contrib/llvm/tools/lld/ELF/InputFiles.cpp
  M    contrib/llvm/tools/lld/ELF/Options.td
  _M   contrib/llvm/tools/lldb
  M    contrib/llvm/tools/lldb/source/Plugins/Platform/NetBSD/PlatformNetBSD.cpp
  M    contrib/llvm/tools/lldb/source/Plugins/Process/NetBSD/NativeProcessNetBSD.cpp
  _M   contrib/netbsd-tests
  M    contrib/netbsd-tests/kernel/t_sysv.c
  M    contrib/netbsd-tests/lib/libc/sys/t_nanosleep.c
  M    etc/autofs/special_media
  M    etc/defaults/rc.conf
  M    etc/devd/Makefile
  A  + etc/devd/devmatch.conf
  D    etc/devd/usb.conf
  M    etc/mtree/BSD.root.dist
  M    etc/mtree/BSD.tests.dist
  M    etc/rc.d/Makefile
  A  + etc/rc.d/devmatch
  M    etc/rc.d/resolv
  M    include/varargs.h
  M    lib/clang/include/clang/Basic/Version.inc
  M    lib/clang/include/lld/Common/Version.inc
  M    lib/clang/include/llvm/Support/VCSRevision.h
  M    lib/libc/string/Makefile.inc
  M    lib/libc/string/memset.3
  M    lib/libcasper/libcasper/Makefile
  M    lib/libcasper/libcasper/libcasper.3
  M    lib/libcasper/libcasper/libcasper.c
  M    lib/libcasper/libcasper/libcasper.h
  M    lib/libcasper/libcasper/libcasper_impl.h
  M    lib/libcasper/libcasper/libcasper_service.c
  M    lib/libcasper/libcasper/libcasper_service.h
  M    lib/libcasper/libcasper/service.c
  M    lib/libcasper/services/cap_dns/Makefile
  M    lib/libcasper/services/cap_dns/cap_dns.c
  M    lib/libcasper/services/cap_grp/Makefile
  M    lib/libcasper/services/cap_grp/cap_grp.c
  M    lib/libcasper/services/cap_pwd/Makefile
  M    lib/libcasper/services/cap_pwd/cap_pwd.c
  M    lib/libcasper/services/cap_random/Makefile
  M    lib/libcasper/services/cap_random/cap_random.c
  M    lib/libcasper/services/cap_sysctl/Makefile
  M    lib/libcasper/services/cap_sysctl/cap_sysctl.c
  M    lib/libcasper/services/cap_syslog/Makefile
  M    lib/libcasper/services/cap_syslog/cap_syslog.c
  M    lib/libdevdctl/event.cc
  M    lib/libufs/sblock.c
  M    lib/msun/src/e_atan2.c
  M    release/arm64/PINE64.conf
  M    sbin/Makefile
  M    sbin/devd/devd.cc
  A  + sbin/devmatch
  M    sbin/dumpon/dumpon.8
  M    sbin/dumpon/dumpon.c
  M    sbin/ipfw/ipfw.8
  M    sbin/savecore/savecore.c
  M    share/man/man4/bnxt.4
  M    share/man/man4/ng_pppoe.4
  M    share/man/man5/core.5
  M    share/man/man5/rc.conf.5
  M    share/man/man9/DECLARE_MODULE.9
  M    share/man/man9/DRIVER_MODULE.9
  A  + share/man/man9/MODULE_PNP_INFO.9
  M    share/man/man9/Makefile
  M    share/man/man9/device_add_child.9
  M    share/man/man9/module.9
  M    share/man/man9/pci.9
  M    share/man/man9/pmap_enter.9
  M    share/man/man9/pmap_qenter.9
  A  + share/man/man9/style.lua.9
  M    share/misc/organization.dot
  M    share/misc/pci_vendors
  D    share/mk/bsd.stand.mk
  M    share/mk/src.opts.mk
  M    stand/Makefile
  M    stand/Makefile.amd64
  A  + stand/common/interp_lua.c
  A  + stand/common/metadata.c
  M    stand/defs.mk
  M    stand/efi/include/efidevp.h
  M    stand/efi/include/efilib.h
  M    stand/efi/libefi/efipart.c
  M    stand/efi/loader/main.c
  M    stand/fdt/Makefile
  M    stand/ficl/Makefile
  M    stand/geli/Makefile
  A  + stand/liblua
  A  + stand/liblua32
  M    stand/libsa/Makefile
  M    stand/libsa/arp.c
  M    stand/libsa/bootp.c
  M    stand/libsa/ip.c
  M    stand/libsa/net.c
  M    stand/libsa/net.h
  M    stand/libsa/rarp.c
  M    stand/libsa/rpc.c
  M    stand/libsa/tftp.c
  M    stand/libsa/ufs.c
  M    stand/loader.mk
  A  + stand/lua
  A  + stand/lua.mk
  M    stand/mips/beri/loader/Makefile
  M    stand/mips/beri/loader/exec.c
  M    stand/mips/beri/loader/loader.h
  D    stand/mips/beri/loader/metadata.c
  M    stand/mips/uboot/Makefile
  M    stand/powerpc/kboot/Makefile
  M    stand/powerpc/kboot/main.c
  D    stand/powerpc/kboot/metadata.c
  M    stand/powerpc/ofw/Makefile
  D    stand/powerpc/ofw/metadata.c
  M    stand/sparc64/loader/Makefile
  D    stand/sparc64/loader/metadata.c
  D    stand/uboot/common/metadata.c
  M    stand/uboot/fdt/Makefile
  M    stand/uboot/lib/Makefile
  M    stand/uboot/lib/elf_freebsd.c
  M    stand/uboot.mk
  M    stand/zfs/Makefile
  M    tests/sys/geom/class/Makefile
  M    tests/sys/geom/class/eli/Makefile
  A  + tests/sys/geom/class/eli/misc_test.sh
  A  + tests/sys/geom/class/part
  A  + tools/boot/lua-img.sh
  A  + tools/boot/lua-test.sh
  M    tools/boot/universe.sh
  A  + tools/build/options/WITH_LOADER_LUA
  D    tools/tools/bus_autoconf
  M    tools/tools/net80211/w00t/ap/ap.c
  M    usr.bin/ipcrm/ipcrm.c
  M    usr.bin/ipcs/ipc.c
  M    usr.bin/ipcs/ipc.h
  M    usr.bin/ipcs/ipcs.c
  M    usr.sbin/Makefile
  D    usr.sbin/devmatch
  M    usr.sbin/kldxref/kldxref.c
  M    usr.sbin/trpt/Makefile
  M    usr.sbin/trpt/trpt.8
  M    usr.sbin/trpt/trpt.c

Added:
  user/jeff/numa/cddl/contrib/opensolaris/cmd/zdb/zdb.h
     - copied unchanged from r329605, head/cddl/contrib/opensolaris/cmd/zdb/zdb.h
  user/jeff/numa/contrib/llvm/include/llvm/MC/MCAsmMacro.h
     - copied unchanged from r329605, head/contrib/llvm/include/llvm/MC/MCAsmMacro.h
  user/jeff/numa/etc/devd/devmatch.conf
     - copied unchanged from r329605, head/etc/devd/devmatch.conf
  user/jeff/numa/etc/rc.d/devmatch
     - copied unchanged from r329605, head/etc/rc.d/devmatch
  user/jeff/numa/sbin/devmatch/
     - copied from r329605, head/sbin/devmatch/
  user/jeff/numa/share/man/man9/MODULE_PNP_INFO.9
     - copied unchanged from r329605, head/share/man/man9/MODULE_PNP_INFO.9
  user/jeff/numa/share/man/man9/style.lua.9
     - copied unchanged from r329605, head/share/man/man9/style.lua.9
  user/jeff/numa/stand/common/interp_lua.c
     - copied unchanged from r329605, head/stand/common/interp_lua.c
  user/jeff/numa/stand/common/metadata.c
     - copied unchanged from r329605, head/stand/common/metadata.c
  user/jeff/numa/stand/liblua/
     - copied from r329605, head/stand/liblua/
  user/jeff/numa/stand/liblua32/
     - copied from r329605, head/stand/liblua32/
  user/jeff/numa/stand/lua/
     - copied from r329605, head/stand/lua/
  user/jeff/numa/stand/lua.mk
     - copied unchanged from r329605, head/stand/lua.mk
  user/jeff/numa/tests/sys/geom/class/eli/misc_test.sh
     - copied unchanged from r329605, head/tests/sys/geom/class/eli/misc_test.sh
  user/jeff/numa/tests/sys/geom/class/part/
     - copied from r329605, head/tests/sys/geom/class/part/
  user/jeff/numa/tools/boot/lua-img.sh
     - copied unchanged from r329605, head/tools/boot/lua-img.sh
  user/jeff/numa/tools/boot/lua-test.sh
     - copied unchanged from r329605, head/tools/boot/lua-test.sh
  user/jeff/numa/tools/build/options/WITH_LOADER_LUA
     - copied unchanged from r329605, head/tools/build/options/WITH_LOADER_LUA
Deleted:
  user/jeff/numa/etc/devd/usb.conf
  user/jeff/numa/share/mk/bsd.stand.mk
  user/jeff/numa/stand/mips/beri/loader/metadata.c
  user/jeff/numa/stand/powerpc/kboot/metadata.c
  user/jeff/numa/stand/powerpc/ofw/metadata.c
  user/jeff/numa/stand/sparc64/loader/metadata.c
  user/jeff/numa/stand/uboot/common/metadata.c
  user/jeff/numa/tools/tools/bus_autoconf/
  user/jeff/numa/usr.sbin/devmatch/
Modified:
  user/jeff/numa/MAINTAINERS   (contents, props changed)
  user/jeff/numa/ObsoleteFiles.inc
  user/jeff/numa/UPDATING
  user/jeff/numa/bin/sh/var.c
  user/jeff/numa/bin/uuidgen/uuidgen.c
  user/jeff/numa/cddl/contrib/opensolaris/cmd/zdb/zdb.c
  user/jeff/numa/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c
  user/jeff/numa/cddl/contrib/opensolaris/cmd/ztest/ztest.c
  user/jeff/numa/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c
  user/jeff/numa/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
  user/jeff/numa/cddl/lib/libdtrace/errno.d
  user/jeff/numa/cddl/lib/libdtrace/io.d
  user/jeff/numa/cddl/lib/libdtrace/ip.d
  user/jeff/numa/cddl/lib/libdtrace/libproc_compat.h
  user/jeff/numa/cddl/lib/libdtrace/psinfo.d
  user/jeff/numa/cddl/lib/libdtrace/regs_x86.d
  user/jeff/numa/cddl/lib/libdtrace/sched.d
  user/jeff/numa/cddl/lib/libdtrace/tcp.d
  user/jeff/numa/cddl/lib/libdtrace/udp.d
  user/jeff/numa/cddl/usr.sbin/zfsd/case_file.cc
  user/jeff/numa/cddl/usr.sbin/zfsd/case_file.h
  user/jeff/numa/cddl/usr.sbin/zfsd/zfsd.cc
  user/jeff/numa/cddl/usr.sbin/zfsd/zfsd_event.cc
  user/jeff/numa/cddl/usr.sbin/zfsd/zfsd_event.h
  user/jeff/numa/contrib/compiler-rt/lib/asan/asan_linux.cc
  user/jeff/numa/contrib/less/NEWS
  user/jeff/numa/contrib/less/README
  user/jeff/numa/contrib/less/command.c
  user/jeff/numa/contrib/less/help.c
  user/jeff/numa/contrib/less/less.nro
  user/jeff/numa/contrib/less/lessecho.nro
  user/jeff/numa/contrib/less/lesskey.nro
  user/jeff/numa/contrib/less/version.c
  user/jeff/numa/contrib/llvm/include/llvm/IR/IntrinsicsAMDGPU.td
  user/jeff/numa/contrib/llvm/include/llvm/IR/IntrinsicsX86.td
  user/jeff/numa/contrib/llvm/include/llvm/MC/MCContext.h
  user/jeff/numa/contrib/llvm/include/llvm/Support/GenericDomTreeConstruction.h
  user/jeff/numa/contrib/llvm/lib/CodeGen/AsmPrinter/DebugHandlerBase.cpp
  user/jeff/numa/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp
  user/jeff/numa/contrib/llvm/lib/CodeGen/LivePhysRegs.cpp
  user/jeff/numa/contrib/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
  user/jeff/numa/contrib/llvm/lib/CodeGen/SplitKit.cpp
  user/jeff/numa/contrib/llvm/lib/CodeGen/SplitKit.h
  user/jeff/numa/contrib/llvm/lib/IR/AutoUpgrade.cpp
  user/jeff/numa/contrib/llvm/lib/MC/MCParser/AsmParser.cpp
  user/jeff/numa/contrib/llvm/lib/Target/AMDGPU/AMDGPUISelLowering.cpp
  user/jeff/numa/contrib/llvm/lib/Target/AMDGPU/AMDGPUISelLowering.h
  user/jeff/numa/contrib/llvm/lib/Target/AMDGPU/AMDGPUInstrInfo.cpp
  user/jeff/numa/contrib/llvm/lib/Target/AMDGPU/AMDGPUInstrInfo.h
  user/jeff/numa/contrib/llvm/lib/Target/AMDGPU/AMDGPUInstrInfo.td
  user/jeff/numa/contrib/llvm/lib/Target/AMDGPU/AMDGPURegisterBankInfo.cpp
  user/jeff/numa/contrib/llvm/lib/Target/AMDGPU/SIISelLowering.cpp
  user/jeff/numa/contrib/llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp
  user/jeff/numa/contrib/llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.h
  user/jeff/numa/contrib/llvm/lib/Target/AMDGPU/VOP2Instructions.td
  user/jeff/numa/contrib/llvm/lib/Target/X86/MCTargetDesc/X86MCCodeEmitter.cpp
  user/jeff/numa/contrib/llvm/lib/Target/X86/X86AsmPrinter.cpp
  user/jeff/numa/contrib/llvm/lib/Target/X86/X86DomainReassignment.cpp
  user/jeff/numa/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp
  user/jeff/numa/contrib/llvm/lib/Target/X86/X86IntrinsicsInfo.h
  user/jeff/numa/contrib/llvm/lib/Target/X86/X86RetpolineThunks.cpp
  user/jeff/numa/contrib/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp
  user/jeff/numa/contrib/llvm/tools/clang/include/clang/AST/DeclBase.h
  user/jeff/numa/contrib/llvm/tools/clang/lib/AST/ASTContext.cpp
  user/jeff/numa/contrib/llvm/tools/clang/lib/AST/DeclBase.cpp
  user/jeff/numa/contrib/llvm/tools/clang/lib/AST/MicrosoftMangle.cpp
  user/jeff/numa/contrib/llvm/tools/clang/lib/CodeGen/CodeGenModule.cpp
  user/jeff/numa/contrib/llvm/tools/clang/lib/CodeGen/ItaniumCXXABI.cpp
  user/jeff/numa/contrib/llvm/tools/clang/lib/Format/TokenAnnotator.cpp
  user/jeff/numa/contrib/llvm/tools/clang/lib/Format/UnwrappedLineParser.cpp
  user/jeff/numa/contrib/llvm/tools/clang/lib/Format/UnwrappedLineParser.h
  user/jeff/numa/contrib/llvm/tools/clang/lib/Headers/avx512bwintrin.h
  user/jeff/numa/contrib/llvm/tools/clang/lib/Headers/avx512fintrin.h
  user/jeff/numa/contrib/llvm/tools/clang/lib/Lex/LiteralSupport.cpp
  user/jeff/numa/contrib/llvm/tools/clang/lib/Sema/SemaChecking.cpp
  user/jeff/numa/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp
  user/jeff/numa/contrib/llvm/tools/clang/lib/Sema/SemaInit.cpp
  user/jeff/numa/contrib/llvm/tools/lld/COFF/PDB.cpp
  user/jeff/numa/contrib/llvm/tools/lld/ELF/Driver.cpp
  user/jeff/numa/contrib/llvm/tools/lld/ELF/InputFiles.cpp
  user/jeff/numa/contrib/llvm/tools/lld/ELF/Options.td
  user/jeff/numa/contrib/llvm/tools/lldb/source/Plugins/Platform/NetBSD/PlatformNetBSD.cpp
  user/jeff/numa/contrib/llvm/tools/lldb/source/Plugins/Process/NetBSD/NativeProcessNetBSD.cpp
  user/jeff/numa/contrib/netbsd-tests/kernel/t_sysv.c
  user/jeff/numa/contrib/netbsd-tests/lib/libc/sys/t_nanosleep.c
  user/jeff/numa/etc/autofs/special_media
  user/jeff/numa/etc/defaults/rc.conf
  user/jeff/numa/etc/devd/Makefile
  user/jeff/numa/etc/mtree/BSD.root.dist
  user/jeff/numa/etc/mtree/BSD.tests.dist
  user/jeff/numa/etc/rc.d/Makefile
  user/jeff/numa/etc/rc.d/resolv
  user/jeff/numa/include/varargs.h
  user/jeff/numa/lib/clang/include/clang/Basic/Version.inc
  user/jeff/numa/lib/clang/include/lld/Common/Version.inc
  user/jeff/numa/lib/clang/include/llvm/Support/VCSRevision.h
  user/jeff/numa/lib/libc/string/Makefile.inc
  user/jeff/numa/lib/libc/string/memset.3
  user/jeff/numa/lib/libcasper/libcasper/Makefile
  user/jeff/numa/lib/libcasper/libcasper/libcasper.3
  user/jeff/numa/lib/libcasper/libcasper/libcasper.c
  user/jeff/numa/lib/libcasper/libcasper/libcasper.h
  user/jeff/numa/lib/libcasper/libcasper/libcasper_impl.h
  user/jeff/numa/lib/libcasper/libcasper/libcasper_service.c
  user/jeff/numa/lib/libcasper/libcasper/libcasper_service.h
  user/jeff/numa/lib/libcasper/libcasper/service.c
  user/jeff/numa/lib/libcasper/services/cap_dns/Makefile
  user/jeff/numa/lib/libcasper/services/cap_dns/cap_dns.c
  user/jeff/numa/lib/libcasper/services/cap_grp/Makefile
  user/jeff/numa/lib/libcasper/services/cap_grp/cap_grp.c
  user/jeff/numa/lib/libcasper/services/cap_pwd/Makefile
  user/jeff/numa/lib/libcasper/services/cap_pwd/cap_pwd.c
  user/jeff/numa/lib/libcasper/services/cap_random/Makefile
  user/jeff/numa/lib/libcasper/services/cap_random/cap_random.c
  user/jeff/numa/lib/libcasper/services/cap_sysctl/Makefile
  user/jeff/numa/lib/libcasper/services/cap_sysctl/cap_sysctl.c
  user/jeff/numa/lib/libcasper/services/cap_syslog/Makefile
  user/jeff/numa/lib/libcasper/services/cap_syslog/cap_syslog.c
  user/jeff/numa/lib/libdevdctl/event.cc
  user/jeff/numa/lib/libufs/sblock.c
  user/jeff/numa/lib/msun/src/e_atan2.c
  user/jeff/numa/release/arm64/PINE64.conf
  user/jeff/numa/sbin/Makefile
  user/jeff/numa/sbin/devd/devd.cc
  user/jeff/numa/sbin/dumpon/dumpon.8
  user/jeff/numa/sbin/dumpon/dumpon.c
  user/jeff/numa/sbin/ipfw/ipfw.8
  user/jeff/numa/sbin/savecore/savecore.c
  user/jeff/numa/share/man/man4/bnxt.4
  user/jeff/numa/share/man/man4/ng_pppoe.4
  user/jeff/numa/share/man/man5/core.5
  user/jeff/numa/share/man/man5/rc.conf.5
  user/jeff/numa/share/man/man9/DECLARE_MODULE.9
  user/jeff/numa/share/man/man9/DRIVER_MODULE.9
  user/jeff/numa/share/man/man9/Makefile
  user/jeff/numa/share/man/man9/device_add_child.9
  user/jeff/numa/share/man/man9/module.9
  user/jeff/numa/share/man/man9/pci.9
  user/jeff/numa/share/man/man9/pmap_enter.9
  user/jeff/numa/share/man/man9/pmap_qenter.9
  user/jeff/numa/share/misc/organization.dot
  user/jeff/numa/share/misc/pci_vendors
  user/jeff/numa/share/mk/src.opts.mk
  user/jeff/numa/stand/Makefile
  user/jeff/numa/stand/Makefile.amd64
  user/jeff/numa/stand/defs.mk
  user/jeff/numa/stand/efi/include/efidevp.h
  user/jeff/numa/stand/efi/include/efilib.h
  user/jeff/numa/stand/efi/libefi/efipart.c
  user/jeff/numa/stand/efi/loader/main.c
  user/jeff/numa/stand/fdt/Makefile
  user/jeff/numa/stand/ficl/Makefile
  user/jeff/numa/stand/geli/Makefile
  user/jeff/numa/stand/libsa/Makefile
  user/jeff/numa/stand/libsa/arp.c
  user/jeff/numa/stand/libsa/bootp.c
  user/jeff/numa/stand/libsa/ip.c
  user/jeff/numa/stand/libsa/net.c
  user/jeff/numa/stand/libsa/net.h
  user/jeff/numa/stand/libsa/rarp.c
  user/jeff/numa/stand/libsa/rpc.c
  user/jeff/numa/stand/libsa/tftp.c
  user/jeff/numa/stand/libsa/ufs.c
  user/jeff/numa/stand/loader.mk
  user/jeff/numa/stand/mips/beri/loader/Makefile
  user/jeff/numa/stand/mips/beri/loader/exec.c
  user/jeff/numa/stand/mips/beri/loader/loader.h
  user/jeff/numa/stand/mips/uboot/Makefile
  user/jeff/numa/stand/powerpc/kboot/Makefile
  user/jeff/numa/stand/powerpc/kboot/main.c
  user/jeff/numa/stand/powerpc/ofw/Makefile
  user/jeff/numa/stand/sparc64/loader/Makefile
  user/jeff/numa/stand/uboot.mk
  user/jeff/numa/stand/uboot/fdt/Makefile
  user/jeff/numa/stand/uboot/lib/Makefile
  user/jeff/numa/stand/uboot/lib/elf_freebsd.c
  user/jeff/numa/stand/zfs/Makefile
  user/jeff/numa/tests/sys/geom/class/Makefile
  user/jeff/numa/tests/sys/geom/class/eli/Makefile
  user/jeff/numa/tools/boot/universe.sh
  user/jeff/numa/tools/tools/net80211/w00t/ap/ap.c
  user/jeff/numa/usr.bin/ipcrm/ipcrm.c
  user/jeff/numa/usr.bin/ipcs/ipc.c
  user/jeff/numa/usr.bin/ipcs/ipc.h
  user/jeff/numa/usr.bin/ipcs/ipcs.c
  user/jeff/numa/usr.sbin/Makefile
  user/jeff/numa/usr.sbin/kldxref/kldxref.c
  user/jeff/numa/usr.sbin/trpt/Makefile
  user/jeff/numa/usr.sbin/trpt/trpt.8
  user/jeff/numa/usr.sbin/trpt/trpt.c
Directory Properties:
  user/jeff/numa/   (props changed)
  user/jeff/numa/cddl/   (props changed)
  user/jeff/numa/cddl/contrib/opensolaris/   (props changed)
  user/jeff/numa/cddl/contrib/opensolaris/cmd/zdb/   (props changed)
  user/jeff/numa/cddl/contrib/opensolaris/lib/libzfs/   (props changed)
  user/jeff/numa/contrib/compiler-rt/   (props changed)
  user/jeff/numa/contrib/less/   (props changed)
  user/jeff/numa/contrib/libc++/   (props changed)
  user/jeff/numa/contrib/llvm/   (props changed)
  user/jeff/numa/contrib/llvm/tools/clang/   (props changed)
  user/jeff/numa/contrib/llvm/tools/lld/   (props changed)
  user/jeff/numa/contrib/llvm/tools/lldb/   (props changed)
  user/jeff/numa/contrib/netbsd-tests/   (props changed)

Modified: user/jeff/numa/MAINTAINERS
==============================================================================
--- user/jeff/numa/MAINTAINERS	Mon Feb 19 22:19:44 2018	(r329607)
+++ user/jeff/numa/MAINTAINERS	Mon Feb 19 22:22:35 2018	(r329608)
@@ -65,7 +65,6 @@ lpr		gad	Pre-commit review requested, particularly for
 nanobsd		imp	Pre-commit phabricator review requested.
 net80211	adrian	Pre-commit review requested, send to freebsd-wireless at freebsd.org
 nfs		freebsd-fs at FreeBSD.org, rmacklem is best for reviews.
-nis(8), yp(8)	araujo	Pre-commit review requested.
 nvd(4)		jimharris	Pre-commit review requested.
 nvme(4)		jimharris	Pre-commit review requested.
 nvmecontrol(8)	jimharris	Pre-commit review requested.
@@ -93,8 +92,11 @@ sys/dev/ixgbe	erj	Pre-commit phabricator review reques
 sys/dev/ixl	erj	Pre-commit phabricator review requested.
 sys/dev/sound/usb	hselasky	If in doubt, ask.
 sys/dev/usb	hselasky	If in doubt, ask.
+sys/dev/xen	royger		Pre-commit review recommended.
 sys/netinet/ip_carp.c	glebius	Pre-commit review recommended.
 sys/netpfil/pf	kp,glebius	Pre-commit review recommended.
+sys/x86/xen	royger		Pre-commit review recommended.
+sys/xen		royger		Pre-commit review recommended.
 tests			freebsd-testing,ngie	Pre-commit review requested.
 usr.sbin/bsdconfig	dteske	Pre-commit phabricator review requested.
 usr.sbin/dpv	dteske	Pre-commit review requested. Keep in sync with libdpv.

Modified: user/jeff/numa/ObsoleteFiles.inc
==============================================================================
--- user/jeff/numa/ObsoleteFiles.inc	Mon Feb 19 22:19:44 2018	(r329607)
+++ user/jeff/numa/ObsoleteFiles.inc	Mon Feb 19 22:22:35 2018	(r329608)
@@ -38,6 +38,10 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20180212: move devmatch
+OLD_FILES+=usr/sbin/devmatch
+# 20180211: remove usb.conf
+OLD_FILES+=etc/devd/usb.conf
 # 20180208: remove c_rehash(1)
 OLD_FILES+=usr/share/openssl/man/man1/c_rehash.1.gz
 # 20180206: remove gdbtui

Modified: user/jeff/numa/UPDATING
==============================================================================
--- user/jeff/numa/UPDATING	Mon Feb 19 22:19:44 2018	(r329607)
+++ user/jeff/numa/UPDATING	Mon Feb 19 22:22:35 2018	(r329608)
@@ -51,6 +51,19 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW:
 
 ****************************** SPECIAL WARNING: ******************************
 
+20180212:
+	FreeBSD boot loader enhanced with Lua scripting. It's purely opt-in for
+	now by building WITH_LOADER_LUA and WITHOUT_FORTH in /etc/src.conf.
+	Co-existance for the transition period will come shortly. Booting is a
+	complex environment and test coverage for Lua-enabled loaders has been
+	thin, so it would be prudent to assume it might not work and make
+	provisions for backup boot methods.
+
+20180211:
+	devmatch functionality has been turned on in devd. It will automatically
+	load drivers for unattached devices. This may cause unexpected drivers to
+	be loaded. Please report any problems to current@ and imp at freebsd.org.
+
 20180114:
 	Clang, llvm, lld, lldb, compiler-rt and libc++ have been upgraded to
 	6.0.0.  Please see the 20141231 entry below for information about

Modified: user/jeff/numa/bin/sh/var.c
==============================================================================
--- user/jeff/numa/bin/sh/var.c	Mon Feb 19 22:19:44 2018	(r329607)
+++ user/jeff/numa/bin/sh/var.c	Mon Feb 19 22:22:35 2018	(r329608)
@@ -71,7 +71,9 @@ __FBSDID("$FreeBSD$");
 #endif
 
 
+#ifndef VTABSIZE
 #define VTABSIZE 39
+#endif
 
 
 struct varinit {

Modified: user/jeff/numa/bin/uuidgen/uuidgen.c
==============================================================================
--- user/jeff/numa/bin/uuidgen/uuidgen.c	Mon Feb 19 22:19:44 2018	(r329607)
+++ user/jeff/numa/bin/uuidgen/uuidgen.c	Mon Feb 19 22:22:35 2018	(r329608)
@@ -28,6 +28,9 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include <sys/capsicum.h>
+
+#include <capsicum_helpers.h>
 #include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -79,6 +82,12 @@ main(int argc, char *argv[])
 
 	if (argc)
 		usage();
+
+	caph_cache_catpages();
+	if (caph_limit_stdio() < 0)
+		err(1, "Unable to limit stdio");
+	if (cap_enter() < 0 && errno != ENOSYS)
+		err(1, "Unable to enter capability mode");
 
 	if (count == -1)
 		count = 1;

Modified: user/jeff/numa/cddl/contrib/opensolaris/cmd/zdb/zdb.c
==============================================================================
--- user/jeff/numa/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Mon Feb 19 22:19:44 2018	(r329607)
+++ user/jeff/numa/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Mon Feb 19 22:22:35 2018	(r329608)
@@ -67,6 +67,8 @@
 #undef verify
 #include <libzfs.h>
 
+#include "zdb.h"
+
 #define	ZDB_COMPRESS_NAME(idx) ((idx) < ZIO_COMPRESS_FUNCTIONS ?	\
 	zio_compress_table[(idx)].ci_name : "UNKNOWN")
 #define	ZDB_CHECKSUM_NAME(idx) ((idx) < ZIO_CHECKSUM_FUNCTIONS ?	\
@@ -90,14 +92,13 @@ uint64_t zfs_arc_max, zfs_arc_meta_limit;
 int zfs_vdev_async_read_max_active;
 #endif
 
-const char cmdname[] = "zdb";
+static const char cmdname[] = "zdb";
 uint8_t dump_opt[256];
 
 typedef void object_viewer_t(objset_t *, uint64_t, void *data, size_t size);
 
-extern void dump_intent_log(zilog_t *);
 static uint64_t *zopt_object = NULL;
-static int zopt_objects = 0;
+static unsigned zopt_objects = 0;
 static libzfs_handle_t *g_zfs;
 static uint64_t max_inflight = 1000;
 
@@ -285,8 +286,8 @@ zdb_nicenum(uint64_t num, char *buf, size_t buflen)
 		nicenum(num, buf, sizeof (buf));
 }
 
-const char histo_stars[] = "****************************************";
-const int histo_width = sizeof (histo_stars) - 1;
+static const char histo_stars[] = "****************************************";
+static const uint64_t histo_width = sizeof (histo_stars) - 1;
 
 static void
 dump_histogram(const uint64_t *histo, int size, int offset)
@@ -392,7 +393,7 @@ dump_unknown(objset_t *os, uint64_t object, void *data
 }
 
 /*ARGSUSED*/
-void
+static void
 dump_uint8(objset_t *os, uint64_t object, void *data, size_t size)
 {
 }
@@ -410,7 +411,7 @@ dump_zap(objset_t *os, uint64_t object, void *data, si
 	zap_cursor_t zc;
 	zap_attribute_t attr;
 	void *prop;
-	int i;
+	unsigned i;
 
 	dump_zap_stats(os, object);
 	(void) printf("\n");
@@ -573,7 +574,7 @@ dump_sa_layouts(objset_t *os, uint64_t object, void *d
 	zap_cursor_t zc;
 	zap_attribute_t attr;
 	uint16_t *layout_attrs;
-	int i;
+	unsigned i;
 
 	dump_zap_stats(os, object);
 	(void) printf("\n");
@@ -642,7 +643,7 @@ dump_zpldir(objset_t *os, uint64_t object, void *data,
 	zap_cursor_fini(&zc);
 }
 
-int
+static int
 get_dtl_refcount(vdev_t *vd)
 {
 	int refcount = 0;
@@ -656,18 +657,18 @@ get_dtl_refcount(vdev_t *vd)
 		return (0);
 	}
 
-	for (int c = 0; c < vd->vdev_children; c++)
+	for (unsigned c = 0; c < vd->vdev_children; c++)
 		refcount += get_dtl_refcount(vd->vdev_child[c]);
 	return (refcount);
 }
 
-int
+static int
 get_metaslab_refcount(vdev_t *vd)
 {
 	int refcount = 0;
 
 	if (vd->vdev_top == vd && !vd->vdev_removing) {
-		for (int m = 0; m < vd->vdev_ms_count; m++) {
+		for (unsigned m = 0; m < vd->vdev_ms_count; m++) {
 			space_map_t *sm = vd->vdev_ms[m]->ms_sm;
 
 			if (sm != NULL &&
@@ -675,7 +676,7 @@ get_metaslab_refcount(vdev_t *vd)
 				refcount++;
 		}
 	}
-	for (int c = 0; c < vd->vdev_children; c++)
+	for (unsigned c = 0; c < vd->vdev_children; c++)
 		refcount += get_metaslab_refcount(vd->vdev_child[c]);
 
 	return (refcount);
@@ -707,7 +708,7 @@ static void
 dump_spacemap(objset_t *os, space_map_t *sm)
 {
 	uint64_t alloc, offset, entry;
-	char *ddata[] = { "ALLOC", "FREE", "CONDENSE", "INVALID",
+	const char *ddata[] = { "ALLOC", "FREE", "CONDENSE", "INVALID",
 			    "INVALID", "INVALID", "INVALID", "INVALID" };
 
 	if (sm == NULL)
@@ -844,7 +845,7 @@ dump_metaslab_groups(spa_t *spa)
 
 	metaslab_class_histogram_verify(mc);
 
-	for (int c = 0; c < rvd->vdev_children; c++) {
+	for (unsigned c = 0; c < rvd->vdev_children; c++) {
 		vdev_t *tvd = rvd->vdev_child[c];
 		metaslab_group_t *mg = tvd->vdev_mg;
 
@@ -923,7 +924,7 @@ dump_dde(const ddt_t *ddt, const ddt_entry_t *dde, uin
 {
 	const ddt_phys_t *ddp = dde->dde_phys;
 	const ddt_key_t *ddk = &dde->dde_key;
-	char *types[4] = { "ditto", "single", "double", "triple" };
+	const char *types[4] = { "ditto", "single", "double", "triple" };
 	char blkbuf[BP_SPRINTF_LEN];
 	blkptr_t blk;
 
@@ -1016,9 +1017,12 @@ dump_ddt(ddt_t *ddt, enum ddt_type type, enum ddt_clas
 static void
 dump_all_ddts(spa_t *spa)
 {
-	ddt_histogram_t ddh_total = { 0 };
-	ddt_stat_t dds_total = { 0 };
+	ddt_histogram_t ddh_total;
+	ddt_stat_t dds_total;
 
+	bzero(&ddh_total, sizeof (ddh_total));
+	bzero(&dds_total, sizeof (dds_total));
+
 	for (enum zio_checksum c = 0; c < ZIO_CHECKSUM_FUNCTIONS; c++) {
 		ddt_t *ddt = spa->spa_ddt[c];
 		for (enum ddt_type type = 0; type < DDT_TYPES; type++) {
@@ -1064,7 +1068,8 @@ dump_dtl(vdev_t *vd, int indent)
 {
 	spa_t *spa = vd->vdev_spa;
 	boolean_t required;
-	char *name[DTL_TYPES] = { "missing", "partial", "scrub", "outage" };
+	const char *name[DTL_TYPES] = { "missing", "partial", "scrub",
+		"outage" };
 	char prefix[256];
 
 	spa_vdev_state_enter(spa, SCL_NONE);
@@ -1092,7 +1097,7 @@ dump_dtl(vdev_t *vd, int indent)
 			dump_spacemap(spa->spa_meta_objset, vd->vdev_dtl_sm);
 	}
 
-	for (int c = 0; c < vd->vdev_children; c++)
+	for (unsigned c = 0; c < vd->vdev_children; c++)
 		dump_dtl(vd->vdev_child[c], indent + 4);
 }
 
@@ -1150,7 +1155,7 @@ dump_history(spa_t *spa)
 	free(buf);
 
 	(void) printf("\nHistory:\n");
-	for (int i = 0; i < num; i++) {
+	for (unsigned i = 0; i < num; i++) {
 		uint64_t time, txg, ievent;
 		char *cmd, *intstr;
 		boolean_t printed = B_FALSE;
@@ -1172,8 +1177,8 @@ dump_history(spa_t *spa)
 
 			(void) snprintf(internalstr,
 			    sizeof (internalstr),
-			    "[internal %s txg:%lld] %s",
-			    zfs_history_event_names[ievent], txg,
+			    "[internal %s txg:%ju] %s",
+			    zfs_history_event_names[ievent], (uintmax_t)txg,
 			    intstr);
 			cmd = internalstr;
 		}
@@ -1490,7 +1495,7 @@ dump_bptree_cb(void *arg, const blkptr_t *bp, dmu_tx_t
 }
 
 static void
-dump_bptree(objset_t *os, uint64_t obj, char *name)
+dump_bptree(objset_t *os, uint64_t obj, const char *name)
 {
 	char bytes[32];
 	bptree_phys_t *bt;
@@ -1530,7 +1535,7 @@ dump_bpobj_cb(void *arg, const blkptr_t *bp, dmu_tx_t 
 }
 
 static void
-dump_full_bpobj(bpobj_t *bpo, char *name, int indent)
+dump_full_bpobj(bpobj_t *bpo, const char *name, int indent)
 {
 	char bytes[32];
 	char comp[32];
@@ -2034,7 +2039,7 @@ dump_object(objset_t *os, uint64_t object, int verbosi
 		dmu_buf_rele(db, FTAG);
 }
 
-static char *objset_types[DMU_OST_NUMTYPES] = {
+static const char *objset_types[DMU_OST_NUMTYPES] = {
 	"NONE", "META", "ZPL", "ZVOL", "OTHER", "ANY" };
 
 static void
@@ -2046,10 +2051,11 @@ dump_dir(objset_t *os)
 	char numbuf[32];
 	char blkbuf[BP_SPRINTF_LEN + 20];
 	char osname[ZFS_MAX_DATASET_NAME_LEN];
-	char *type = "UNKNOWN";
+	const char *type = "UNKNOWN";
 	int verbosity = dump_opt['d'];
 	int print_header = 1;
-	int i, error;
+	unsigned i;
+	int error;
 
 	/* make sure nicenum has enough space */
 	CTASSERT(sizeof (numbuf) >= NN_NUMBUF_SZ);
@@ -2139,7 +2145,7 @@ dump_uberblock(uberblock_t *ub, const char *header, co
 {
 	time_t timestamp = ub->ub_timestamp;
 
-	(void) printf(header ? header : "");
+	(void) printf("%s", header ? header : "");
 	(void) printf("\tmagic = %016llx\n", (u_longlong_t)ub->ub_magic);
 	(void) printf("\tversion = %llu\n", (u_longlong_t)ub->ub_version);
 	(void) printf("\ttxg = %llu\n", (u_longlong_t)ub->ub_txg);
@@ -2151,7 +2157,7 @@ dump_uberblock(uberblock_t *ub, const char *header, co
 		snprintf_blkptr(blkbuf, sizeof (blkbuf), &ub->ub_rootbp);
 		(void) printf("\trootbp = %s\n", blkbuf);
 	}
-	(void) printf(footer ? footer : "");
+	(void) printf("%s", footer ? footer : "");
 }
 
 static void
@@ -2494,7 +2500,7 @@ typedef struct zdb_blkstats {
 #define	ZDB_OT_OTHER	(DMU_OT_NUMTYPES + 2)
 #define	ZDB_OT_TOTAL	(DMU_OT_NUMTYPES + 3)
 
-static char *zdb_ot_extname[] = {
+static const char *zdb_ot_extname[] = {
 	"deferred free",
 	"dedup ditto",
 	"other",
@@ -2511,7 +2517,7 @@ typedef struct zdb_cb {
 	uint64_t	zcb_embedded_histogram[NUM_BP_EMBEDDED_TYPES]
 	    [BPE_PAYLOAD_SIZE];
 	uint64_t	zcb_start;
-	uint64_t	zcb_lastprint;
+	hrtime_t	zcb_lastprint;
 	uint64_t	zcb_totalasize;
 	uint64_t	zcb_errors[256];
 	int		zcb_readfails;
@@ -2546,7 +2552,7 @@ zdb_count_block(zdb_cb_t *zcb, zilog_t *zilog, const b
 		 * SPA_OLD_MAXBLOCKSIZE; larger blocks go into the last,
 		 * "other", bucket.
 		 */
-		int idx = BP_GET_PSIZE(bp) >> SPA_MINBLOCKSHIFT;
+		unsigned idx = BP_GET_PSIZE(bp) >> SPA_MINBLOCKSHIFT;
 		idx = MIN(idx, SPA_OLD_MAXBLOCKSIZE / SPA_MINBLOCKSIZE + 1);
 		zb->zb_psize_histogram[idx]++;
 
@@ -2753,10 +2759,11 @@ static metaslab_ops_t zdb_metaslab_ops = {
 static void
 zdb_ddt_leak_init(spa_t *spa, zdb_cb_t *zcb)
 {
-	ddt_bookmark_t ddb = { 0 };
+	ddt_bookmark_t ddb;
 	ddt_entry_t dde;
 	int error;
 
+	bzero(&ddb, sizeof (ddb));
 	while ((error = ddt_walk(spa, &ddb, &dde)) == 0) {
 		blkptr_t blk;
 		ddt_phys_t *ddp = dde.dde_phys;
@@ -2864,10 +2871,10 @@ zdb_leak_fini(spa_t *spa)
 {
 	if (!dump_opt['L']) {
 		vdev_t *rvd = spa->spa_root_vdev;
-		for (int c = 0; c < rvd->vdev_children; c++) {
+		for (unsigned c = 0; c < rvd->vdev_children; c++) {
 			vdev_t *vd = rvd->vdev_child[c];
 			metaslab_group_t *mg = vd->vdev_mg;
-			for (int m = 0; m < vd->vdev_ms_count; m++) {
+			for (unsigned m = 0; m < vd->vdev_ms_count; m++) {
 				metaslab_t *msp = vd->vdev_ms[m];
 				ASSERT3P(mg, ==, msp->ms_group);
 				mutex_enter(&msp->ms_lock);
@@ -2913,12 +2920,13 @@ count_block_cb(void *arg, const blkptr_t *bp, dmu_tx_t
 static int
 dump_block_stats(spa_t *spa)
 {
-	zdb_cb_t zcb = { 0 };
+	zdb_cb_t zcb;
 	zdb_blkstats_t *zb, *tzb;
 	uint64_t norm_alloc, norm_space, total_alloc, total_found;
 	int flags = TRAVERSE_PRE | TRAVERSE_PREFETCH_METADATA | TRAVERSE_HARD;
 	boolean_t leaks = B_FALSE;
 
+	bzero(&zcb, sizeof (zcb));
 	(void) printf("\nTraversing all blocks %s%s%s%s%s...\n\n",
 	    (dump_opt['c'] || !dump_opt['L']) ? "to verify " : "",
 	    (dump_opt['c'] == 1) ? "metadata " : "",
@@ -3069,7 +3077,7 @@ dump_block_stats(spa_t *spa)
 		for (t = 0; t <= ZDB_OT_TOTAL; t++) {
 			char csize[32], lsize[32], psize[32], asize[32];
 			char avg[32], gang[32];
-			char *typename;
+			const char *typename;
 
 			/* make sure nicenum has enough space */
 			CTASSERT(sizeof (csize) >= NN_NUMBUF_SZ);
@@ -3220,9 +3228,11 @@ dump_simulated_ddt(spa_t *spa)
 	avl_tree_t t;
 	void *cookie = NULL;
 	zdb_ddt_entry_t *zdde;
-	ddt_histogram_t ddh_total = { 0 };
-	ddt_stat_t dds_total = { 0 };
+	ddt_histogram_t ddh_total;
+	ddt_stat_t dds_total;
 
+	bzero(&ddh_total, sizeof (ddh_total));
+	bzero(&dds_total, sizeof (dds_total));
 	avl_create(&t, ddt_entry_compare,
 	    sizeof (zdb_ddt_entry_t), offsetof(zdb_ddt_entry_t, zdde_node));
 
@@ -3369,7 +3379,7 @@ dump_zpool(spa_t *spa)
 #define	ZDB_FLAG_RAW		0x0040
 #define	ZDB_FLAG_PRINT_BLKPTR	0x0080
 
-int flagbits[256];
+static int flagbits[256];
 
 static void
 zdb_print_blkptr(blkptr_t *bp, int flags)
@@ -3410,10 +3420,11 @@ static void
 zdb_dump_block(char *label, void *buf, uint64_t size, int flags)
 {
 	uint64_t *d = (uint64_t *)buf;
-	int nwords = size / sizeof (uint64_t);
+	unsigned nwords = size / sizeof (uint64_t);
 	int do_bswap = !!(flags & ZDB_FLAG_BSWAP);
-	int i, j;
-	char *hdr, *c;
+	unsigned i, j;
+	const char *hdr;
+	char *c;
 
 
 	if (do_bswap)
@@ -3446,19 +3457,19 @@ zdb_dump_block(char *label, void *buf, uint64_t size, 
  * RAID-Zs, you can specify either RAID-Z vdev with 0.0 or 0.1 .
  */
 static vdev_t *
-zdb_vdev_lookup(vdev_t *vdev, char *path)
+zdb_vdev_lookup(vdev_t *vdev, const char *path)
 {
 	char *s, *p, *q;
-	int i;
+	unsigned i;
 
 	if (vdev == NULL)
 		return (NULL);
 
 	/* First, assume the x.x.x.x format */
-	i = (int)strtoul(path, &s, 10);
+	i = strtoul(path, &s, 10);
 	if (s == path || (s && *s != '.' && *s != '\0'))
 		goto name;
-	if (i < 0 || i >= vdev->vdev_children)
+	if (i >= vdev->vdev_children)
 		return (NULL);
 
 	vdev = vdev->vdev_child[i];
@@ -3533,7 +3544,8 @@ zdb_read_block(char *thing, spa_t *spa)
 	vdev_t *vd;
 	abd_t *pabd;
 	void *lbuf, *buf;
-	char *s, *p, *dup, *vdev, *flagstr;
+	const char *s, *vdev;
+	char *p, *dup, *flagstr;
 	int i, error;
 
 	dup = strdup(thing);
@@ -3544,7 +3556,10 @@ zdb_read_block(char *thing, spa_t *spa)
 	s = strtok(NULL, ":");
 	size = strtoull(s ? s : "", NULL, 16);
 	s = strtok(NULL, ":");
-	flagstr = s ? s : "";
+	if (s)
+		flagstr = strdup(s);
+	else
+		flagstr = strdup("");
 
 	s = NULL;
 	if (size == 0)
@@ -3586,6 +3601,7 @@ zdb_read_block(char *thing, spa_t *spa)
 			i += p - &flagstr[i + 1]; /* skip over the number */
 		}
 	}
+	free(flagstr);
 
 	vd = zdb_vdev_lookup(spa->spa_root_vdev, vdev);
 	if (vd == NULL) {
@@ -3722,11 +3738,12 @@ out:
 static void
 zdb_embedded_block(char *thing)
 {
-	blkptr_t bp = { 0 };
+	blkptr_t bp;
 	unsigned long long *words = (void *)&bp;
 	char *buf;
 	int err;
 
+	bzero(&bp, sizeof (bp));
 	err = sscanf(thing, "%llx:%llx:%llx:%llx:%llx:%llx:%llx:%llx:"
 	    "%llx:%llx:%llx:%llx:%llx:%llx:%llx:%llx",
 	    words + 0, words + 1, words + 2, words + 3,
@@ -3779,8 +3796,9 @@ find_zpool(char **target, nvlist_t **configp, int dirc
 	char *sepp = NULL;
 	char sep = '\0';
 	int count = 0;
-	importargs_t args = { 0 };
+	importargs_t args;
 
+	bzero(&args, sizeof (args));
 	args.paths = dirc;
 	args.path = dirv;
 	args.can_be_active = B_TRUE;
@@ -3840,7 +3858,7 @@ find_zpool(char **target, nvlist_t **configp, int dirc
 int
 main(int argc, char **argv)
 {
-	int i, c;
+	int c;
 	struct rlimit rl = { 1024, 1024 };
 	spa_t *spa = NULL;
 	objset_t *os = NULL;
@@ -4121,7 +4139,7 @@ main(int argc, char **argv)
 		if (argc > 0) {
 			zopt_objects = argc;
 			zopt_object = calloc(zopt_objects, sizeof (uint64_t));
-			for (i = 0; i < zopt_objects; i++) {
+			for (unsigned i = 0; i < zopt_objects; i++) {
 				errno = 0;
 				zopt_object[i] = strtoull(argv[i], NULL, 0);
 				if (zopt_object[i] == 0 && errno != 0)
@@ -4146,7 +4164,7 @@ main(int argc, char **argv)
 		flagbits['p'] = ZDB_FLAG_PHYS;
 		flagbits['r'] = ZDB_FLAG_RAW;
 
-		for (i = 0; i < argc; i++)
+		for (int i = 0; i < argc; i++)
 			zdb_read_block(argv[i], spa);
 	}
 

Copied: user/jeff/numa/cddl/contrib/opensolaris/cmd/zdb/zdb.h (from r329605, head/cddl/contrib/opensolaris/cmd/zdb/zdb.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/jeff/numa/cddl/contrib/opensolaris/cmd/zdb/zdb.h	Mon Feb 19 22:22:35 2018	(r329608, copy of r329605, head/cddl/contrib/opensolaris/cmd/zdb/zdb.h)
@@ -0,0 +1,33 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+/*
+ * Copyright 2017 Spectra Logic Corp Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+
+#ifndef	_ZDB_H
+#define	_ZDB_H
+
+void dump_intent_log(zilog_t *);
+extern uint8_t dump_opt[256];
+
+#endif	/* _ZDB_H */

Modified: user/jeff/numa/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c
==============================================================================
--- user/jeff/numa/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c	Mon Feb 19 22:19:44 2018	(r329607)
+++ user/jeff/numa/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c	Mon Feb 19 22:22:35 2018	(r329608)
@@ -43,9 +43,11 @@
 #include <sys/zil_impl.h>
 #include <sys/abd.h>
 
+#include "zdb.h"
+
 extern uint8_t dump_opt[256];
 
-static char prefix[4] = "\t\t\t";
+static char tab_prefix[4] = "\t\t\t";
 
 static void
 print_log_bp(const blkptr_t *bp, const char *prefix)
@@ -58,8 +60,9 @@ print_log_bp(const blkptr_t *bp, const char *prefix)
 
 /* ARGSUSED */
 static void
-zil_prt_rec_create(zilog_t *zilog, int txtype, lr_create_t *lr)
+zil_prt_rec_create(zilog_t *zilog, int txtype, void *arg)
 {
+	lr_create_t *lr = arg;
 	time_t crtime = lr->lr_crtime[0];
 	char *name, *link;
 	lr_attr_t *lrattr;
@@ -74,47 +77,53 @@ zil_prt_rec_create(zilog_t *zilog, int txtype, lr_crea
 
 	if (txtype == TX_SYMLINK) {
 		link = name + strlen(name) + 1;
-		(void) printf("%s%s -> %s\n", prefix, name, link);
+		(void) printf("%s%s -> %s\n", tab_prefix, name, link);
 	} else if (txtype != TX_MKXATTR) {
-		(void) printf("%s%s\n", prefix, name);
+		(void) printf("%s%s\n", tab_prefix, name);
 	}
 
-	(void) printf("%s%s", prefix, ctime(&crtime));
-	(void) printf("%sdoid %llu, foid %llu, mode %llo\n", prefix,
+	(void) printf("%s%s", tab_prefix, ctime(&crtime));
+	(void) printf("%sdoid %llu, foid %llu, mode %llo\n", tab_prefix,
 	    (u_longlong_t)lr->lr_doid, (u_longlong_t)lr->lr_foid,
 	    (longlong_t)lr->lr_mode);
-	(void) printf("%suid %llu, gid %llu, gen %llu, rdev 0x%llx\n", prefix,
+	(void) printf("%suid %llu, gid %llu, gen %llu, rdev 0x%llx\n",
+	    tab_prefix,
 	    (u_longlong_t)lr->lr_uid, (u_longlong_t)lr->lr_gid,
 	    (u_longlong_t)lr->lr_gen, (u_longlong_t)lr->lr_rdev);
 }
 
 /* ARGSUSED */
 static void
-zil_prt_rec_remove(zilog_t *zilog, int txtype, lr_remove_t *lr)
+zil_prt_rec_remove(zilog_t *zilog, int txtype, void *arg)
 {
-	(void) printf("%sdoid %llu, name %s\n", prefix,
+	lr_remove_t *lr = arg;
+
+	(void) printf("%sdoid %llu, name %s\n", tab_prefix,
 	    (u_longlong_t)lr->lr_doid, (char *)(lr + 1));
 }
 
 /* ARGSUSED */
 static void
-zil_prt_rec_link(zilog_t *zilog, int txtype, lr_link_t *lr)
+zil_prt_rec_link(zilog_t *zilog, int txtype, void *arg)
 {
-	(void) printf("%sdoid %llu, link_obj %llu, name %s\n", prefix,
+	lr_link_t *lr = arg;
+
+	(void) printf("%sdoid %llu, link_obj %llu, name %s\n", tab_prefix,
 	    (u_longlong_t)lr->lr_doid, (u_longlong_t)lr->lr_link_obj,
 	    (char *)(lr + 1));
 }
 
 /* ARGSUSED */
 static void
-zil_prt_rec_rename(zilog_t *zilog, int txtype, lr_rename_t *lr)
+zil_prt_rec_rename(zilog_t *zilog, int txtype, void *arg)
 {
+	lr_rename_t *lr = arg;
 	char *snm = (char *)(lr + 1);
 	char *tnm = snm + strlen(snm) + 1;
 
-	(void) printf("%ssdoid %llu, tdoid %llu\n", prefix,
+	(void) printf("%ssdoid %llu, tdoid %llu\n", tab_prefix,
 	    (u_longlong_t)lr->lr_sdoid, (u_longlong_t)lr->lr_tdoid);
-	(void) printf("%ssrc %s tgt %s\n", prefix, snm, tnm);
+	(void) printf("%ssrc %s tgt %s\n", tab_prefix, snm, tnm);
 }
 
 /* ARGSUSED */
@@ -122,7 +131,7 @@ static int
 zil_prt_rec_write_cb(void *data, size_t len, void *unused)
 {
 	char *cdata = data;
-	for (int i = 0; i < len; i++) {
+	for (size_t i = 0; i < len; i++) {
 		if (isprint(*cdata))
 			(void) printf("%c ", *cdata);
 		else
@@ -134,15 +143,16 @@ zil_prt_rec_write_cb(void *data, size_t len, void *unu
 
 /* ARGSUSED */
 static void
-zil_prt_rec_write(zilog_t *zilog, int txtype, lr_write_t *lr)
+zil_prt_rec_write(zilog_t *zilog, int txtype, void *arg)
 {
+	lr_write_t *lr = arg;
 	abd_t *data;
 	blkptr_t *bp = &lr->lr_blkptr;
 	zbookmark_phys_t zb;
 	int verbose = MAX(dump_opt['d'], dump_opt['i']);
 	int error;
 
-	(void) printf("%sfoid %llu, offset %llx, length %llx\n", prefix,
+	(void) printf("%sfoid %llu, offset %llx, length %llx\n", tab_prefix,
 	    (u_longlong_t)lr->lr_foid, (u_longlong_t)lr->lr_offset,
 	    (u_longlong_t)lr->lr_length);
 
@@ -150,20 +160,21 @@ zil_prt_rec_write(zilog_t *zilog, int txtype, lr_write
 		return;
 
 	if (lr->lr_common.lrc_reclen == sizeof (lr_write_t)) {
-		(void) printf("%shas blkptr, %s\n", prefix,
+		(void) printf("%shas blkptr, %s\n", tab_prefix,
 		    !BP_IS_HOLE(bp) &&
 		    bp->blk_birth >= spa_first_txg(zilog->zl_spa) ?
 		    "will claim" : "won't claim");
-		print_log_bp(bp, prefix);
+		print_log_bp(bp, tab_prefix);
 
 		if (BP_IS_HOLE(bp)) {
 			(void) printf("\t\t\tLSIZE 0x%llx\n",
 			    (u_longlong_t)BP_GET_LSIZE(bp));
-			(void) printf("%s<hole>\n", prefix);
+			(void) printf("%s<hole>\n", tab_prefix);
 			return;
 		}
 		if (bp->blk_birth < zilog->zl_header->zh_claim_txg) {
-			(void) printf("%s<block already committed>\n", prefix);
+			(void) printf("%s<block already committed>\n",
+			    tab_prefix);
 			return;
 		}
 
@@ -183,7 +194,7 @@ zil_prt_rec_write(zilog_t *zilog, int txtype, lr_write
 		abd_copy_from_buf(data, lr + 1, lr->lr_length);
 	}
 
-	(void) printf("%s", prefix);
+	(void) printf("%s", tab_prefix);
 	(void) abd_iterate_func(data,
 	    0, MIN(lr->lr_length, (verbose < 6 ? 20 : SPA_MAXBLOCKSIZE)),
 	    zil_prt_rec_write_cb, NULL);
@@ -195,52 +206,55 @@ out:
 
 /* ARGSUSED */
 static void
-zil_prt_rec_truncate(zilog_t *zilog, int txtype, lr_truncate_t *lr)
+zil_prt_rec_truncate(zilog_t *zilog, int txtype, void *arg)
 {
-	(void) printf("%sfoid %llu, offset 0x%llx, length 0x%llx\n", prefix,
+	lr_truncate_t *lr = arg;
+
+	(void) printf("%sfoid %llu, offset 0x%llx, length 0x%llx\n", tab_prefix,
 	    (u_longlong_t)lr->lr_foid, (longlong_t)lr->lr_offset,
 	    (u_longlong_t)lr->lr_length);
 }
 
 /* ARGSUSED */
 static void
-zil_prt_rec_setattr(zilog_t *zilog, int txtype, lr_setattr_t *lr)
+zil_prt_rec_setattr(zilog_t *zilog, int txtype, void *arg)
 {
+	lr_setattr_t *lr = arg;
 	time_t atime = (time_t)lr->lr_atime[0];
 	time_t mtime = (time_t)lr->lr_mtime[0];
 
-	(void) printf("%sfoid %llu, mask 0x%llx\n", prefix,
+	(void) printf("%sfoid %llu, mask 0x%llx\n", tab_prefix,
 	    (u_longlong_t)lr->lr_foid, (u_longlong_t)lr->lr_mask);
 
 	if (lr->lr_mask & AT_MODE) {
-		(void) printf("%sAT_MODE  %llo\n", prefix,
+		(void) printf("%sAT_MODE  %llo\n", tab_prefix,
 		    (longlong_t)lr->lr_mode);
 	}
 
 	if (lr->lr_mask & AT_UID) {
-		(void) printf("%sAT_UID   %llu\n", prefix,
+		(void) printf("%sAT_UID   %llu\n", tab_prefix,
 		    (u_longlong_t)lr->lr_uid);
 	}
 
 	if (lr->lr_mask & AT_GID) {
-		(void) printf("%sAT_GID   %llu\n", prefix,
+		(void) printf("%sAT_GID   %llu\n", tab_prefix,
 		    (u_longlong_t)lr->lr_gid);
 	}
 
 	if (lr->lr_mask & AT_SIZE) {
-		(void) printf("%sAT_SIZE  %llu\n", prefix,
+		(void) printf("%sAT_SIZE  %llu\n", tab_prefix,
 		    (u_longlong_t)lr->lr_size);
 	}
 
 	if (lr->lr_mask & AT_ATIME) {
-		(void) printf("%sAT_ATIME %llu.%09llu %s", prefix,
+		(void) printf("%sAT_ATIME %llu.%09llu %s", tab_prefix,
 		    (u_longlong_t)lr->lr_atime[0],
 		    (u_longlong_t)lr->lr_atime[1],
 		    ctime(&atime));
 	}
 
 	if (lr->lr_mask & AT_MTIME) {
-		(void) printf("%sAT_MTIME %llu.%09llu %s", prefix,
+		(void) printf("%sAT_MTIME %llu.%09llu %s", tab_prefix,
 		    (u_longlong_t)lr->lr_mtime[0],
 		    (u_longlong_t)lr->lr_mtime[1],
 		    ctime(&mtime));
@@ -249,41 +263,43 @@ zil_prt_rec_setattr(zilog_t *zilog, int txtype, lr_set
 
 /* ARGSUSED */
 static void
-zil_prt_rec_acl(zilog_t *zilog, int txtype, lr_acl_t *lr)
+zil_prt_rec_acl(zilog_t *zilog, int txtype, void *arg)
 {
-	(void) printf("%sfoid %llu, aclcnt %llu\n", prefix,
+	lr_acl_t *lr = arg;
+
+	(void) printf("%sfoid %llu, aclcnt %llu\n", tab_prefix,
 	    (u_longlong_t)lr->lr_foid, (u_longlong_t)lr->lr_aclcnt);
 }
 
-typedef void (*zil_prt_rec_func_t)();
+typedef void (*zil_prt_rec_func_t)(zilog_t *, int, void *);
 typedef struct zil_rec_info {
 	zil_prt_rec_func_t	zri_print;
-	char			*zri_name;
+	const char		*zri_name;
 	uint64_t		zri_count;
 } zil_rec_info_t;
 
 static zil_rec_info_t zil_rec_info[TX_MAX_TYPE] = {
-	{	NULL,			"Total              " },
-	{	zil_prt_rec_create,	"TX_CREATE          " },
-	{	zil_prt_rec_create,	"TX_MKDIR           " },
-	{	zil_prt_rec_create,	"TX_MKXATTR         " },
-	{	zil_prt_rec_create,	"TX_SYMLINK         " },
-	{	zil_prt_rec_remove,	"TX_REMOVE          " },
-	{	zil_prt_rec_remove,	"TX_RMDIR           " },
-	{	zil_prt_rec_link,	"TX_LINK            " },
-	{	zil_prt_rec_rename,	"TX_RENAME          " },
-	{	zil_prt_rec_write,	"TX_WRITE           " },
-	{	zil_prt_rec_truncate,	"TX_TRUNCATE        " },
-	{	zil_prt_rec_setattr,	"TX_SETATTR         " },
-	{	zil_prt_rec_acl,	"TX_ACL_V0          " },
-	{	zil_prt_rec_acl,	"TX_ACL_ACL         " },
-	{	zil_prt_rec_create,	"TX_CREATE_ACL      " },
-	{	zil_prt_rec_create,	"TX_CREATE_ATTR     " },
-	{	zil_prt_rec_create,	"TX_CREATE_ACL_ATTR " },
-	{	zil_prt_rec_create,	"TX_MKDIR_ACL       " },
-	{	zil_prt_rec_create,	"TX_MKDIR_ATTR      " },
-	{	zil_prt_rec_create,	"TX_MKDIR_ACL_ATTR  " },
-	{	zil_prt_rec_write,	"TX_WRITE2          " },
+	{.zri_print = NULL,		    .zri_name = "Total              "},
+	{.zri_print = zil_prt_rec_create,   .zri_name = "TX_CREATE          "},
+	{.zri_print = zil_prt_rec_create,   .zri_name = "TX_MKDIR           "},
+	{.zri_print = zil_prt_rec_create,   .zri_name = "TX_MKXATTR         "},
+	{.zri_print = zil_prt_rec_create,   .zri_name = "TX_SYMLINK         "},
+	{.zri_print = zil_prt_rec_remove,   .zri_name = "TX_REMOVE          "},
+	{.zri_print = zil_prt_rec_remove,   .zri_name = "TX_RMDIR           "},
+	{.zri_print = zil_prt_rec_link,	    .zri_name = "TX_LINK            "},
+	{.zri_print = zil_prt_rec_rename,   .zri_name = "TX_RENAME          "},
+	{.zri_print = zil_prt_rec_write,    .zri_name = "TX_WRITE           "},
+	{.zri_print = zil_prt_rec_truncate, .zri_name = "TX_TRUNCATE        "},
+	{.zri_print = zil_prt_rec_setattr,  .zri_name = "TX_SETATTR         "},
+	{.zri_print = zil_prt_rec_acl,	    .zri_name = "TX_ACL_V0          "},
+	{.zri_print = zil_prt_rec_acl,	    .zri_name = "TX_ACL_ACL         "},
+	{.zri_print = zil_prt_rec_create,   .zri_name = "TX_CREATE_ACL      "},
+	{.zri_print = zil_prt_rec_create,   .zri_name = "TX_CREATE_ATTR     "},
+	{.zri_print = zil_prt_rec_create,   .zri_name = "TX_CREATE_ACL_ATTR "},
+	{.zri_print = zil_prt_rec_create,   .zri_name = "TX_MKDIR_ACL       "},
+	{.zri_print = zil_prt_rec_create,   .zri_name = "TX_MKDIR_ATTR      "},
+	{.zri_print = zil_prt_rec_create,   .zri_name = "TX_MKDIR_ACL_ATTR  "},
+	{.zri_print = zil_prt_rec_write,    .zri_name = "TX_WRITE2          "},
 };
 
 /* ARGSUSED */
@@ -321,7 +337,7 @@ print_log_block(zilog_t *zilog, blkptr_t *bp, void *ar
 {
 	char blkbuf[BP_SPRINTF_LEN + 10];
 	int verbose = MAX(dump_opt['d'], dump_opt['i']);
-	char *claim;
+	const char *claim;
 
 	if (verbose <= 3)
 		return (0);
@@ -350,7 +366,7 @@ print_log_block(zilog_t *zilog, blkptr_t *bp, void *ar
 static void
 print_log_stats(int verbose)
 {
-	int i, w, p10;
+	unsigned i, w, p10;
 
 	if (verbose > 3)
 		(void) printf("\n");

Modified: user/jeff/numa/cddl/contrib/opensolaris/cmd/ztest/ztest.c
==============================================================================
--- user/jeff/numa/cddl/contrib/opensolaris/cmd/ztest/ztest.c	Mon Feb 19 22:19:44 2018	(r329607)
+++ user/jeff/numa/cddl/contrib/opensolaris/cmd/ztest/ztest.c	Mon Feb 19 22:22:35 2018	(r329608)
@@ -1425,8 +1425,10 @@ ztest_log_setattr(ztest_ds_t *zd, dmu_tx_t *tx, lr_set
  * ZIL replay ops
  */
 static int
-ztest_replay_create(ztest_ds_t *zd, lr_create_t *lr, boolean_t byteswap)
+ztest_replay_create(void *arg1, void *arg2, boolean_t byteswap)
 {
+	ztest_ds_t *zd = arg1;
+	lr_create_t *lr = arg2;
 	char *name = (void *)(lr + 1);		/* name follows lr */
 	objset_t *os = zd->zd_os;
 	ztest_block_tag_t *bbt;
@@ -1509,8 +1511,10 @@ ztest_replay_create(ztest_ds_t *zd, lr_create_t *lr, b
 }
 
 static int
-ztest_replay_remove(ztest_ds_t *zd, lr_remove_t *lr, boolean_t byteswap)
+ztest_replay_remove(void *arg1, void *arg2, boolean_t byteswap)
 {
+	ztest_ds_t *zd = arg1;
+	lr_remove_t *lr = arg2;
 	char *name = (void *)(lr + 1);		/* name follows lr */
 	objset_t *os = zd->zd_os;
 	dmu_object_info_t doi;
@@ -1560,8 +1564,10 @@ ztest_replay_remove(ztest_ds_t *zd, lr_remove_t *lr, b
 }
 
 static int
-ztest_replay_write(ztest_ds_t *zd, lr_write_t *lr, boolean_t byteswap)
+ztest_replay_write(void *arg1, void *arg2, boolean_t byteswap)
 {
+	ztest_ds_t *zd = arg1;
+	lr_write_t *lr = arg2;
 	objset_t *os = zd->zd_os;
 	void *data = lr + 1;			/* data follows lr */
 	uint64_t offset, length;
@@ -1685,8 +1691,10 @@ ztest_replay_write(ztest_ds_t *zd, lr_write_t *lr, boo
 }
 
 static int
-ztest_replay_truncate(ztest_ds_t *zd, lr_truncate_t *lr, boolean_t byteswap)
+ztest_replay_truncate(void *arg1, void *arg2, boolean_t byteswap)
 {
+	ztest_ds_t *zd = arg1;
+	lr_truncate_t *lr = arg2;
 	objset_t *os = zd->zd_os;
 	dmu_tx_t *tx;
 	uint64_t txg;
@@ -1724,8 +1732,10 @@ ztest_replay_truncate(ztest_ds_t *zd, lr_truncate_t *l
 }
 
 static int
-ztest_replay_setattr(ztest_ds_t *zd, lr_setattr_t *lr, boolean_t byteswap)
+ztest_replay_setattr(void *arg1, void *arg2, boolean_t byteswap)
 {
+	ztest_ds_t *zd = arg1;
+	lr_setattr_t *lr = arg2;
 	objset_t *os = zd->zd_os;
 	dmu_tx_t *tx;
 	dmu_buf_t *db;

Modified: user/jeff/numa/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c
==============================================================================
--- user/jeff/numa/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c	Mon Feb 19 22:19:44 2018	(r329607)
+++ user/jeff/numa/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c	Mon Feb 19 22:22:35 2018	(r329608)
@@ -24,6 +24,7 @@
  * 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 Joyent, Inc.
  * Copyright 2017 RackTop Systems.
  */
 
@@ -610,8 +611,14 @@ zfs_init_libshare(libzfs_handle_t *zhandle, int servic
 	int ret = SA_OK;
 
 #ifdef illumos
+	/*
+	 * libshare is either not installed or we're in a branded zone. The
+	 * rest of the wrapper functions around the libshare calls already
+	 * handle NULL function pointers, but we don't want the callers of
+	 * zfs_init_libshare() to fail prematurely if libshare is not available.
+	 */
 	if (_sa_init == NULL)
-		ret = SA_CONFIG_ERR;
+		return (SA_OK);
 
 	if (ret == SA_OK && zhandle->libzfs_shareflags & ZFSSHARE_MISS) {
 		/*

Modified: user/jeff/numa/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
==============================================================================
--- user/jeff/numa/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h	Mon Feb 19 22:19:44 2018	(r329607)
+++ user/jeff/numa/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h	Mon Feb 19 22:22:35 2018	(r329608)
@@ -237,7 +237,7 @@ extern struct proc p0;
 
 #define	PS_NONE		-1
 
-extern kthread_t *zk_thread_create(void (*func)(), void *arg);

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

More information about the svn-src-user mailing list