Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 30 May 2012 05:59:46 +0000 (UTC)
From:      Will Andrews <will@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r236295 - in projects/zfsd/head: . bin/ed bin/expr bin/ls bin/ps bin/rcp bin/sh bin/uuidgen cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/cmd/zpool cddl/contrib/opensolaris/...
Message-ID:  <201205300559.q4U5xkQ5029981@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: will
Date: Wed May 30 05:59:45 2012
New Revision: 236295
URL: http://svn.freebsd.org/changeset/base/236295

Log:
  IFC @ r236291.
  Diff reductions to the enclosure driver made in r235911.

Added:
  projects/zfsd/head/contrib/bind9/lib/dns/rdata/generic/tlsa_52.c
     - copied unchanged from r236291, head/contrib/bind9/lib/dns/rdata/generic/tlsa_52.c
  projects/zfsd/head/contrib/bind9/lib/dns/rdata/generic/tlsa_52.h
     - copied unchanged from r236291, head/contrib/bind9/lib/dns/rdata/generic/tlsa_52.h
  projects/zfsd/head/contrib/byacc/
     - copied from r236291, head/contrib/byacc/
  projects/zfsd/head/contrib/openpam/TODO
     - copied unchanged from r236291, head/contrib/openpam/TODO
  projects/zfsd/head/contrib/openpam/bin/openpam_dump_policy/
     - copied from r236291, head/contrib/openpam/bin/openpam_dump_policy/
  projects/zfsd/head/contrib/openpam/doc/man/openpam_get_feature.3
     - copied unchanged from r236291, head/contrib/openpam/doc/man/openpam_get_feature.3
  projects/zfsd/head/contrib/openpam/doc/man/openpam_readlinev.3
     - copied unchanged from r236291, head/contrib/openpam/doc/man/openpam_readlinev.3
  projects/zfsd/head/contrib/openpam/doc/man/openpam_readword.3
     - copied unchanged from r236291, head/contrib/openpam/doc/man/openpam_readword.3
  projects/zfsd/head/contrib/openpam/doc/man/openpam_set_feature.3
     - copied unchanged from r236291, head/contrib/openpam/doc/man/openpam_set_feature.3
  projects/zfsd/head/contrib/openpam/doc/man/openpam_straddch.3
     - copied unchanged from r236291, head/contrib/openpam/doc/man/openpam_straddch.3
  projects/zfsd/head/contrib/openpam/lib/openpam_ctype.h
     - copied unchanged from r236291, head/contrib/openpam/lib/openpam_ctype.h
  projects/zfsd/head/contrib/openpam/lib/openpam_features.c
     - copied unchanged from r236291, head/contrib/openpam/lib/openpam_features.c
  projects/zfsd/head/contrib/openpam/lib/openpam_features.h
     - copied unchanged from r236291, head/contrib/openpam/lib/openpam_features.h
  projects/zfsd/head/contrib/openpam/lib/openpam_get_feature.c
     - copied unchanged from r236291, head/contrib/openpam/lib/openpam_get_feature.c
  projects/zfsd/head/contrib/openpam/lib/openpam_readlinev.c
     - copied unchanged from r236291, head/contrib/openpam/lib/openpam_readlinev.c
  projects/zfsd/head/contrib/openpam/lib/openpam_readword.c
     - copied unchanged from r236291, head/contrib/openpam/lib/openpam_readword.c
  projects/zfsd/head/contrib/openpam/lib/openpam_set_feature.c
     - copied unchanged from r236291, head/contrib/openpam/lib/openpam_set_feature.c
  projects/zfsd/head/contrib/openpam/lib/openpam_straddch.c
     - copied unchanged from r236291, head/contrib/openpam/lib/openpam_straddch.c
  projects/zfsd/head/contrib/openpam/lib/openpam_strlcat.h
     - copied unchanged from r236291, head/contrib/openpam/lib/openpam_strlcat.h
  projects/zfsd/head/contrib/openpam/pamgdb.in
     - copied unchanged from r236291, head/contrib/openpam/pamgdb.in
  projects/zfsd/head/contrib/openpam/t/
     - copied from r236291, head/contrib/openpam/t/
  projects/zfsd/head/contrib/tcpdump/in_cksum.c
     - copied unchanged from r236291, head/contrib/tcpdump/in_cksum.c
  projects/zfsd/head/contrib/tcpdump/ppi.h
     - copied unchanged from r236291, head/contrib/tcpdump/ppi.h
  projects/zfsd/head/contrib/tcpdump/print-802_15_4.c
     - copied unchanged from r236291, head/contrib/tcpdump/print-802_15_4.c
  projects/zfsd/head/contrib/tcpdump/print-babel.c
     - copied unchanged from r236291, head/contrib/tcpdump/print-babel.c
  projects/zfsd/head/contrib/tcpdump/print-carp.c
     - copied unchanged from r236291, head/contrib/tcpdump/print-carp.c
  projects/zfsd/head/contrib/tcpdump/print-ppi.c
     - copied unchanged from r236291, head/contrib/tcpdump/print-ppi.c
  projects/zfsd/head/contrib/tcpdump/print-rpki-rtr.c
     - copied unchanged from r236291, head/contrib/tcpdump/print-rpki-rtr.c
  projects/zfsd/head/lib/libc/gen/dirfd.c
     - copied unchanged from r236291, head/lib/libc/gen/dirfd.c
  projects/zfsd/head/lib/libc/gen/gen-private.h
     - copied unchanged from r236291, head/lib/libc/gen/gen-private.h
  projects/zfsd/head/lib/libc/powerpc/gen/eabi.S
     - copied unchanged from r236291, head/lib/libc/powerpc/gen/eabi.S
  projects/zfsd/head/lib/libc/stdio/printf_l.3
     - copied unchanged from r236291, head/lib/libc/stdio/printf_l.3
  projects/zfsd/head/lib/libc/stdio/scanf_l.3
     - copied unchanged from r236291, head/lib/libc/stdio/scanf_l.3
  projects/zfsd/head/lib/libnandfs/
     - copied from r236291, head/lib/libnandfs/
  projects/zfsd/head/lib/libstand/nandfs.c
     - copied unchanged from r236291, head/lib/libstand/nandfs.c
  projects/zfsd/head/sbin/nandfs/
     - copied from r236291, head/sbin/nandfs/
  projects/zfsd/head/sbin/newfs_nandfs/
     - copied from r236291, head/sbin/newfs_nandfs/
  projects/zfsd/head/share/dtrace/
     - copied from r236291, head/share/dtrace/
  projects/zfsd/head/share/man/man4/nand.4
     - copied unchanged from r236291, head/share/man/man4/nand.4
  projects/zfsd/head/share/man/man4/nandsim.4
     - copied unchanged from r236291, head/share/man/man4/nandsim.4
  projects/zfsd/head/share/man/man5/nandfs.5
     - copied unchanged from r236291, head/share/man/man5/nandfs.5
  projects/zfsd/head/sys/arm/mv/mv_localbus.c
     - copied unchanged from r236291, head/sys/arm/mv/mv_localbus.c
  projects/zfsd/head/sys/boot/fdt/dts/bindings-localbus.txt
     - copied unchanged from r236291, head/sys/boot/fdt/dts/bindings-localbus.txt
  projects/zfsd/head/sys/boot/fdt/dts/p2041rdb.dts
     - copied unchanged from r236291, head/sys/boot/fdt/dts/p2041rdb.dts
  projects/zfsd/head/sys/boot/fdt/dts/p2041si.dtsi
     - copied unchanged from r236291, head/sys/boot/fdt/dts/p2041si.dtsi
  projects/zfsd/head/sys/boot/fdt/dts/p3041si.dtsi
     - copied unchanged from r236291, head/sys/boot/fdt/dts/p3041si.dtsi
  projects/zfsd/head/sys/boot/fdt/dts/p5020ds.dts
     - copied unchanged from r236291, head/sys/boot/fdt/dts/p5020ds.dts
  projects/zfsd/head/sys/boot/fdt/dts/p5020si.dtsi
     - copied unchanged from r236291, head/sys/boot/fdt/dts/p5020si.dtsi
  projects/zfsd/head/sys/dev/agp/agp_i810.h
     - copied unchanged from r236291, head/sys/dev/agp/agp_i810.h
  projects/zfsd/head/sys/dev/ath/if_ath_beacon.c
     - copied unchanged from r236291, head/sys/dev/ath/if_ath_beacon.c
  projects/zfsd/head/sys/dev/ath/if_ath_beacon.h
     - copied unchanged from r236291, head/sys/dev/ath/if_ath_beacon.h
  projects/zfsd/head/sys/dev/ath/if_ath_rx.c
     - copied unchanged from r236291, head/sys/dev/ath/if_ath_rx.c
  projects/zfsd/head/sys/dev/ath/if_ath_rx.h
     - copied unchanged from r236291, head/sys/dev/ath/if_ath_rx.h
  projects/zfsd/head/sys/dev/ath/if_ath_tdma.c
     - copied unchanged from r236291, head/sys/dev/ath/if_ath_tdma.c
  projects/zfsd/head/sys/dev/ath/if_ath_tdma.h
     - copied unchanged from r236291, head/sys/dev/ath/if_ath_tdma.h
  projects/zfsd/head/sys/dev/ath/if_ath_tsf.h
     - copied unchanged from r236291, head/sys/dev/ath/if_ath_tsf.h
  projects/zfsd/head/sys/dev/drm2/
     - copied from r236291, head/sys/dev/drm2/
  projects/zfsd/head/sys/dev/fdt/fdt_slicer.c
     - copied unchanged from r236291, head/sys/dev/fdt/fdt_slicer.c
  projects/zfsd/head/sys/dev/nand/
     - copied from r236291, head/sys/dev/nand/
  projects/zfsd/head/sys/dev/usb/controller/ehci_fsl.c
     - copied unchanged from r236291, head/sys/dev/usb/controller/ehci_fsl.c
  projects/zfsd/head/sys/fs/nandfs/
     - copied from r236291, head/sys/fs/nandfs/
  projects/zfsd/head/sys/geom/geom_flashmap.c
     - copied unchanged from r236291, head/sys/geom/geom_flashmap.c
  projects/zfsd/head/sys/modules/drm2/
     - copied from r236291, head/sys/modules/drm2/
  projects/zfsd/head/sys/modules/nandfs/
     - copied from r236291, head/sys/modules/nandfs/
  projects/zfsd/head/sys/modules/nandsim/
     - copied from r236291, head/sys/modules/nandsim/
  projects/zfsd/head/sys/modules/netmap/
     - copied from r236291, head/sys/modules/netmap/
  projects/zfsd/head/sys/powerpc/mpc85xx/fsl_sdhc.c
     - copied unchanged from r236291, head/sys/powerpc/mpc85xx/fsl_sdhc.c
  projects/zfsd/head/sys/powerpc/mpc85xx/fsl_sdhc.h
     - copied unchanged from r236291, head/sys/powerpc/mpc85xx/fsl_sdhc.h
  projects/zfsd/head/sys/powerpc/powerpc/openpic_fdt.c
     - copied unchanged from r236291, head/sys/powerpc/powerpc/openpic_fdt.c
  projects/zfsd/head/sys/sys/slicer.h
     - copied unchanged from r236291, head/sys/sys/slicer.h
  projects/zfsd/head/tools/build/options/WITHOUT_ED_CRYPTO
     - copied unchanged from r236291, head/tools/build/options/WITHOUT_ED_CRYPTO
  projects/zfsd/head/tools/build/options/WITHOUT_LS_COLORS
     - copied unchanged from r236291, head/tools/build/options/WITHOUT_LS_COLORS
  projects/zfsd/head/tools/build/options/WITHOUT_NAND
     - copied unchanged from r236291, head/tools/build/options/WITHOUT_NAND
  projects/zfsd/head/tools/build/options/WITH_NAND
     - copied unchanged from r236291, head/tools/build/options/WITH_NAND
  projects/zfsd/head/tools/regression/usr.bin/yacc/
     - copied from r236291, head/tools/regression/usr.bin/yacc/
  projects/zfsd/head/usr.bin/pamtest/
     - copied from r236291, head/usr.bin/pamtest/
  projects/zfsd/head/usr.sbin/nandsim/
     - copied from r236291, head/usr.sbin/nandsim/
  projects/zfsd/head/usr.sbin/nandtool/
     - copied from r236291, head/usr.sbin/nandtool/
Deleted:
  projects/zfsd/head/contrib/tcpdump/missing/addrsize.h
  projects/zfsd/head/contrib/tcpdump/missing/bittypes.h
  projects/zfsd/head/contrib/tcpdump/missing/resolv6.h
  projects/zfsd/head/contrib/tcpdump/missing/resolv_ext.h
  projects/zfsd/head/contrib/tcpdump/tests/
  projects/zfsd/head/etc/pam.d/kde
  projects/zfsd/head/sys/dev/netmap/head.diff
  projects/zfsd/head/sys/powerpc/mpc85xx/openpic_fdt.c
  projects/zfsd/head/usr.bin/yacc/ACKNOWLEDGEMENTS
  projects/zfsd/head/usr.bin/yacc/NEW_FEATURES
  projects/zfsd/head/usr.bin/yacc/NOTES
  projects/zfsd/head/usr.bin/yacc/README
  projects/zfsd/head/usr.bin/yacc/closure.c
  projects/zfsd/head/usr.bin/yacc/defs.h
  projects/zfsd/head/usr.bin/yacc/error.c
  projects/zfsd/head/usr.bin/yacc/lalr.c
  projects/zfsd/head/usr.bin/yacc/lr0.c
  projects/zfsd/head/usr.bin/yacc/main.c
  projects/zfsd/head/usr.bin/yacc/mkpar.c
  projects/zfsd/head/usr.bin/yacc/output.c
  projects/zfsd/head/usr.bin/yacc/reader.c
  projects/zfsd/head/usr.bin/yacc/skeleton.c
  projects/zfsd/head/usr.bin/yacc/symtab.c
  projects/zfsd/head/usr.bin/yacc/test/
  projects/zfsd/head/usr.bin/yacc/verbose.c
  projects/zfsd/head/usr.bin/yacc/warshall.c
  projects/zfsd/head/usr.bin/yacc/yacc.1
  projects/zfsd/head/usr.bin/yacc/yyfix.1
  projects/zfsd/head/usr.bin/yacc/yyfix.sh
Modified:
  projects/zfsd/head/Makefile.inc1
  projects/zfsd/head/ObsoleteFiles.inc
  projects/zfsd/head/bin/ed/Makefile
  projects/zfsd/head/bin/expr/expr.y
  projects/zfsd/head/bin/ls/Makefile
  projects/zfsd/head/bin/ps/keyword.c
  projects/zfsd/head/bin/ps/ps.1
  projects/zfsd/head/bin/rcp/rcp.c
  projects/zfsd/head/bin/sh/Makefile
  projects/zfsd/head/bin/sh/miscbltin.c
  projects/zfsd/head/bin/sh/mkbuiltins
  projects/zfsd/head/bin/uuidgen/uuidgen.1
  projects/zfsd/head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
  projects/zfsd/head/cddl/contrib/opensolaris/cmd/zpool/zpool.8
  projects/zfsd/head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
  projects/zfsd/head/cddl/contrib/opensolaris/cmd/ztest/ztest.c
  projects/zfsd/head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
  projects/zfsd/head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
  projects/zfsd/head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
  projects/zfsd/head/contrib/bind9/CHANGES
  projects/zfsd/head/contrib/bind9/README
  projects/zfsd/head/contrib/bind9/bin/named/builtin.c
  projects/zfsd/head/contrib/bind9/bin/named/query.c
  projects/zfsd/head/contrib/bind9/bin/named/server.c
  projects/zfsd/head/contrib/bind9/bin/named/unix/dlz_dlopen_driver.c
  projects/zfsd/head/contrib/bind9/lib/bind9/api
  projects/zfsd/head/contrib/bind9/lib/bind9/check.c
  projects/zfsd/head/contrib/bind9/lib/dns/api
  projects/zfsd/head/contrib/bind9/lib/dns/dnssec.c
  projects/zfsd/head/contrib/bind9/lib/dns/include/dns/ecdb.h
  projects/zfsd/head/contrib/bind9/lib/dns/include/dns/rpz.h
  projects/zfsd/head/contrib/bind9/lib/dns/include/dns/sdb.h
  projects/zfsd/head/contrib/bind9/lib/dns/include/dns/stats.h
  projects/zfsd/head/contrib/bind9/lib/dns/include/dns/tsec.h
  projects/zfsd/head/contrib/bind9/lib/dns/include/dns/view.h
  projects/zfsd/head/contrib/bind9/lib/dns/rbtdb.c
  projects/zfsd/head/contrib/bind9/lib/dns/resolver.c
  projects/zfsd/head/contrib/bind9/lib/dns/sdb.c
  projects/zfsd/head/contrib/bind9/lib/dns/tkey.c
  projects/zfsd/head/contrib/bind9/lib/dns/zone.c
  projects/zfsd/head/contrib/bind9/lib/isc/pthreads/mutex.c
  projects/zfsd/head/contrib/bind9/lib/isccfg/api
  projects/zfsd/head/contrib/bind9/lib/isccfg/parser.c
  projects/zfsd/head/contrib/bind9/version
  projects/zfsd/head/contrib/com_err/com_err.3
  projects/zfsd/head/contrib/gcc/config/i386/freebsd.h
  projects/zfsd/head/contrib/gcc/config/i386/freebsd64.h
  projects/zfsd/head/contrib/gcc/config/rs6000/rs6000.md
  projects/zfsd/head/contrib/gcc/config/sparc/sparc.md
  projects/zfsd/head/contrib/gcc/cse.c
  projects/zfsd/head/contrib/gcc/expr.c
  projects/zfsd/head/contrib/gcc/fold-const.c
  projects/zfsd/head/contrib/gcc/ipa-pure-const.c
  projects/zfsd/head/contrib/gcc/ipa-utils.c
  projects/zfsd/head/contrib/gcc/rtl.h
  projects/zfsd/head/contrib/gcc/var-tracking.c
  projects/zfsd/head/contrib/gcc/varasm.c
  projects/zfsd/head/contrib/groff/tmac/doc-common
  projects/zfsd/head/contrib/llvm/include/llvm/Support/FileSystem.h
  projects/zfsd/head/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp
  projects/zfsd/head/contrib/llvm/lib/Support/Unix/PathV2.inc
  projects/zfsd/head/contrib/llvm/lib/Support/Windows/PathV2.inc
  projects/zfsd/head/contrib/llvm/tools/clang/include/clang/AST/Decl.h
  projects/zfsd/head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticParseKinds.td
  projects/zfsd/head/contrib/llvm/tools/clang/include/clang/Basic/TokenKinds.def
  projects/zfsd/head/contrib/llvm/tools/clang/include/clang/Parse/Parser.h
  projects/zfsd/head/contrib/llvm/tools/clang/include/clang/Sema/DeclSpec.h
  projects/zfsd/head/contrib/llvm/tools/clang/include/clang/Sema/Initialization.h
  projects/zfsd/head/contrib/llvm/tools/clang/include/clang/Sema/Sema.h
  projects/zfsd/head/contrib/llvm/tools/clang/lib/Analysis/UninitializedValues.cpp
  projects/zfsd/head/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp
  projects/zfsd/head/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp
  projects/zfsd/head/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
  projects/zfsd/head/contrib/llvm/tools/clang/lib/Frontend/CompilerInstance.cpp
  projects/zfsd/head/contrib/llvm/tools/clang/lib/Parse/ParseCXXInlineMethods.cpp
  projects/zfsd/head/contrib/llvm/tools/clang/lib/Parse/ParseDecl.cpp
  projects/zfsd/head/contrib/llvm/tools/clang/lib/Parse/ParseDeclCXX.cpp
  projects/zfsd/head/contrib/llvm/tools/clang/lib/Parse/ParseExpr.cpp
  projects/zfsd/head/contrib/llvm/tools/clang/lib/Parse/ParseExprCXX.cpp
  projects/zfsd/head/contrib/llvm/tools/clang/lib/Sema/DeclSpec.cpp
  projects/zfsd/head/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp
  projects/zfsd/head/contrib/llvm/tools/clang/lib/Sema/SemaDeclCXX.cpp
  projects/zfsd/head/contrib/llvm/tools/clang/lib/Sema/SemaLookup.cpp
  projects/zfsd/head/contrib/llvm/tools/clang/lib/Sema/SemaType.cpp
  projects/zfsd/head/contrib/llvm/tools/clang/lib/Serialization/ASTReader.cpp
  projects/zfsd/head/contrib/llvm/tools/clang/lib/Serialization/ASTWriter.cpp
  projects/zfsd/head/contrib/ncurses/man/curs_threads.3x
  projects/zfsd/head/contrib/openpam/CREDITS
  projects/zfsd/head/contrib/openpam/HISTORY
  projects/zfsd/head/contrib/openpam/LICENSE
  projects/zfsd/head/contrib/openpam/Makefile.am
  projects/zfsd/head/contrib/openpam/Makefile.in
  projects/zfsd/head/contrib/openpam/RELNOTES
  projects/zfsd/head/contrib/openpam/aclocal.m4
  projects/zfsd/head/contrib/openpam/bin/Makefile.am
  projects/zfsd/head/contrib/openpam/bin/Makefile.in
  projects/zfsd/head/contrib/openpam/bin/pamtest/pamtest.1
  projects/zfsd/head/contrib/openpam/bin/pamtest/pamtest.c
  projects/zfsd/head/contrib/openpam/bin/su/su.1
  projects/zfsd/head/contrib/openpam/config.h.in
  projects/zfsd/head/contrib/openpam/configure
  projects/zfsd/head/contrib/openpam/configure.ac
  projects/zfsd/head/contrib/openpam/doc/man/Makefile.am
  projects/zfsd/head/contrib/openpam/doc/man/Makefile.in
  projects/zfsd/head/contrib/openpam/doc/man/openpam.3
  projects/zfsd/head/contrib/openpam/doc/man/openpam_borrow_cred.3
  projects/zfsd/head/contrib/openpam/doc/man/openpam_free_data.3
  projects/zfsd/head/contrib/openpam/doc/man/openpam_free_envlist.3
  projects/zfsd/head/contrib/openpam/doc/man/openpam_get_option.3
  projects/zfsd/head/contrib/openpam/doc/man/openpam_log.3
  projects/zfsd/head/contrib/openpam/doc/man/openpam_nullconv.3
  projects/zfsd/head/contrib/openpam/doc/man/openpam_readline.3
  projects/zfsd/head/contrib/openpam/doc/man/openpam_restore_cred.3
  projects/zfsd/head/contrib/openpam/doc/man/openpam_set_option.3
  projects/zfsd/head/contrib/openpam/doc/man/openpam_subst.3
  projects/zfsd/head/contrib/openpam/doc/man/openpam_ttyconv.3
  projects/zfsd/head/contrib/openpam/doc/man/pam.3
  projects/zfsd/head/contrib/openpam/doc/man/pam.conf.5
  projects/zfsd/head/contrib/openpam/doc/man/pam_acct_mgmt.3
  projects/zfsd/head/contrib/openpam/doc/man/pam_authenticate.3
  projects/zfsd/head/contrib/openpam/doc/man/pam_chauthtok.3
  projects/zfsd/head/contrib/openpam/doc/man/pam_close_session.3
  projects/zfsd/head/contrib/openpam/doc/man/pam_conv.3
  projects/zfsd/head/contrib/openpam/doc/man/pam_end.3
  projects/zfsd/head/contrib/openpam/doc/man/pam_error.3
  projects/zfsd/head/contrib/openpam/doc/man/pam_get_authtok.3
  projects/zfsd/head/contrib/openpam/doc/man/pam_get_data.3
  projects/zfsd/head/contrib/openpam/doc/man/pam_get_item.3
  projects/zfsd/head/contrib/openpam/doc/man/pam_get_user.3
  projects/zfsd/head/contrib/openpam/doc/man/pam_getenv.3
  projects/zfsd/head/contrib/openpam/doc/man/pam_getenvlist.3
  projects/zfsd/head/contrib/openpam/doc/man/pam_info.3
  projects/zfsd/head/contrib/openpam/doc/man/pam_open_session.3
  projects/zfsd/head/contrib/openpam/doc/man/pam_prompt.3
  projects/zfsd/head/contrib/openpam/doc/man/pam_putenv.3
  projects/zfsd/head/contrib/openpam/doc/man/pam_set_data.3
  projects/zfsd/head/contrib/openpam/doc/man/pam_set_item.3
  projects/zfsd/head/contrib/openpam/doc/man/pam_setcred.3
  projects/zfsd/head/contrib/openpam/doc/man/pam_setenv.3
  projects/zfsd/head/contrib/openpam/doc/man/pam_sm_acct_mgmt.3
  projects/zfsd/head/contrib/openpam/doc/man/pam_sm_authenticate.3
  projects/zfsd/head/contrib/openpam/doc/man/pam_sm_chauthtok.3
  projects/zfsd/head/contrib/openpam/doc/man/pam_sm_close_session.3
  projects/zfsd/head/contrib/openpam/doc/man/pam_sm_open_session.3
  projects/zfsd/head/contrib/openpam/doc/man/pam_sm_setcred.3
  projects/zfsd/head/contrib/openpam/doc/man/pam_start.3
  projects/zfsd/head/contrib/openpam/doc/man/pam_strerror.3
  projects/zfsd/head/contrib/openpam/doc/man/pam_verror.3
  projects/zfsd/head/contrib/openpam/doc/man/pam_vinfo.3
  projects/zfsd/head/contrib/openpam/doc/man/pam_vprompt.3
  projects/zfsd/head/contrib/openpam/include/security/openpam.h
  projects/zfsd/head/contrib/openpam/include/security/openpam_version.h
  projects/zfsd/head/contrib/openpam/lib/Makefile.am
  projects/zfsd/head/contrib/openpam/lib/Makefile.in
  projects/zfsd/head/contrib/openpam/lib/openpam_check_owner_perms.c
  projects/zfsd/head/contrib/openpam/lib/openpam_configure.c
  projects/zfsd/head/contrib/openpam/lib/openpam_constants.h
  projects/zfsd/head/contrib/openpam/lib/openpam_debug.h
  projects/zfsd/head/contrib/openpam/lib/openpam_dynamic.c
  projects/zfsd/head/contrib/openpam/lib/openpam_get_option.c
  projects/zfsd/head/contrib/openpam/lib/openpam_impl.h
  projects/zfsd/head/contrib/openpam/lib/openpam_load.c
  projects/zfsd/head/contrib/openpam/lib/openpam_log.c
  projects/zfsd/head/contrib/openpam/lib/openpam_readline.c
  projects/zfsd/head/contrib/openpam/lib/openpam_set_option.c
  projects/zfsd/head/contrib/openpam/lib/openpam_strlcmp.h
  projects/zfsd/head/contrib/openpam/lib/openpam_strlcpy.h
  projects/zfsd/head/contrib/openpam/lib/openpam_subst.c
  projects/zfsd/head/contrib/openpam/lib/openpam_ttyconv.c
  projects/zfsd/head/contrib/openpam/lib/pam_get_authtok.c
  projects/zfsd/head/contrib/openpam/lib/pam_putenv.c
  projects/zfsd/head/contrib/openpam/lib/pam_setenv.c
  projects/zfsd/head/contrib/openpam/ltmain.sh
  projects/zfsd/head/contrib/openpam/misc/gendoc.pl
  projects/zfsd/head/contrib/tcpdump/CHANGES
  projects/zfsd/head/contrib/tcpdump/CREDITS
  projects/zfsd/head/contrib/tcpdump/Makefile.in
  projects/zfsd/head/contrib/tcpdump/VERSION
  projects/zfsd/head/contrib/tcpdump/acconfig.h
  projects/zfsd/head/contrib/tcpdump/addrtoname.c
  projects/zfsd/head/contrib/tcpdump/addrtoname.h
  projects/zfsd/head/contrib/tcpdump/bootp.h
  projects/zfsd/head/contrib/tcpdump/config.h.in
  projects/zfsd/head/contrib/tcpdump/configure
  projects/zfsd/head/contrib/tcpdump/configure.in
  projects/zfsd/head/contrib/tcpdump/cpack.c
  projects/zfsd/head/contrib/tcpdump/cpack.h
  projects/zfsd/head/contrib/tcpdump/ethertype.h
  projects/zfsd/head/contrib/tcpdump/forces.h
  projects/zfsd/head/contrib/tcpdump/ieee802_11_radio.h
  projects/zfsd/head/contrib/tcpdump/interface.h
  projects/zfsd/head/contrib/tcpdump/ip.h
  projects/zfsd/head/contrib/tcpdump/ip6.h
  projects/zfsd/head/contrib/tcpdump/ipproto.c
  projects/zfsd/head/contrib/tcpdump/ipproto.h
  projects/zfsd/head/contrib/tcpdump/netdissect.h
  projects/zfsd/head/contrib/tcpdump/ospf.h
  projects/zfsd/head/contrib/tcpdump/oui.c
  projects/zfsd/head/contrib/tcpdump/oui.h
  projects/zfsd/head/contrib/tcpdump/print-802_11.c
  projects/zfsd/head/contrib/tcpdump/print-ap1394.c
  projects/zfsd/head/contrib/tcpdump/print-arcnet.c
  projects/zfsd/head/contrib/tcpdump/print-arp.c
  projects/zfsd/head/contrib/tcpdump/print-atalk.c
  projects/zfsd/head/contrib/tcpdump/print-atm.c
  projects/zfsd/head/contrib/tcpdump/print-bgp.c
  projects/zfsd/head/contrib/tcpdump/print-cdp.c
  projects/zfsd/head/contrib/tcpdump/print-chdlc.c
  projects/zfsd/head/contrib/tcpdump/print-dccp.c
  projects/zfsd/head/contrib/tcpdump/print-dhcp6.c
  projects/zfsd/head/contrib/tcpdump/print-enc.c
  projects/zfsd/head/contrib/tcpdump/print-ether.c
  projects/zfsd/head/contrib/tcpdump/print-forces.c
  projects/zfsd/head/contrib/tcpdump/print-fr.c
  projects/zfsd/head/contrib/tcpdump/print-gre.c
  projects/zfsd/head/contrib/tcpdump/print-icmp.c
  projects/zfsd/head/contrib/tcpdump/print-icmp6.c
  projects/zfsd/head/contrib/tcpdump/print-igmp.c
  projects/zfsd/head/contrib/tcpdump/print-ip.c
  projects/zfsd/head/contrib/tcpdump/print-ip6.c
  projects/zfsd/head/contrib/tcpdump/print-ipnet.c
  projects/zfsd/head/contrib/tcpdump/print-ipx.c
  projects/zfsd/head/contrib/tcpdump/print-isoclns.c
  projects/zfsd/head/contrib/tcpdump/print-juniper.c
  projects/zfsd/head/contrib/tcpdump/print-lane.c
  projects/zfsd/head/contrib/tcpdump/print-llc.c
  projects/zfsd/head/contrib/tcpdump/print-lldp.c
  projects/zfsd/head/contrib/tcpdump/print-mobile.c
  projects/zfsd/head/contrib/tcpdump/print-mpls.c
  projects/zfsd/head/contrib/tcpdump/print-null.c
  projects/zfsd/head/contrib/tcpdump/print-ospf.c
  projects/zfsd/head/contrib/tcpdump/print-pflog.c
  projects/zfsd/head/contrib/tcpdump/print-pgm.c
  projects/zfsd/head/contrib/tcpdump/print-pim.c
  projects/zfsd/head/contrib/tcpdump/print-ppp.c
  projects/zfsd/head/contrib/tcpdump/print-rrcp.c
  projects/zfsd/head/contrib/tcpdump/print-sctp.c
  projects/zfsd/head/contrib/tcpdump/print-sflow.c
  projects/zfsd/head/contrib/tcpdump/print-sl.c
  projects/zfsd/head/contrib/tcpdump/print-sll.c
  projects/zfsd/head/contrib/tcpdump/print-sunrpc.c
  projects/zfsd/head/contrib/tcpdump/print-symantec.c
  projects/zfsd/head/contrib/tcpdump/print-tcp.c
  projects/zfsd/head/contrib/tcpdump/print-tftp.c
  projects/zfsd/head/contrib/tcpdump/print-udp.c
  projects/zfsd/head/contrib/tcpdump/print-vrrp.c
  projects/zfsd/head/contrib/tcpdump/tcp.h
  projects/zfsd/head/contrib/tcpdump/tcpdump-stdinc.h
  projects/zfsd/head/contrib/tcpdump/tcpdump.1.in
  projects/zfsd/head/contrib/tcpdump/tcpdump.c
  projects/zfsd/head/contrib/tcpdump/udp.h
  projects/zfsd/head/crypto/openssh/ssh.c
  projects/zfsd/head/crypto/openssh/sshconnect.c
  projects/zfsd/head/crypto/openssh/sshd.c
  projects/zfsd/head/crypto/openssh/version.c
  projects/zfsd/head/crypto/openssh/version.h
  projects/zfsd/head/etc/defaults/periodic.conf
  projects/zfsd/head/etc/devd/usb.conf
  projects/zfsd/head/etc/mtree/BSD.include.dist
  projects/zfsd/head/etc/mtree/BSD.usr.dist
  projects/zfsd/head/etc/pam.d/Makefile
  projects/zfsd/head/gnu/lib/Makefile
  projects/zfsd/head/gnu/lib/csu/Makefile
  projects/zfsd/head/gnu/lib/libgcc/Makefile
  projects/zfsd/head/gnu/lib/libsupc++/Version.map
  projects/zfsd/head/gnu/usr.bin/gdb/libgdb/fbsd-threads.c
  projects/zfsd/head/include/Makefile
  projects/zfsd/head/include/dirent.h
  projects/zfsd/head/include/malloc_np.h
  projects/zfsd/head/include/protocols/dumprestore.h
  projects/zfsd/head/lib/Makefile
  projects/zfsd/head/lib/bind/dns/code.h
  projects/zfsd/head/lib/bind/dns/dns/enumtype.h
  projects/zfsd/head/lib/bind/dns/dns/rdatastruct.h
  projects/zfsd/head/lib/clang/include/clang/Basic/Version.inc
  projects/zfsd/head/lib/clang/include/llvm/Config/config.h
  projects/zfsd/head/lib/libc/Makefile
  projects/zfsd/head/lib/libc/gen/Makefile.inc
  projects/zfsd/head/lib/libc/gen/Symbol.map
  projects/zfsd/head/lib/libc/gen/closedir.c
  projects/zfsd/head/lib/libc/gen/fts-compat.c
  projects/zfsd/head/lib/libc/gen/fts.c
  projects/zfsd/head/lib/libc/gen/getcwd.c
  projects/zfsd/head/lib/libc/gen/getnetgrent.c
  projects/zfsd/head/lib/libc/gen/opendir.c
  projects/zfsd/head/lib/libc/gen/readdir.c
  projects/zfsd/head/lib/libc/gen/rewinddir.c
  projects/zfsd/head/lib/libc/gen/seekdir.c
  projects/zfsd/head/lib/libc/gen/telldir.c
  projects/zfsd/head/lib/libc/net/if_indextoname.c
  projects/zfsd/head/lib/libc/net/if_nameindex.c
  projects/zfsd/head/lib/libc/net/if_nametoindex.c
  projects/zfsd/head/lib/libc/net/nsparser.y
  projects/zfsd/head/lib/libc/net/sctp_sys_calls.c
  projects/zfsd/head/lib/libc/net/sourcefilter.c
  projects/zfsd/head/lib/libc/powerpc/Symbol.map
  projects/zfsd/head/lib/libc/powerpc/gen/Makefile.inc
  projects/zfsd/head/lib/libc/stdio/Makefile.inc
  projects/zfsd/head/lib/libc/stdio/fpurge.c
  projects/zfsd/head/lib/libc/sys/lseek.2
  projects/zfsd/head/lib/libcompiler_rt/Makefile
  projects/zfsd/head/lib/libfetch/common.c
  projects/zfsd/head/lib/libjail/jail.c
  projects/zfsd/head/lib/libkiconv/Makefile
  projects/zfsd/head/lib/libkiconv/xlat16_iconv.c
  projects/zfsd/head/lib/libmagic/Makefile
  projects/zfsd/head/lib/libmagic/config.h
  projects/zfsd/head/lib/libpam/libpam/Makefile
  projects/zfsd/head/lib/libpam/modules/pam_exec/pam_exec.8
  projects/zfsd/head/lib/libpam/modules/pam_ssh/pam_ssh.c
  projects/zfsd/head/lib/libprocstat/cd9660.c
  projects/zfsd/head/lib/libprocstat/common_kvm.c
  projects/zfsd/head/lib/libstand/Makefile
  projects/zfsd/head/lib/libstand/bswap.c
  projects/zfsd/head/lib/libstand/stand.h
  projects/zfsd/head/lib/libthr/thread/thr_mutex.c
  projects/zfsd/head/lib/libusbhid/parse.c
  projects/zfsd/head/lib/msun/src/math.h
  projects/zfsd/head/libexec/rbootd/rbootd.8
  projects/zfsd/head/libexec/tftpd/Makefile
  projects/zfsd/head/libexec/tftpd/tftpd.8
  projects/zfsd/head/sbin/Makefile
  projects/zfsd/head/sbin/atacontrol/atacontrol.8
  projects/zfsd/head/sbin/camcontrol/camcontrol.c
  projects/zfsd/head/sbin/devd/parse.y
  projects/zfsd/head/sbin/dump/dump.8
  projects/zfsd/head/sbin/etherswitchcfg/etherswitchcfg.8
  projects/zfsd/head/sbin/fsck_msdosfs/main.c
  projects/zfsd/head/sbin/geom/class/part/gpart.8
  projects/zfsd/head/sbin/geom/class/raid/graid.8
  projects/zfsd/head/sbin/geom/class/virstor/gvirstor.8
  projects/zfsd/head/sbin/gvinum/gvinum.8
  projects/zfsd/head/sbin/hastctl/hastctl.8
  projects/zfsd/head/sbin/hastd/hast.h
  projects/zfsd/head/sbin/hastd/hastd.8
  projects/zfsd/head/sbin/hastd/parse.y
  projects/zfsd/head/sbin/ifconfig/ifconfig.8
  projects/zfsd/head/sbin/ifconfig/ifconfig.c
  projects/zfsd/head/sbin/ifconfig/iflagg.c
  projects/zfsd/head/sbin/init/init.c
  projects/zfsd/head/sbin/mount/mount.8
  projects/zfsd/head/sbin/natd/natd.8
  projects/zfsd/head/sbin/restore/restore.8
  projects/zfsd/head/sbin/restore/utilities.c
  projects/zfsd/head/sbin/shutdown/shutdown.c
  projects/zfsd/head/share/Makefile
  projects/zfsd/head/share/examples/csh/dot.cshrc
  projects/zfsd/head/share/man/man4/Makefile
  projects/zfsd/head/share/man/man4/siftr.4
  projects/zfsd/head/share/man/man4/vlan.4
  projects/zfsd/head/share/man/man5/Makefile
  projects/zfsd/head/share/man/man5/devfs.conf.5
  projects/zfsd/head/share/man/man5/devfs.rules.5
  projects/zfsd/head/share/man/man5/periodic.conf.5
  projects/zfsd/head/share/man/man5/src.conf.5
  projects/zfsd/head/share/man/man7/c99.7
  projects/zfsd/head/share/man/man7/release.7
  projects/zfsd/head/share/man/man8/picobsd.8
  projects/zfsd/head/share/man/man8/rc.8
  projects/zfsd/head/share/man/man9/BUF_ISLOCKED.9
  projects/zfsd/head/share/man/man9/DB_COMMAND.9
  projects/zfsd/head/share/man/man9/EVENTHANDLER.9
  projects/zfsd/head/share/man/man9/VOP_GETEXTATTR.9
  projects/zfsd/head/share/man/man9/VOP_GETPAGES.9
  projects/zfsd/head/share/man/man9/VOP_GETVOBJECT.9
  projects/zfsd/head/share/man/man9/VOP_SETEXTATTR.9
  projects/zfsd/head/share/man/man9/acl.9
  projects/zfsd/head/share/man/man9/bpf.9
  projects/zfsd/head/share/man/man9/bus_generic_print_child.9
  projects/zfsd/head/share/man/man9/bus_release_resource.9
  projects/zfsd/head/share/man/man9/bus_space.9
  projects/zfsd/head/share/man/man9/byteorder.9
  projects/zfsd/head/share/man/man9/devclass_get_maxunit.9
  projects/zfsd/head/share/man/man9/device_find_child.9
  projects/zfsd/head/share/man/man9/firmware.9
  projects/zfsd/head/share/man/man9/hashinit.9
  projects/zfsd/head/share/man/man9/ieee80211_proto.9
  projects/zfsd/head/share/man/man9/ifnet.9
  projects/zfsd/head/share/man/man9/kqueue.9
  projects/zfsd/head/share/man/man9/lock.9
  projects/zfsd/head/share/man/man9/locking.9
  projects/zfsd/head/share/man/man9/mbuf.9
  projects/zfsd/head/share/man/man9/mod_cc.9
  projects/zfsd/head/share/man/man9/netisr.9
  projects/zfsd/head/share/man/man9/pci.9
  projects/zfsd/head/share/man/man9/spl.9
  projects/zfsd/head/share/man/man9/sysctl.9
  projects/zfsd/head/share/man/man9/taskqueue.9
  projects/zfsd/head/share/man/man9/usbdi.9
  projects/zfsd/head/share/man/man9/vm_page_aflag.9
  projects/zfsd/head/share/misc/committers-doc.dot
  projects/zfsd/head/share/misc/committers-ports.dot
  projects/zfsd/head/share/misc/committers-src.dot
  projects/zfsd/head/share/mk/bsd.README
  projects/zfsd/head/share/mk/bsd.libnames.mk
  projects/zfsd/head/share/mk/bsd.own.mk
  projects/zfsd/head/sys/amd64/acpica/acpi_machdep.c
  projects/zfsd/head/sys/amd64/amd64/fpu.c
  projects/zfsd/head/sys/amd64/amd64/pmap.c
  projects/zfsd/head/sys/amd64/include/in_cksum.h
  projects/zfsd/head/sys/amd64/include/pmap.h
  projects/zfsd/head/sys/amd64/linux32/linux32_proto.h
  projects/zfsd/head/sys/amd64/linux32/linux32_syscall.h
  projects/zfsd/head/sys/amd64/linux32/linux32_syscalls.c
  projects/zfsd/head/sys/amd64/linux32/linux32_sysent.c
  projects/zfsd/head/sys/amd64/linux32/linux32_systrace_args.c
  projects/zfsd/head/sys/amd64/linux32/syscalls.master
  projects/zfsd/head/sys/arm/arm/gdb_machdep.c
  projects/zfsd/head/sys/arm/arm/machdep.c
  projects/zfsd/head/sys/arm/arm/nexus.c
  projects/zfsd/head/sys/arm/arm/pmap.c
  projects/zfsd/head/sys/arm/at91/at91.c
  projects/zfsd/head/sys/arm/at91/at91_machdep.c
  projects/zfsd/head/sys/arm/at91/at91_pmc.c
  projects/zfsd/head/sys/arm/at91/at91reg.h
  projects/zfsd/head/sys/arm/at91/at91rm92reg.h
  projects/zfsd/head/sys/arm/at91/at91sam9260reg.h
  projects/zfsd/head/sys/arm/at91/at91sam9g20reg.h
  projects/zfsd/head/sys/arm/at91/at91var.h
  projects/zfsd/head/sys/arm/at91/std.ethernut5
  projects/zfsd/head/sys/arm/at91/std.hl200
  projects/zfsd/head/sys/arm/at91/std.hl201
  projects/zfsd/head/sys/arm/at91/std.kb920x
  projects/zfsd/head/sys/arm/at91/std.qila9g20
  projects/zfsd/head/sys/arm/at91/std.sam9g20ek
  projects/zfsd/head/sys/arm/conf/DB-78XXX
  projects/zfsd/head/sys/arm/conf/DB-88F6XXX
  projects/zfsd/head/sys/arm/conf/ETHERNUT5
  projects/zfsd/head/sys/arm/conf/ETHERNUT5.hints
  projects/zfsd/head/sys/arm/conf/SHEEVAPLUG
  projects/zfsd/head/sys/arm/include/fdt.h
  projects/zfsd/head/sys/arm/include/in_cksum.h
  projects/zfsd/head/sys/arm/include/pmc_mdep.h
  projects/zfsd/head/sys/arm/mv/discovery/discovery.c
  projects/zfsd/head/sys/arm/mv/files.mv
  projects/zfsd/head/sys/arm/mv/mv_machdep.c
  projects/zfsd/head/sys/arm/mv/mvwin.h
  projects/zfsd/head/sys/boot/arm/at91/boot2/boot2.c
  projects/zfsd/head/sys/boot/arm/ixp425/boot2/boot2.c
  projects/zfsd/head/sys/boot/arm/uboot/Makefile
  projects/zfsd/head/sys/boot/arm/uboot/conf.c
  projects/zfsd/head/sys/boot/arm/uboot/ldscript.arm
  projects/zfsd/head/sys/boot/arm/uboot/version
  projects/zfsd/head/sys/boot/common/loader.8
  projects/zfsd/head/sys/boot/common/ufsread.c
  projects/zfsd/head/sys/boot/fdt/dts/db78100.dts
  projects/zfsd/head/sys/boot/fdt/dts/db88f6281.dts
  projects/zfsd/head/sys/boot/fdt/dts/p3041ds.dts
  projects/zfsd/head/sys/boot/fdt/dts/sheevaplug.dts
  projects/zfsd/head/sys/boot/fdt/fdt_loader_cmd.c
  projects/zfsd/head/sys/boot/forth/beastie.4th
  projects/zfsd/head/sys/boot/forth/beastie.4th.8
  projects/zfsd/head/sys/boot/forth/brand.4th
  projects/zfsd/head/sys/boot/forth/brand.4th.8
  projects/zfsd/head/sys/boot/forth/check-password.4th
  projects/zfsd/head/sys/boot/forth/check-password.4th.8
  projects/zfsd/head/sys/boot/forth/color.4th
  projects/zfsd/head/sys/boot/forth/color.4th.8
  projects/zfsd/head/sys/boot/forth/delay.4th
  projects/zfsd/head/sys/boot/forth/delay.4th.8
  projects/zfsd/head/sys/boot/forth/menu-commands.4th
  projects/zfsd/head/sys/boot/forth/menu.4th
  projects/zfsd/head/sys/boot/forth/menu.4th.8
  projects/zfsd/head/sys/boot/forth/shortcuts.4th
  projects/zfsd/head/sys/boot/forth/version.4th
  projects/zfsd/head/sys/boot/forth/version.4th.8
  projects/zfsd/head/sys/boot/i386/boot2/boot2.c
  projects/zfsd/head/sys/boot/i386/gptboot/gptboot.c
  projects/zfsd/head/sys/boot/i386/libi386/biospnp.c
  projects/zfsd/head/sys/boot/i386/loader/Makefile
  projects/zfsd/head/sys/boot/i386/loader/conf.c
  projects/zfsd/head/sys/boot/pc98/boot2/boot2.c
  projects/zfsd/head/sys/boot/powerpc/boot1.chrp/boot1.c
  projects/zfsd/head/sys/boot/sparc64/boot1/boot1.c
  projects/zfsd/head/sys/boot/uboot/common/metadata.c
  projects/zfsd/head/sys/boot/uboot/lib/api_public.h
  projects/zfsd/head/sys/boot/uboot/lib/copy.c
  projects/zfsd/head/sys/boot/uboot/lib/elf_freebsd.c
  projects/zfsd/head/sys/boot/uboot/lib/glue.c
  projects/zfsd/head/sys/boot/uboot/lib/libuboot.h
  projects/zfsd/head/sys/cam/ata/ata_pmp.c
  projects/zfsd/head/sys/cam/ata/ata_xpt.c
  projects/zfsd/head/sys/cam/cam_xpt.c
  projects/zfsd/head/sys/cam/scsi/scsi_ch.c
  projects/zfsd/head/sys/cam/scsi/scsi_enc.c
  projects/zfsd/head/sys/cam/scsi/scsi_enc.h
  projects/zfsd/head/sys/cam/scsi/scsi_enc_internal.h
  projects/zfsd/head/sys/cam/scsi/scsi_enc_safte.c
  projects/zfsd/head/sys/cam/scsi/scsi_enc_ses.c
  projects/zfsd/head/sys/cam/scsi/scsi_pass.c
  projects/zfsd/head/sys/cam/scsi/scsi_pt.c
  projects/zfsd/head/sys/cam/scsi/scsi_ses.h
  projects/zfsd/head/sys/cam/scsi/scsi_sg.c
  projects/zfsd/head/sys/cam/scsi/scsi_xpt.c
  projects/zfsd/head/sys/cddl/contrib/opensolaris/common/zfs/zpool_prop.c
  projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c
  projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
  projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c
  projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h
  projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
  projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c
  projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c
  projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
  projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c
  projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c
  projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c
  projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c
  projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  projects/zfsd/head/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h
  projects/zfsd/head/sys/compat/freebsd32/freebsd32.h
  projects/zfsd/head/sys/compat/freebsd32/freebsd32_misc.c
  projects/zfsd/head/sys/compat/freebsd32/freebsd32_proto.h
  projects/zfsd/head/sys/compat/freebsd32/freebsd32_syscall.h
  projects/zfsd/head/sys/compat/freebsd32/freebsd32_syscalls.c
  projects/zfsd/head/sys/compat/freebsd32/freebsd32_sysent.c
  projects/zfsd/head/sys/compat/freebsd32/freebsd32_systrace_args.c
  projects/zfsd/head/sys/compat/freebsd32/syscalls.master
  projects/zfsd/head/sys/compat/ndis/subr_ntoskrnl.c
  projects/zfsd/head/sys/conf/NOTES
  projects/zfsd/head/sys/conf/files
  projects/zfsd/head/sys/conf/files.powerpc
  projects/zfsd/head/sys/conf/options
  projects/zfsd/head/sys/conf/options.powerpc
  projects/zfsd/head/sys/contrib/dev/acpica/acpica_prep.sh
  projects/zfsd/head/sys/contrib/dev/acpica/changes.txt   (contents, props changed)
  projects/zfsd/head/sys/contrib/dev/acpica/common/adfile.c
  projects/zfsd/head/sys/contrib/dev/acpica/common/adwalk.c
  projects/zfsd/head/sys/contrib/dev/acpica/common/dmextern.c
  projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslcompile.c
  projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslcompiler.h
  projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslcompiler.l
  projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslcompiler.y
  projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslerror.c
  projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslfiles.c
  projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslmain.c
  projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslmap.c
  projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslmessages.h
  projects/zfsd/head/sys/contrib/dev/acpica/compiler/aslstartup.c
  projects/zfsd/head/sys/contrib/dev/acpica/compiler/dtio.c
  projects/zfsd/head/sys/contrib/dev/acpica/compiler/prscan.c
  projects/zfsd/head/sys/contrib/dev/acpica/compiler/prutils.c
  projects/zfsd/head/sys/contrib/dev/acpica/components/debugger/dbfileio.c
  projects/zfsd/head/sys/contrib/dev/acpica/components/dispatcher/dsfield.c
  projects/zfsd/head/sys/contrib/dev/acpica/components/events/evxface.c
  projects/zfsd/head/sys/contrib/dev/acpica/components/tables/tbfadt.c
  projects/zfsd/head/sys/contrib/dev/acpica/components/utilities/utmisc.c
  projects/zfsd/head/sys/contrib/dev/acpica/include/acobject.h
  projects/zfsd/head/sys/contrib/dev/acpica/include/acpiosxf.h
  projects/zfsd/head/sys/contrib/dev/acpica/include/acpixf.h
  projects/zfsd/head/sys/contrib/dev/acpica/include/actypes.h
  projects/zfsd/head/sys/contrib/dev/acpica/include/acutils.h
  projects/zfsd/head/sys/contrib/dev/acpica/os_specific/service_layers/osunixxf.c
  projects/zfsd/head/sys/dev/acpica/Osd/OsdSchedule.c
  projects/zfsd/head/sys/dev/acpica/acpi.c
  projects/zfsd/head/sys/dev/acpica/acpi_cpu.c
  projects/zfsd/head/sys/dev/acpica/acpi_ec.c
  projects/zfsd/head/sys/dev/acpica/acpi_smbat.c
  projects/zfsd/head/sys/dev/acpica/acpivar.h
  projects/zfsd/head/sys/dev/agp/agp.c
  projects/zfsd/head/sys/dev/agp/agp_i810.c
  projects/zfsd/head/sys/dev/agp/agp_if.m
  projects/zfsd/head/sys/dev/agp/agppriv.h
  projects/zfsd/head/sys/dev/agp/agpreg.h
  projects/zfsd/head/sys/dev/agp/agpvar.h
  projects/zfsd/head/sys/dev/ahci/ahci.c
  projects/zfsd/head/sys/dev/ata/ata-all.c
  projects/zfsd/head/sys/dev/ath/ath_hal/ah.h
  projects/zfsd/head/sys/dev/ath/ath_hal/ah_internal.h
  projects/zfsd/head/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c
  projects/zfsd/head/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c
  projects/zfsd/head/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c
  projects/zfsd/head/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c
  projects/zfsd/head/sys/dev/ath/ath_hal/ar5416/ar5416reg.h
  projects/zfsd/head/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c
  projects/zfsd/head/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c
  projects/zfsd/head/sys/dev/ath/ath_hal/ar9002/ar9287_attach.c
  projects/zfsd/head/sys/dev/ath/if_ath.c
  projects/zfsd/head/sys/dev/ath/if_ath_debug.c
  projects/zfsd/head/sys/dev/ath/if_ath_debug.h
  projects/zfsd/head/sys/dev/ath/if_ath_misc.h
  projects/zfsd/head/sys/dev/ath/if_ath_sysctl.c
  projects/zfsd/head/sys/dev/ath/if_ath_tx.c
  projects/zfsd/head/sys/dev/ath/if_athvar.h
  projects/zfsd/head/sys/dev/bce/if_bce.c
  projects/zfsd/head/sys/dev/bge/if_bge.c
  projects/zfsd/head/sys/dev/cxgb/cxgb_adapter.h
  projects/zfsd/head/sys/dev/cxgb/cxgb_sge.c
  projects/zfsd/head/sys/dev/cxgbe/adapter.h
  projects/zfsd/head/sys/dev/esp/ncr53c9x.c
  projects/zfsd/head/sys/dev/fdt/fdt_common.h
  projects/zfsd/head/sys/dev/fdt/fdt_pci.c
  projects/zfsd/head/sys/dev/hwpmc/hwpmc_arm.c
  projects/zfsd/head/sys/dev/iicbus/ds1374.c
  projects/zfsd/head/sys/dev/isci/isci.h
  projects/zfsd/head/sys/dev/isci/isci_controller.c
  projects/zfsd/head/sys/dev/isci/isci_interrupt.c
  projects/zfsd/head/sys/dev/isci/isci_io_request.c
  projects/zfsd/head/sys/dev/isci/isci_remote_device.c
  projects/zfsd/head/sys/dev/iwn/if_iwn.c
  projects/zfsd/head/sys/dev/ixgbe/ixgbe.c
  projects/zfsd/head/sys/dev/mfi/mfireg.h
  projects/zfsd/head/sys/dev/mii/ciphy.c
  projects/zfsd/head/sys/dev/mii/miidevs
  projects/zfsd/head/sys/dev/mmc/mmc.c
  projects/zfsd/head/sys/dev/mxge/eth_z8e.h
  projects/zfsd/head/sys/dev/mxge/ethp_z8e.h
  projects/zfsd/head/sys/dev/mxge/rss_eth_z8e.h
  projects/zfsd/head/sys/dev/mxge/rss_ethp_z8e.h
  projects/zfsd/head/sys/dev/pci/pci.c
  projects/zfsd/head/sys/dev/pci/vga_pci.c
  projects/zfsd/head/sys/dev/powermac_nvram/powermac_nvram.c
  projects/zfsd/head/sys/dev/puc/pucdata.c
  projects/zfsd/head/sys/dev/sec/sec.c
  projects/zfsd/head/sys/dev/sec/sec.h
  projects/zfsd/head/sys/dev/sym/sym_conf.h
  projects/zfsd/head/sys/dev/sym/sym_hipd.c
  projects/zfsd/head/sys/dev/usb/controller/ehci_pci.c
  projects/zfsd/head/sys/dev/usb/input/uhid.c
  projects/zfsd/head/sys/dev/usb/usb_hid.c
  projects/zfsd/head/sys/dev/usb/usb_transfer.c
  projects/zfsd/head/sys/dev/wbwd/wbwd.c
  projects/zfsd/head/sys/fs/ext2fs/ext2_lookup.c
  projects/zfsd/head/sys/fs/ext2fs/ext2_vnops.c
  projects/zfsd/head/sys/fs/hpfs/hpfs_vnops.c
  projects/zfsd/head/sys/fs/nfs/nfs_commonacl.c
  projects/zfsd/head/sys/fs/ntfs/ntfs.h
  projects/zfsd/head/sys/fs/ntfs/ntfs_vnops.c
  projects/zfsd/head/sys/fs/unionfs/union_subr.c
  projects/zfsd/head/sys/geom/label/g_label_ufs.c
  projects/zfsd/head/sys/geom/mirror/g_mirror.c
  projects/zfsd/head/sys/geom/mirror/g_mirror.h
  projects/zfsd/head/sys/geom/mirror/g_mirror_ctl.c
  projects/zfsd/head/sys/geom/part/g_part.c
  projects/zfsd/head/sys/geom/part/g_part.h
  projects/zfsd/head/sys/geom/part/g_part_apm.c
  projects/zfsd/head/sys/geom/part/g_part_bsd.c
  projects/zfsd/head/sys/geom/part/g_part_gpt.c
  projects/zfsd/head/sys/geom/part/g_part_vtoc8.c
  projects/zfsd/head/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c
  projects/zfsd/head/sys/i386/acpica/acpi_machdep.c
  projects/zfsd/head/sys/i386/acpica/acpi_wakecode.S
  projects/zfsd/head/sys/i386/acpica/acpi_wakeup.c
  projects/zfsd/head/sys/i386/conf/XEN
  projects/zfsd/head/sys/i386/i386/apic_vector.s
  projects/zfsd/head/sys/i386/i386/bios.c
  projects/zfsd/head/sys/i386/i386/genassym.c
  projects/zfsd/head/sys/i386/i386/initcpu.c
  projects/zfsd/head/sys/i386/i386/machdep.c
  projects/zfsd/head/sys/i386/i386/mp_machdep.c
  projects/zfsd/head/sys/i386/i386/pmap.c
  projects/zfsd/head/sys/i386/i386/swtch.s
  projects/zfsd/head/sys/i386/include/apicvar.h
  projects/zfsd/head/sys/i386/include/in_cksum.h
  projects/zfsd/head/sys/i386/include/md_var.h
  projects/zfsd/head/sys/i386/include/pcb.h
  projects/zfsd/head/sys/i386/include/pmap.h
  projects/zfsd/head/sys/i386/include/smp.h
  projects/zfsd/head/sys/i386/xen/pmap.c
  projects/zfsd/head/sys/ia64/include/in_cksum.h
  projects/zfsd/head/sys/kern/init_sysent.c
  projects/zfsd/head/sys/kern/kern_clock.c
  projects/zfsd/head/sys/kern/kern_fork.c
  projects/zfsd/head/sys/kern/kern_jail.c
  projects/zfsd/head/sys/kern/kern_kthread.c
  projects/zfsd/head/sys/kern/kern_proc.c
  projects/zfsd/head/sys/kern/kern_racct.c
  projects/zfsd/head/sys/kern/kern_shutdown.c
  projects/zfsd/head/sys/kern/kern_synch.c
  projects/zfsd/head/sys/kern/kern_thr.c
  projects/zfsd/head/sys/kern/kern_thread.c
  projects/zfsd/head/sys/kern/sched_4bsd.c
  projects/zfsd/head/sys/kern/sched_ule.c
  projects/zfsd/head/sys/kern/subr_bus.c
  projects/zfsd/head/sys/kern/subr_sleepqueue.c
  projects/zfsd/head/sys/kern/subr_smp.c
  projects/zfsd/head/sys/kern/subr_turnstile.c
  projects/zfsd/head/sys/kern/subr_witness.c
  projects/zfsd/head/sys/kern/syscalls.c
  projects/zfsd/head/sys/kern/syscalls.master
  projects/zfsd/head/sys/kern/systrace_args.c
  projects/zfsd/head/sys/kern/vfs_bio.c
  projects/zfsd/head/sys/kern/vfs_default.c
  projects/zfsd/head/sys/kern/vfs_syscalls.c
  projects/zfsd/head/sys/kern/vfs_vnops.c
  projects/zfsd/head/sys/libkern/iconv.c
  projects/zfsd/head/sys/libkern/iconv_ucs.c
  projects/zfsd/head/sys/mips/conf/RSPRO
  projects/zfsd/head/sys/mips/conf/RSPRO.hints
  projects/zfsd/head/sys/mips/include/in_cksum.h
  projects/zfsd/head/sys/modules/Makefile
  projects/zfsd/head/sys/modules/aesni/Makefile
  projects/zfsd/head/sys/modules/agp/Makefile
  projects/zfsd/head/sys/modules/ath/Makefile
  projects/zfsd/head/sys/modules/bwi/Makefile
  projects/zfsd/head/sys/modules/cxgb/cxgb/Makefile
  projects/zfsd/head/sys/modules/ixgbe/Makefile
  projects/zfsd/head/sys/net/bpf.c
  projects/zfsd/head/sys/net/bpf.h
  projects/zfsd/head/sys/net/bpf_buffer.c
  projects/zfsd/head/sys/net/bpf_buffer.h
  projects/zfsd/head/sys/net/bpf_zerocopy.c
  projects/zfsd/head/sys/net/bpfdesc.h
  projects/zfsd/head/sys/net/ieee8023ad_lacp.c
  projects/zfsd/head/sys/net/if.h
  projects/zfsd/head/sys/net/if_dl.h
  projects/zfsd/head/sys/net/if_lagg.c
  projects/zfsd/head/sys/net/if_loop.c
  projects/zfsd/head/sys/net80211/ieee80211_ht.c
  projects/zfsd/head/sys/netgraph/ng_ksocket.c
  projects/zfsd/head/sys/netinet/in.h
  projects/zfsd/head/sys/netinet/libalias/alias_sctp.h
  projects/zfsd/head/sys/netinet/sctp.h
  projects/zfsd/head/sys/netinet/sctp_asconf.c
  projects/zfsd/head/sys/netinet/sctp_asconf.h
  projects/zfsd/head/sys/netinet/sctp_auth.c
  projects/zfsd/head/sys/netinet/sctp_auth.h
  projects/zfsd/head/sys/netinet/sctp_bsd_addr.c
  projects/zfsd/head/sys/netinet/sctp_bsd_addr.h
  projects/zfsd/head/sys/netinet/sctp_cc_functions.c
  projects/zfsd/head/sys/netinet/sctp_constants.h
  projects/zfsd/head/sys/netinet/sctp_crc32.c
  projects/zfsd/head/sys/netinet/sctp_crc32.h
  projects/zfsd/head/sys/netinet/sctp_dtrace_declare.h
  projects/zfsd/head/sys/netinet/sctp_dtrace_define.h
  projects/zfsd/head/sys/netinet/sctp_header.h
  projects/zfsd/head/sys/netinet/sctp_indata.c
  projects/zfsd/head/sys/netinet/sctp_indata.h
  projects/zfsd/head/sys/netinet/sctp_input.c
  projects/zfsd/head/sys/netinet/sctp_input.h
  projects/zfsd/head/sys/netinet/sctp_lock_bsd.h
  projects/zfsd/head/sys/netinet/sctp_os.h
  projects/zfsd/head/sys/netinet/sctp_os_bsd.h
  projects/zfsd/head/sys/netinet/sctp_output.c
  projects/zfsd/head/sys/netinet/sctp_output.h
  projects/zfsd/head/sys/netinet/sctp_pcb.c
  projects/zfsd/head/sys/netinet/sctp_pcb.h
  projects/zfsd/head/sys/netinet/sctp_peeloff.c
  projects/zfsd/head/sys/netinet/sctp_peeloff.h
  projects/zfsd/head/sys/netinet/sctp_ss_functions.c
  projects/zfsd/head/sys/netinet/sctp_structs.h
  projects/zfsd/head/sys/netinet/sctp_sysctl.c
  projects/zfsd/head/sys/netinet/sctp_sysctl.h
  projects/zfsd/head/sys/netinet/sctp_timer.c
  projects/zfsd/head/sys/netinet/sctp_timer.h
  projects/zfsd/head/sys/netinet/sctp_uio.h
  projects/zfsd/head/sys/netinet/sctp_usrreq.c
  projects/zfsd/head/sys/netinet/sctp_var.h
  projects/zfsd/head/sys/netinet/sctputil.c
  projects/zfsd/head/sys/netinet/sctputil.h
  projects/zfsd/head/sys/netinet/tcp_input.c
  projects/zfsd/head/sys/netinet/tcp_lro.c
  projects/zfsd/head/sys/netinet/tcp_lro.h
  projects/zfsd/head/sys/netinet/tcp_output.c
  projects/zfsd/head/sys/netinet/tcp_subr.c
  projects/zfsd/head/sys/netinet/tcp_syncache.c
  projects/zfsd/head/sys/netinet/tcp_timewait.c
  projects/zfsd/head/sys/netinet/udp_usrreq.c
  projects/zfsd/head/sys/netinet6/icmp6.c
  projects/zfsd/head/sys/netinet6/in6.h
  projects/zfsd/head/sys/netinet6/in6_cksum.c
  projects/zfsd/head/sys/netinet6/in6_src.c
  projects/zfsd/head/sys/netinet6/ip6_forward.c
  projects/zfsd/head/sys/netinet6/ip6_input.c
  projects/zfsd/head/sys/netinet6/ip6_ipsec.c
  projects/zfsd/head/sys/netinet6/ip6_output.c
  projects/zfsd/head/sys/netinet6/ip6_var.h
  projects/zfsd/head/sys/netinet6/nd6.c
  projects/zfsd/head/sys/netinet6/route6.c
  projects/zfsd/head/sys/netinet6/scope6.c
  projects/zfsd/head/sys/netinet6/scope6_var.h
  projects/zfsd/head/sys/netinet6/sctp6_usrreq.c
  projects/zfsd/head/sys/netinet6/sctp6_var.h
  projects/zfsd/head/sys/netinet6/udp6_usrreq.c
  projects/zfsd/head/sys/pc98/pc98/machdep.c
  projects/zfsd/head/sys/powerpc/aim/mmu_oea.c
  projects/zfsd/head/sys/powerpc/aim/mmu_oea64.c
  projects/zfsd/head/sys/powerpc/booke/locore.S
  projects/zfsd/head/sys/powerpc/booke/machdep.c
  projects/zfsd/head/sys/powerpc/booke/platform_bare.c
  projects/zfsd/head/sys/powerpc/booke/pmap.c
  projects/zfsd/head/sys/powerpc/conf/MPC85XX
  projects/zfsd/head/sys/powerpc/conf/NOTES
  projects/zfsd/head/sys/powerpc/include/atomic.h
  projects/zfsd/head/sys/powerpc/include/hid.h
  projects/zfsd/head/sys/powerpc/include/in_cksum.h
  projects/zfsd/head/sys/powerpc/include/pcpu.h
  projects/zfsd/head/sys/powerpc/include/pmap.h
  projects/zfsd/head/sys/powerpc/include/profile.h
  projects/zfsd/head/sys/powerpc/include/psl.h
  projects/zfsd/head/sys/powerpc/include/pte.h
  projects/zfsd/head/sys/powerpc/include/spr.h
  projects/zfsd/head/sys/powerpc/include/tlb.h
  projects/zfsd/head/sys/powerpc/include/trap.h
  projects/zfsd/head/sys/powerpc/include/vmparam.h
  projects/zfsd/head/sys/powerpc/mpc85xx/i2c.c
  projects/zfsd/head/sys/powerpc/mpc85xx/lbc.c
  projects/zfsd/head/sys/powerpc/mpc85xx/lbc.h
  projects/zfsd/head/sys/powerpc/mpc85xx/mpc85xx.c
  projects/zfsd/head/sys/powerpc/mpc85xx/pci_fdt.c
  projects/zfsd/head/sys/powerpc/powerpc/cpu.c
  projects/zfsd/head/sys/powerpc/powerpc/db_trace.c
  projects/zfsd/head/sys/powerpc/powerpc/gdb_machdep.c
  projects/zfsd/head/sys/powerpc/powerpc/genassym.c
  projects/zfsd/head/sys/powerpc/powerpc/mmu_if.m
  projects/zfsd/head/sys/powerpc/powerpc/platform.c
  projects/zfsd/head/sys/powerpc/powerpc/pmap_dispatch.c
  projects/zfsd/head/sys/sparc64/conf/GENERIC
  projects/zfsd/head/sys/sparc64/include/in_cksum.h
  projects/zfsd/head/sys/sparc64/include/pmap.h
  projects/zfsd/head/sys/sparc64/sparc64/pmap.c
  projects/zfsd/head/sys/sparc64/sparc64/tsb.c
  projects/zfsd/head/sys/sys/agpio.h
  projects/zfsd/head/sys/sys/apm.h
  projects/zfsd/head/sys/sys/disklabel.h
  projects/zfsd/head/sys/sys/gpt.h
  projects/zfsd/head/sys/sys/iconv.h
  projects/zfsd/head/sys/sys/mbuf.h
  projects/zfsd/head/sys/sys/mount.h
  projects/zfsd/head/sys/sys/param.h
  projects/zfsd/head/sys/sys/proc.h
  projects/zfsd/head/sys/sys/sdt.h
  projects/zfsd/head/sys/sys/smp.h
  projects/zfsd/head/sys/sys/syscall.h
  projects/zfsd/head/sys/sys/syscall.mk
  projects/zfsd/head/sys/sys/syscallsubr.h
  projects/zfsd/head/sys/sys/sysproto.h
  projects/zfsd/head/sys/sys/user.h
  projects/zfsd/head/sys/sys/vnode.h
  projects/zfsd/head/sys/sys/vtoc.h
  projects/zfsd/head/sys/ufs/ffs/ffs_softdep.c
  projects/zfsd/head/sys/ufs/ufs/ufs_vnops.c
  projects/zfsd/head/sys/vm/device_pager.c
  projects/zfsd/head/sys/vm/uma_core.c
  projects/zfsd/head/sys/vm/vm_fault.c
  projects/zfsd/head/sys/vm/vm_page.c
  projects/zfsd/head/sys/vm/vm_pager.c
  projects/zfsd/head/sys/x86/include/_limits.h
  projects/zfsd/head/sys/x86/include/_stdint.h
  projects/zfsd/head/sys/x86/include/_types.h
  projects/zfsd/head/sys/x86/include/float.h
  projects/zfsd/head/sys/x86/include/ptrace.h
  projects/zfsd/head/tools/build/options/makeman
  projects/zfsd/head/tools/regression/sysvmsg/msgtest.c
  projects/zfsd/head/tools/regression/sysvsem/semtest.c
  projects/zfsd/head/tools/regression/sysvshm/shmtest.c
  projects/zfsd/head/usr.bin/Makefile
  projects/zfsd/head/usr.bin/ar/acpyacc.y
  projects/zfsd/head/usr.bin/bc/bc.y
  projects/zfsd/head/usr.bin/chat/chat.c
  projects/zfsd/head/usr.bin/ctlstat/ctlstat.8
  projects/zfsd/head/usr.bin/fetch/fetch.1
  projects/zfsd/head/usr.bin/find/getdate.y
  projects/zfsd/head/usr.bin/fstat/Makefile
  projects/zfsd/head/usr.bin/fstat/fstat.c
  projects/zfsd/head/usr.bin/gprof/lookup.c
  projects/zfsd/head/usr.bin/join/join.1
  projects/zfsd/head/usr.bin/kdump/mkioctls
  projects/zfsd/head/usr.bin/lastcomm/lastcomm.1
  projects/zfsd/head/usr.bin/lastcomm/lastcomm.c
  projects/zfsd/head/usr.bin/lex/lex.1
  projects/zfsd/head/usr.bin/m4/parser.y
  projects/zfsd/head/usr.bin/mail/popen.c
  projects/zfsd/head/usr.bin/minigzip/minigzip.1
  projects/zfsd/head/usr.bin/mkcsmapper/ldef.h
  projects/zfsd/head/usr.bin/mklocale/extern.h
  projects/zfsd/head/usr.bin/procstat/Makefile
  projects/zfsd/head/usr.bin/sockstat/sockstat.1
  projects/zfsd/head/usr.bin/sockstat/sockstat.c
  projects/zfsd/head/usr.bin/sort/bwstring.c
  projects/zfsd/head/usr.bin/sort/file.c
  projects/zfsd/head/usr.bin/sort/file.h
  projects/zfsd/head/usr.bin/sort/radixsort.c
  projects/zfsd/head/usr.bin/sort/sort.1.in
  projects/zfsd/head/usr.bin/sort/sort.c
  projects/zfsd/head/usr.bin/sort/sort.h
  projects/zfsd/head/usr.bin/unzip/unzip.c
  projects/zfsd/head/usr.bin/usbhidctl/usbhid.c
  projects/zfsd/head/usr.bin/usbhidctl/usbhidctl.1
  projects/zfsd/head/usr.bin/yacc/Makefile
  projects/zfsd/head/usr.sbin/Makefile
  projects/zfsd/head/usr.sbin/acpi/acpidump/acpi.c
  projects/zfsd/head/usr.sbin/bluetooth/bthidd/parser.y
  projects/zfsd/head/usr.sbin/bluetooth/hcsecd/parser.y
  projects/zfsd/head/usr.sbin/config/config.h
  projects/zfsd/head/usr.sbin/config/main.c
  projects/zfsd/head/usr.sbin/cpucontrol/cpucontrol.8
  projects/zfsd/head/usr.sbin/cpucontrol/cpucontrol.c
  projects/zfsd/head/usr.sbin/ctladm/ctladm.8
  projects/zfsd/head/usr.sbin/fifolog/lib/getdate.y
  projects/zfsd/head/usr.sbin/flowctl/flowctl.8
  projects/zfsd/head/usr.sbin/freebsd-update/freebsd-update.8
  projects/zfsd/head/usr.sbin/i2c/i2c.8
  projects/zfsd/head/usr.sbin/jail/command.c
  projects/zfsd/head/usr.sbin/jail/config.c
  projects/zfsd/head/usr.sbin/jail/jail.8
  projects/zfsd/head/usr.sbin/jail/jail.c
  projects/zfsd/head/usr.sbin/jail/jail.conf.5
  projects/zfsd/head/usr.sbin/jail/jailp.h
  projects/zfsd/head/usr.sbin/lpr/common_source/common.c
  projects/zfsd/head/usr.sbin/lpr/lpr/lpr.c
  projects/zfsd/head/usr.sbin/mfiutil/mfi_show.c
  projects/zfsd/head/usr.sbin/mptutil/mpt_show.c
  projects/zfsd/head/usr.sbin/newsyslog/newsyslog.c
  projects/zfsd/head/usr.sbin/pkg/pkg.c
  projects/zfsd/head/usr.sbin/pkg_install/lib/exec.c
  projects/zfsd/head/usr.sbin/pkg_install/lib/msg.c
  projects/zfsd/head/usr.sbin/ppp/throughput.c
  projects/zfsd/head/usr.sbin/rpc.lockd/kern.c
  projects/zfsd/head/usr.sbin/rtadvctl/rtadvctl.8
  projects/zfsd/head/usr.sbin/rtadvd/rtadvd.8
  projects/zfsd/head/usr.sbin/smbmsg/smbmsg.8
  projects/zfsd/head/usr.sbin/tcpdump/tcpdump/Makefile
  projects/zfsd/head/usr.sbin/tcpdump/tcpdump/config.h
  projects/zfsd/head/usr.sbin/tcpdump/tcpdump/tcpdump.1
  projects/zfsd/head/usr.sbin/utx/utx.8
  projects/zfsd/head/usr.sbin/wpa/hostapd/hostapd.conf.5
  projects/zfsd/head/usr.sbin/wpa/ndis_events/ndis_events.8
Directory Properties:
  projects/zfsd/head/   (props changed)
  projects/zfsd/head/cddl/contrib/opensolaris/   (props changed)
  projects/zfsd/head/contrib/bind9/   (props changed)
  projects/zfsd/head/contrib/com_err/   (props changed)
  projects/zfsd/head/contrib/gcc/   (props changed)
  projects/zfsd/head/contrib/groff/   (props changed)
  projects/zfsd/head/contrib/llvm/   (props changed)
  projects/zfsd/head/contrib/llvm/tools/clang/   (props changed)
  projects/zfsd/head/contrib/ncurses/   (props changed)
  projects/zfsd/head/contrib/openpam/   (props changed)
  projects/zfsd/head/contrib/tcpdump/   (props changed)
  projects/zfsd/head/crypto/openssh/   (props changed)
  projects/zfsd/head/gnu/lib/   (props changed)
  projects/zfsd/head/gnu/usr.bin/gdb/   (props changed)
  projects/zfsd/head/lib/libc/   (props changed)
  projects/zfsd/head/sbin/   (props changed)
  projects/zfsd/head/share/man/man4/   (props changed)
  projects/zfsd/head/sys/   (props changed)
  projects/zfsd/head/sys/boot/   (props changed)
  projects/zfsd/head/sys/boot/powerpc/boot1.chrp/   (props changed)
  projects/zfsd/head/sys/cddl/contrib/opensolaris/   (props changed)
  projects/zfsd/head/sys/conf/   (props changed)
  projects/zfsd/head/sys/contrib/dev/acpica/   (props changed)
  projects/zfsd/head/sys/contrib/dev/acpica/common/   (props changed)
  projects/zfsd/head/sys/contrib/dev/acpica/compiler/   (props changed)
  projects/zfsd/head/sys/contrib/dev/acpica/components/debugger/   (props changed)
  projects/zfsd/head/sys/contrib/dev/acpica/components/dispatcher/   (props changed)
  projects/zfsd/head/sys/contrib/dev/acpica/components/events/   (props changed)
  projects/zfsd/head/sys/contrib/dev/acpica/components/tables/   (props changed)
  projects/zfsd/head/sys/contrib/dev/acpica/components/utilities/   (props changed)
  projects/zfsd/head/sys/contrib/dev/acpica/include/   (props changed)
  projects/zfsd/head/sys/contrib/dev/acpica/os_specific/   (props changed)
  projects/zfsd/head/usr.bin/procstat/   (props changed)
  projects/zfsd/head/usr.sbin/jail/   (props changed)
  projects/zfsd/head/usr.sbin/rtadvctl/   (props changed)
  projects/zfsd/head/usr.sbin/rtadvd/   (props changed)

Modified: projects/zfsd/head/Makefile.inc1
==============================================================================
--- projects/zfsd/head/Makefile.inc1	Wed May 30 05:42:40 2012	(r236294)
+++ projects/zfsd/head/Makefile.inc1	Wed May 30 05:59:45 2012	(r236295)
@@ -978,8 +978,8 @@ update:
 # legacy: Build compatibility shims for the next three targets
 #
 legacy:
-.if ${BOOTSTRAPPING} < 800107 && ${BOOTSTRAPPING} != 0
-	@echo "ERROR: Source upgrades from versions prior to 8.0 not supported."; \
+.if ${BOOTSTRAPPING} < 700055 && ${BOOTSTRAPPING} != 0
+	@echo "ERROR: Source upgrades from versions prior to 7.0 not supported."; \
 	false
 .endif
 .for _tool in tools/build
@@ -1007,12 +1007,23 @@ _gperf=		gnu/usr.bin/gperf
 _groff=		gnu/usr.bin/groff
 .endif
 
+.if ${BOOTSTRAPPING} < 800022
+_ar=		usr.bin/ar
+.endif
+
+.if ${BOOTSTRAPPING} < 800013
+_mklocale=	usr.bin/mklocale
+.endif
+
 .if ${BOOTSTRAPPING} < 900002
 _sed=		usr.bin/sed
 .endif
 
 .if ${BOOTSTRAPPING} < 900006
 _lex=		usr.bin/lex
+.endif
+
+.if ${BOOTSTRAPPING} < 1000013
 _yacc=		usr.bin/yacc
 .endif
 
@@ -1020,7 +1031,7 @@ _yacc=		usr.bin/yacc
 _awk=		usr.bin/awk
 .endif
 
-.if ${MK_BSNMP} != "no" &&  !exists(/usr/sbin/gensnmptree)
+.if ${MK_BSNMP} != "no" && !exists(/usr/sbin/gensnmptree)
 _gensnmptree=	usr.sbin/bsnmpd/gensnmptree
 .endif
 
@@ -1034,7 +1045,9 @@ _clang_tblgen= \
 
 # dtrace tools are required for older bootstrap env and cross-build
 .if ${MK_CDDL} != "no" && \
-    (${MACHINE} != ${TARGET} || ${MACHINE_ARCH} != ${TARGET_ARCH})
+    ((${BOOTSTRAPPING} < 800038 && \
+          !(${BOOTSTRAPPING} >= 700112 && ${BOOTSTRAPPING} < 799999)) \
+      || (${MACHINE} != ${TARGET} || ${MACHINE_ARCH} != ${TARGET_ARCH}))
 _dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf lib/libelf \
     lib/libdwarf cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge
 .endif
@@ -1063,14 +1076,16 @@ bootstrap-tools:
     ${_strfile} \
     ${_gperf} \
     ${_groff} \
+    ${_ar} \
     ${_dtc} \
     ${_awk} \
     usr.bin/lorder \
     usr.bin/makewhatis \
+    ${_mklocale} \
     usr.bin/rpcgen \
     ${_sed} \
-    ${_lex} \
     ${_yacc} \
+    ${_lex} \
     usr.bin/xinstall \
     ${_gensnmptree} \
     usr.sbin/config
@@ -1132,7 +1147,7 @@ build-tools:
 #
 # cross-tools: Build cross-building tools
 #
-.if ${TARGET_ARCH} != ${MACHINE_ARCH}
+.if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 800035
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
 _btxld=		usr.sbin/btxld
 .endif

Modified: projects/zfsd/head/ObsoleteFiles.inc
==============================================================================
--- projects/zfsd/head/ObsoleteFiles.inc	Wed May 30 05:42:40 2012	(r236294)
+++ projects/zfsd/head/ObsoleteFiles.inc	Wed May 30 05:59:45 2012	(r236295)
@@ -38,6 +38,8 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20120530: kde pam lives now in ports
+OLD_FILES+=/etc/pam.d/kde
 # 20120505: new clang import installed a redundant internal header
 OLD_FILES+=usr/include/clang/3.1/stdalign.h
 # 20120428: MD2 removed from libmd

Modified: projects/zfsd/head/bin/ed/Makefile
==============================================================================
--- projects/zfsd/head/bin/ed/Makefile	Wed May 30 05:42:40 2012	(r236294)
+++ projects/zfsd/head/bin/ed/Makefile	Wed May 30 05:59:45 2012	(r236295)
@@ -7,12 +7,12 @@ SRCS=	buf.c cbc.c glbl.c io.c main.c re.
 LINKS=	${BINDIR}/ed ${BINDIR}/red
 MLINKS=	ed.1 red.1
 
-.if !defined(RELEASE_CRUNCH)
-.if ${MK_OPENSSL} != "no"
+.if !defined(RELEASE_CRUNCH) && \
+	${MK_OPENSSL} != "no" && \
+	${MK_ED_CRYPTO} != "no"
 CFLAGS+=-DDES
 DPADD=	${LIBCRYPTO}
 LDADD=	-lcrypto
 .endif
-.endif
 
 .include <bsd.prog.mk>

Modified: projects/zfsd/head/bin/expr/expr.y
==============================================================================
--- projects/zfsd/head/bin/expr/expr.y	Wed May 30 05:42:40 2012	(r236294)
+++ projects/zfsd/head/bin/expr/expr.y	Wed May 30 05:59:45 2012	(r236295)
@@ -74,7 +74,6 @@ int		to_integer(struct val *);
 void		to_string(struct val *);
 int		yyerror(const char *);
 int		yylex(void);
-int		yyparse(void);
 
 %}
 

Modified: projects/zfsd/head/bin/ls/Makefile
==============================================================================
--- projects/zfsd/head/bin/ls/Makefile	Wed May 30 05:42:40 2012	(r236294)
+++ projects/zfsd/head/bin/ls/Makefile	Wed May 30 05:59:45 2012	(r236295)
@@ -1,12 +1,15 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/2/93
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=	ls
 SRCS=	cmp.c ls.c print.c util.c
 DPADD=	${LIBUTIL}
 LDADD=	-lutil
 
-.if !defined(RELEASE_CRUNCH)
+.if !defined(RELEASE_CRUNCH) && \
+	${MK_LS_COLORS} != no
 CFLAGS+= -DCOLORLS
 DPADD+=	${LIBTERMCAP}
 LDADD+=	-ltermcap

Modified: projects/zfsd/head/bin/ps/keyword.c
==============================================================================
--- projects/zfsd/head/bin/ps/keyword.c	Wed May 30 05:42:40 2012	(r236294)
+++ projects/zfsd/head/bin/ps/keyword.c	Wed May 30 05:59:45 2012	(r236295)
@@ -76,6 +76,7 @@ static VAR var[] = {
 	{"comm", "COMMAND", NULL, LJUST, ucomm, 0, CHAR, NULL, 0},
 	{"command", "COMMAND", NULL, COMM|LJUST|USER, command, 0,
 		CHAR, NULL, 0},
+	{"cow", "COW", NULL, 0, kvar, KOFF(ki_cow), UINT, "u", 0},
 	{"cpu", "CPU", NULL, 0, kvar, KOFF(ki_estcpu), UINT, "d", 0},
 	{"cputime", "", "time", 0, NULL, 0, CHAR, NULL, 0},
 	{"egid", "", "gid", 0, NULL, 0, CHAR, NULL, 0},

Modified: projects/zfsd/head/bin/ps/ps.1
==============================================================================
--- projects/zfsd/head/bin/ps/ps.1	Wed May 30 05:42:40 2012	(r236294)
+++ projects/zfsd/head/bin/ps/ps.1	Wed May 30 05:59:45 2012	(r236295)
@@ -29,7 +29,7 @@
 .\"     @(#)ps.1	8.3 (Berkeley) 4/18/94
 .\" $FreeBSD$
 .\"
-.Dd March 8, 2012
+.Dd May 20, 2012
 .Dt PS 1
 .Os
 .Sh NAME
@@ -496,6 +496,8 @@ login class
 command
 .It Cm command
 command and arguments
+.It Cm cow
+number of copy-on-write faults
 .It Cm cpu
 short-term CPU usage factor (for scheduling)
 .It Cm emul

Modified: projects/zfsd/head/bin/rcp/rcp.c
==============================================================================
--- projects/zfsd/head/bin/rcp/rcp.c	Wed May 30 05:42:40 2012	(r236294)
+++ projects/zfsd/head/bin/rcp/rcp.c	Wed May 30 05:59:45 2012	(r236295)
@@ -61,7 +61,6 @@ __FBSDID("$FreeBSD$");
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <libutil.h>
 #include <limits.h>
 #include <netdb.h>
 #include <paths.h>

Modified: projects/zfsd/head/bin/sh/Makefile
==============================================================================
--- projects/zfsd/head/bin/sh/Makefile	Wed May 30 05:42:40 2012	(r236294)
+++ projects/zfsd/head/bin/sh/Makefile	Wed May 30 05:59:45 2012	(r236295)
@@ -38,7 +38,7 @@ build-tools: mkinit mknodes mksyntax
 
 .ORDER: builtins.c builtins.h
 builtins.c builtins.h: mkbuiltins builtins.def
-	cd ${.CURDIR}; sh mkbuiltins ${.OBJDIR}
+	sh ${.CURDIR}/mkbuiltins ${.CURDIR}
 
 init.c: mkinit alias.c eval.c exec.c input.c jobs.c options.c parser.c \
 	redir.c trap.c var.c

Modified: projects/zfsd/head/bin/sh/miscbltin.c
==============================================================================
--- projects/zfsd/head/bin/sh/miscbltin.c	Wed May 30 05:42:40 2012	(r236294)
+++ projects/zfsd/head/bin/sh/miscbltin.c	Wed May 30 05:59:45 2012	(r236295)
@@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$");
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <termios.h>
 
 #include "shell.h"
 #include "options.h"

Modified: projects/zfsd/head/bin/sh/mkbuiltins
==============================================================================
--- projects/zfsd/head/bin/sh/mkbuiltins	Wed May 30 05:42:40 2012	(r236294)
+++ projects/zfsd/head/bin/sh/mkbuiltins	Wed May 30 05:59:45 2012	(r236295)
@@ -35,17 +35,17 @@
 # $FreeBSD$
 
 temp=`/usr/bin/mktemp -t ka`
-havejobs=0
-if grep '^#define[	 ]*JOBS[	 ]*1' shell.h > /dev/null
-then	havejobs=1
-fi
 havehist=1
 if [ "X$1" = "X-h" ]; then
 	havehist=0
 	shift
 fi
-objdir=$1
-exec > ${objdir}/builtins.c
+srcdir=$1
+havejobs=0
+if grep '^#define[	 ]*JOBS[	 ]*1' $srcdir/shell.h > /dev/null
+then	havejobs=1
+fi
+exec > builtins.c
 cat <<\!
 /*
  * This file was generated by the mkbuiltins program.
@@ -57,7 +57,7 @@ cat <<\!
 
 !
 awk '/^[^#]/ {if(('$havejobs' || $2 != "-j") && ('$havehist' || $2 != "-h")) \
-    print $0}' builtins.def | sed 's/-[hj]//' > $temp
+    print $0}' $srcdir/builtins.def | sed 's/-[hj]//' > $temp
 echo 'int (*const builtinfunc[])(int, char **) = {'
 awk '/^[^#]/ {	printf "\t%s,\n", $1}' $temp
 echo '};
@@ -74,7 +74,7 @@ awk '{	for (i = 2 ; i <= NF ; i++) {
 echo '	{ NULL, 0, 0 }
 };'
 
-exec > ${objdir}/builtins.h
+exec > builtins.h
 cat <<\!
 /*
  * This file was generated by the mkbuiltins program.

Modified: projects/zfsd/head/bin/uuidgen/uuidgen.1
==============================================================================
--- projects/zfsd/head/bin/uuidgen/uuidgen.1	Wed May 30 05:42:40 2012	(r236294)
+++ projects/zfsd/head/bin/uuidgen/uuidgen.1	Wed May 30 05:59:45 2012	(r236295)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 7, 2005
+.Dd May 23, 2012
 .Dt UUIDGEN 1
 .Os
 .Sh NAME
@@ -52,8 +52,11 @@ instructs
 to not generate them in batch, but one at a time.
 .It Fl n
 This option controls the number of identifiers generated.
-By default, multiple
-identifiers are generated in batch.
+By default, multiple identifiers are generated in batch.
+The upper hard limit is 2048
+.Po see
+.Xr uuidgen 2
+.Pc .
 .It Fl o
 Redirect output to
 .Ar filename

Modified: projects/zfsd/head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
==============================================================================
--- projects/zfsd/head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Wed May 30 05:42:40 2012	(r236294)
+++ projects/zfsd/head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Wed May 30 05:59:45 2012	(r236295)
@@ -3168,7 +3168,7 @@ zfs_do_rename(int argc, char **argv)
 	}
 
 	if (flags.nounmount && parents) {
-		(void) fprintf(stderr, gettext("-u and -r options are mutually "
+		(void) fprintf(stderr, gettext("-u and -p options are mutually "
 		    "exclusive\n"));
 		usage(B_FALSE);
 	}

Modified: projects/zfsd/head/cddl/contrib/opensolaris/cmd/zpool/zpool.8
==============================================================================
--- projects/zfsd/head/cddl/contrib/opensolaris/cmd/zpool/zpool.8	Wed May 30 05:42:40 2012	(r236294)
+++ projects/zfsd/head/cddl/contrib/opensolaris/cmd/zpool/zpool.8	Wed May 30 05:59:45 2012	(r236295)
@@ -537,6 +537,8 @@ value of 1.76 indicates that 1.76 units 
 for a description of the deduplication feature.
 .It Sy free
 Number of blocks within the pool that are not allocated.
+.It Sy expandsize
+This property has currently no value on FreeBSD.
 .It Sy guid
 A unique identifier for the pool.
 .It Sy health
@@ -1275,7 +1277,7 @@ Treat exported or foreign devices as ina
 .It Xo
 .Nm
 .Cm list
-.Op Fl H
+.Op Fl Hv
 .Op Fl o Ar property Ns Op , Ns Ar ...
 .Op Fl T Cm d Ns | Ns Cm u
 .Op Ar pool

Modified: projects/zfsd/head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
==============================================================================
--- projects/zfsd/head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Wed May 30 05:42:40 2012	(r236294)
+++ projects/zfsd/head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Wed May 30 05:59:45 2012	(r236295)
@@ -22,8 +22,9 @@
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2011 Nexenta Systems, Inc. All rights reserved.
- * Copyright (c) 2011 by Delphix. All rights reserved.
- * Copyright (c) 2011 Martin Matuska <mm@FreeBSD.org>. All rights reserved.
+ * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2012 by Frederik Wessels. All rights reserved.
+ * Copyright (c) 2012 Martin Matuska <mm@FreeBSD.org>. All rights reserved.
  */
 
 #include <solaris.h>
@@ -45,6 +46,7 @@
 #include <pwd.h>
 #include <zone.h>
 #include <sys/time.h>
+#include <zfs_prop.h>
 #include <sys/fs/zfs.h>
 #include <sys/stat.h>
 
@@ -69,6 +71,7 @@ static int zpool_do_status(int, char **)
 static int zpool_do_online(int, char **);
 static int zpool_do_offline(int, char **);
 static int zpool_do_clear(int, char **);
+static int zpool_do_reopen(int, char **);
 
 static int zpool_do_reguid(int, char **);
 
@@ -131,7 +134,8 @@ typedef enum {
 	HELP_GET,
 	HELP_SET,
 	HELP_SPLIT,
-	HELP_REGUID
+	HELP_REGUID,
+	HELP_REOPEN
 } zpool_help_t;
 
 
@@ -166,6 +170,7 @@ static zpool_command_t command_table[] =
 	{ "online",	zpool_do_online,	HELP_ONLINE		},
 	{ "offline",	zpool_do_offline,	HELP_OFFLINE		},
 	{ "clear",	zpool_do_clear,		HELP_CLEAR		},
+	{ "reopen",	zpool_do_reopen,	HELP_REOPEN		},
 	{ NULL },
 	{ "attach",	zpool_do_attach,	HELP_ATTACH		},
 	{ "detach",	zpool_do_detach,	HELP_DETACH		},
@@ -240,6 +245,8 @@ get_usage(zpool_help_t idx) {
 		    "[new-device]\n"));
 	case HELP_REMOVE:
 		return (gettext("\tremove <pool> <device> ...\n"));
+	case HELP_REOPEN:
+		return (""); /* Undocumented command */
 	case HELP_SCRUB:
 		return (gettext("\tscrub [-s] <pool> ...\n"));
 	case HELP_STATUS:
@@ -1616,7 +1623,7 @@ show_import(nvlist_t *config)
 	}
 
 	if (msgid != NULL)
-		(void) printf(gettext("   see: http://www.sun.com/msg/%s\n"),
+		(void) printf(gettext("   see: http://illumos.org/msg/%s\n"),
 		    msgid);
 
 	(void) printf(gettext(" config:\n\n"));
@@ -1909,7 +1916,7 @@ zpool_do_import(int argc, char **argv)
 
 	if (searchdirs == NULL) {
 		searchdirs = safe_malloc(sizeof (char *));
-		searchdirs[0] = "/dev/dsk";
+		searchdirs[0] = "/dev";
 		nsearch = 1;
 	}
 
@@ -2108,10 +2115,10 @@ error:
 }
 
 typedef struct iostat_cbdata {
-	zpool_list_t *cb_list;
-	int cb_verbose;
-	int cb_iteration;
+	boolean_t cb_verbose;
 	int cb_namewidth;
+	int cb_iteration;
+	zpool_list_t *cb_list;
 } iostat_cbdata_t;
 
 static void
@@ -2351,7 +2358,8 @@ get_namewidth(zpool_handle_t *zhp, void 
 		if (!cb->cb_verbose)
 			cb->cb_namewidth = strlen(zpool_get_name(zhp));
 		else
-			cb->cb_namewidth = max_width(zhp, nvroot, 0, 0);
+			cb->cb_namewidth = max_width(zhp, nvroot, 0,
+			    cb->cb_namewidth);
 	}
 
 	/*
@@ -2580,8 +2588,9 @@ zpool_do_iostat(int argc, char **argv)
 }
 
 typedef struct list_cbdata {
+	boolean_t	cb_verbose;
+	int		cb_namewidth;
 	boolean_t	cb_scripted;
-	boolean_t	cb_first;
 	zprop_list_t	*cb_proplist;
 } list_cbdata_t;
 
@@ -2589,16 +2598,27 @@ typedef struct list_cbdata {
  * Given a list of columns to display, output appropriate headers for each one.
  */
 static void
-print_header(zprop_list_t *pl)
+print_header(list_cbdata_t *cb)
 {
+	zprop_list_t *pl = cb->cb_proplist;
 	const char *header;
 	boolean_t first = B_TRUE;
 	boolean_t right_justify;
+	size_t width = 0;
 
 	for (; pl != NULL; pl = pl->pl_next) {
 		if (pl->pl_prop == ZPROP_INVAL)
 			continue;
 
+		width = pl->pl_width;
+		if (first && cb->cb_verbose) {
+			/*
+			 * Reset the width to accommodate the verbose listing
+			 * of devices.
+			 */
+			width = cb->cb_namewidth;
+		}
+
 		if (!first)
 			(void) printf("  ");
 		else
@@ -2610,9 +2630,10 @@ print_header(zprop_list_t *pl)
 		if (pl->pl_next == NULL && !right_justify)
 			(void) printf("%s", header);
 		else if (right_justify)
-			(void) printf("%*s", pl->pl_width, header);
+			(void) printf("%*s", width, header);
 		else
-			(void) printf("%-*s", pl->pl_width, header);
+			(void) printf("%-*s", width, header);
+
 	}
 
 	(void) printf("\n");
@@ -2623,17 +2644,28 @@ print_header(zprop_list_t *pl)
  * to the described layout.
  */
 static void
-print_pool(zpool_handle_t *zhp, zprop_list_t *pl, int scripted)
+print_pool(zpool_handle_t *zhp, list_cbdata_t *cb)
 {
+	zprop_list_t *pl = cb->cb_proplist;
 	boolean_t first = B_TRUE;
 	char property[ZPOOL_MAXPROPLEN];
 	char *propstr;
 	boolean_t right_justify;
-	int width;
+	size_t width;
 
 	for (; pl != NULL; pl = pl->pl_next) {
+
+		width = pl->pl_width;
+		if (first && cb->cb_verbose) {
+			/*
+			 * Reset the width to accommodate the verbose listing
+			 * of devices.
+			 */
+			width = cb->cb_namewidth;
+		}
+
 		if (!first) {
-			if (scripted)
+			if (cb->cb_scripted)
 				(void) printf("\t");
 			else
 				(void) printf("  ");
@@ -2643,7 +2675,10 @@ print_pool(zpool_handle_t *zhp, zprop_li
 
 		right_justify = B_FALSE;
 		if (pl->pl_prop != ZPROP_INVAL) {
-			if (zpool_get_prop(zhp, pl->pl_prop, property,
+			if (pl->pl_prop == ZPOOL_PROP_EXPANDSZ &&
+			    zpool_get_prop_int(zhp, pl->pl_prop, NULL) == 0)
+				propstr = "-";
+			else if (zpool_get_prop(zhp, pl->pl_prop, property,
 			    sizeof (property), NULL) != 0)
 				propstr = "-";
 			else
@@ -2654,14 +2689,13 @@ print_pool(zpool_handle_t *zhp, zprop_li
 			propstr = "-";
 		}
 
-		width = pl->pl_width;
 
 		/*
 		 * If this is being called in scripted mode, or if this is the
 		 * last column and it is left-justified, don't include a width
 		 * format specifier.
 		 */
-		if (scripted || (pl->pl_next == NULL && !right_justify))
+		if (cb->cb_scripted || (pl->pl_next == NULL && !right_justify))
 			(void) printf("%s", propstr);
 		else if (right_justify)
 			(void) printf("%*s", width, propstr);
@@ -2672,6 +2706,101 @@ print_pool(zpool_handle_t *zhp, zprop_li
 	(void) printf("\n");
 }
 
+static void
+print_one_column(zpool_prop_t prop, uint64_t value, boolean_t scripted)
+{
+	char propval[64];
+	boolean_t fixed;
+	size_t width = zprop_width(prop, &fixed, ZFS_TYPE_POOL);
+
+	zfs_nicenum(value, propval, sizeof (propval));
+
+	if (prop == ZPOOL_PROP_EXPANDSZ && value == 0)
+		(void) strlcpy(propval, "-", sizeof (propval));
+
+	if (scripted)
+		(void) printf("\t%s", propval);
+	else
+		(void) printf("  %*s", width, propval);
+}
+
+void
+print_list_stats(zpool_handle_t *zhp, const char *name, nvlist_t *nv,
+    list_cbdata_t *cb, int depth)
+{
+	nvlist_t **child;
+	vdev_stat_t *vs;
+	uint_t c, children;
+	char *vname;
+	boolean_t scripted = cb->cb_scripted;
+
+	verify(nvlist_lookup_uint64_array(nv, ZPOOL_CONFIG_VDEV_STATS,
+	    (uint64_t **)&vs, &c) == 0);
+
+	if (name != NULL) {
+		if (scripted)
+			(void) printf("\t%s", name);
+		else if (strlen(name) + depth > cb->cb_namewidth)
+			(void) printf("%*s%s", depth, "", name);
+		else
+			(void) printf("%*s%s%*s", depth, "", name,
+			    (int)(cb->cb_namewidth - strlen(name) - depth), "");
+
+		/* only toplevel vdevs have capacity stats */
+		if (vs->vs_space == 0) {
+			if (scripted)
+				(void) printf("\t-\t-\t-");
+			else
+				(void) printf("      -      -      -");
+		} else {
+			print_one_column(ZPOOL_PROP_SIZE, vs->vs_space,
+			    scripted);
+			print_one_column(ZPOOL_PROP_CAPACITY, vs->vs_alloc,
+			    scripted);
+			print_one_column(ZPOOL_PROP_FREE,
+			    vs->vs_space - vs->vs_alloc, scripted);
+		}
+		print_one_column(ZPOOL_PROP_EXPANDSZ, vs->vs_esize,
+		    scripted);
+		(void) printf("\n");
+	}
+
+	if (nvlist_lookup_nvlist_array(nv, ZPOOL_CONFIG_CHILDREN,
+	    &child, &children) != 0)
+		return;
+
+	for (c = 0; c < children; c++) {
+		uint64_t ishole = B_FALSE;
+
+		if (nvlist_lookup_uint64(child[c],
+		    ZPOOL_CONFIG_IS_HOLE, &ishole) == 0 && ishole)
+			continue;
+
+		vname = zpool_vdev_name(g_zfs, zhp, child[c], B_FALSE);
+		print_list_stats(zhp, vname, child[c], cb, depth + 2);
+		free(vname);
+	}
+
+	/*
+	 * Include level 2 ARC devices in iostat output
+	 */
+	if (nvlist_lookup_nvlist_array(nv, ZPOOL_CONFIG_L2CACHE,
+	    &child, &children) != 0)
+		return;
+
+	if (children > 0) {
+		(void) printf("%-*s      -      -      -      -      -      "
+		    "-\n", cb->cb_namewidth, "cache");
+		for (c = 0; c < children; c++) {
+			vname = zpool_vdev_name(g_zfs, zhp, child[c],
+			    B_FALSE);
+			print_list_stats(zhp, vname, child[c], cb, depth + 2);
+			free(vname);
+		}
+	}
+}
+
+
 /*
  * Generic callback function to list a pool.
  */
@@ -2679,14 +2808,18 @@ int
 list_callback(zpool_handle_t *zhp, void *data)
 {
 	list_cbdata_t *cbp = data;
+	nvlist_t *config;
+	nvlist_t *nvroot;
 
-	if (cbp->cb_first) {
-		if (!cbp->cb_scripted)
-			print_header(cbp->cb_proplist);
-		cbp->cb_first = B_FALSE;
-	}
+	config = zpool_get_config(zhp, NULL);
 
-	print_pool(zhp, cbp->cb_proplist, cbp->cb_scripted);
+	print_pool(zhp, cbp);
+	if (!cbp->cb_verbose)
+		return (0);
+
+	verify(nvlist_lookup_nvlist(config, ZPOOL_CONFIG_VDEV_TREE,
+	    &nvroot) == 0);
+	print_list_stats(zhp, NULL, nvroot, cbp, 0);
 
 	return (0);
 }
@@ -2710,12 +2843,15 @@ zpool_do_list(int argc, char **argv)
 	int ret;
 	list_cbdata_t cb = { 0 };
 	static char default_props[] =
-	    "name,size,allocated,free,capacity,dedupratio,health,altroot";
+	    "name,size,allocated,free,capacity,dedupratio,"
+	    "health,altroot";
 	char *props = default_props;
 	unsigned long interval = 0, count = 0;
+	zpool_list_t *list;
+	boolean_t first = B_TRUE;
 
 	/* check options */
-	while ((c = getopt(argc, argv, ":Ho:T:")) != -1) {
+	while ((c = getopt(argc, argv, ":Ho:T:v")) != -1) {
 		switch (c) {
 		case 'H':
 			cb.cb_scripted = B_TRUE;
@@ -2726,6 +2862,9 @@ zpool_do_list(int argc, char **argv)
 		case 'T':
 			get_timestamp_arg(*optarg);
 			break;
+		case 'v':
+			cb.cb_verbose = B_TRUE;
+			break;
 		case ':':
 			(void) fprintf(stderr, gettext("missing argument for "
 			    "'%c' option\n"), optopt);
@@ -2746,21 +2885,32 @@ zpool_do_list(int argc, char **argv)
 	if (zprop_get_list(g_zfs, props, &cb.cb_proplist, ZFS_TYPE_POOL) != 0)
 		usage(B_FALSE);
 
-	cb.cb_first = B_TRUE;
+	if ((list = pool_list_get(argc, argv, &cb.cb_proplist, &ret)) == NULL)
+		return (1);
+
+	if (argc == 0 && !cb.cb_scripted && pool_list_count(list) == 0) {
+		(void) printf(gettext("no pools available\n"));
+		zprop_free_list(cb.cb_proplist);
+		return (0);
+	}
 
 	for (;;) {
+		pool_list_update(list);
+
+		if (pool_list_count(list) == 0)
+			break;
+
+		cb.cb_namewidth = 0;
+		(void) pool_list_iter(list, B_FALSE, get_namewidth, &cb);
 
 		if (timestamp_fmt != NODATE)
 			print_timestamp(timestamp_fmt);
 
-		ret = for_each_pool(argc, argv, B_TRUE, &cb.cb_proplist,
-		    list_callback, &cb);
-
-		if (argc == 0 && cb.cb_first && !cb.cb_scripted) {
-			(void) printf(gettext("no pools available\n"));
-			zprop_free_list(cb.cb_proplist);
-			return (0);
+		if (!cb.cb_scripted && (first || cb.cb_verbose)) {
+			print_header(&cb);
+			first = B_FALSE;
 		}
+		ret = pool_list_iter(list, B_TRUE, list_callback, &cb);
 
 		if (interval == 0)
 			break;
@@ -3380,6 +3530,36 @@ zpool_do_reguid(int argc, char **argv)
 }
 
 
+/*
+ * zpool reopen <pool>
+ *
+ * Reopen the pool so that the kernel can update the sizes of all vdevs.
+ *
+ * NOTE: This command is currently undocumented.  If the command is ever
+ * exposed then the appropriate usage() messages will need to be made.
+ */
+int
+zpool_do_reopen(int argc, char **argv)
+{
+	int ret = 0;
+	zpool_handle_t *zhp;
+	char *pool;
+
+	argc--;
+	argv++;
+
+	if (argc != 1)
+		return (2);
+
+	pool = argv[0];
+	if ((zhp = zpool_open_canfail(g_zfs, pool)) == NULL)
+		return (1);
+
+	ret = zpool_reopen(zhp);
+	zpool_close(zhp);
+	return (ret);
+}
+
 typedef struct scrub_cbdata {
 	int	cb_type;
 	int	cb_argc;
@@ -3683,7 +3863,7 @@ print_dedup_stats(nvlist_t *config)
  *        pool: tank
  *	status: DEGRADED
  *	reason: One or more devices ...
- *         see: http://www.sun.com/msg/ZFS-xxxx-01
+ *         see: http://illumos.org/msg/ZFS-xxxx-01
  *	config:
  *		mirror		DEGRADED
  *                c1t0d0	OK
@@ -3891,7 +4071,7 @@ status_callback(zpool_handle_t *zhp, voi
 	}
 
 	if (msgid != NULL)
-		(void) printf(gettext("   see: http://www.sun.com/msg/%s\n"),
+		(void) printf(gettext("   see: http://illumos.org/msg/%s\n"),
 		    msgid);
 
 	if (config != NULL) {

Modified: projects/zfsd/head/cddl/contrib/opensolaris/cmd/ztest/ztest.c
==============================================================================
--- projects/zfsd/head/cddl/contrib/opensolaris/cmd/ztest/ztest.c	Wed May 30 05:42:40 2012	(r236294)
+++ projects/zfsd/head/cddl/contrib/opensolaris/cmd/ztest/ztest.c	Wed May 30 05:59:45 2012	(r236295)
@@ -20,8 +20,9 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2011 by Delphix. All rights reserved.
+ * Copyright (c) 2012 by Delphix. All rights reserved.
  * Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
+ * Copyright (c) 2012 Martin Matuska <mm@FreeBSD.org>.  All rights reserved.
  */
 
 /*
@@ -51,7 +52,9 @@
  *     At random times, the child self-immolates with a SIGKILL.
  *     This is the software equivalent of pulling the power cord.
  *     The parent then runs the test again, using the existing
- *     storage pool, as many times as desired.
+ *     storage pool, as many times as desired. If backwards compatability
+ *     testing is enabled ztest will sometimes run the "older" version
+ *     of ztest after a SIGKILL.
  *
  * (6) To verify that we don't have future leaks or temporal incursions,
  *     many of the functional tests record the transaction group number
@@ -68,9 +71,15 @@
  * You can ask more more vdevs [-v], datasets [-d], or threads [-t]
  * to increase the pool capacity, fanout, and overall stress level.
  *
- * The -N(okill) option will suppress kills, so each child runs to completion.
- * This can be useful when you're trying to distinguish temporal incursions
- * from plain old race conditions.
+ * Use the -k option to set the desired frequency of kills.
+ *
+ * When ztest invokes itself it passes all relevant information through a
+ * temporary file which is mmap-ed in the child process. This allows shared
+ * memory to survive the exec syscall. The ztest_shared_hdr_t struct is always
+ * stored at offset 0 of this file and contains information on the size and
+ * number of shared structures in the file. The information stored in this file
+ * must remain backwards compatible with older versions of ztest so that
+ * ztest can invoke them during backwards compatibility testing (-B).
  */
 
 #include <sys/zfs_context.h>
@@ -111,29 +120,82 @@
 #include <sys/fs/zfs.h>
 #include <libnvpair.h>
 
-static char cmdname[] = "ztest";
-static char *zopt_pool = cmdname;
-static char *progname;
-
-static uint64_t zopt_vdevs = 5;
-static uint64_t zopt_vdevtime;
-static int zopt_ashift = SPA_MINBLOCKSHIFT;
-static int zopt_mirrors = 2;
-static int zopt_raidz = 4;
-static int zopt_raidz_parity = 1;
-static size_t zopt_vdev_size = SPA_MINDEVSIZE;
-static int zopt_datasets = 7;
-static int zopt_threads = 23;
-static uint64_t zopt_passtime = 60;	/* 60 seconds */
-static uint64_t zopt_killrate = 70;	/* 70% kill rate */
-static int zopt_verbose = 0;
-static int zopt_init = 1;
-static char *zopt_dir = "/tmp";
-static uint64_t zopt_time = 300;	/* 5 minutes */
-static uint64_t zopt_maxloops = 50;	/* max loops during spa_freeze() */
+#define	ZTEST_FD_DATA 3
+#define	ZTEST_FD_RAND 4
+
+typedef struct ztest_shared_hdr {
+	uint64_t	zh_hdr_size;
+	uint64_t	zh_opts_size;
+	uint64_t	zh_size;
+	uint64_t	zh_stats_size;
+	uint64_t	zh_stats_count;
+	uint64_t	zh_ds_size;
+	uint64_t	zh_ds_count;
+} ztest_shared_hdr_t;
+
+static ztest_shared_hdr_t *ztest_shared_hdr;
+
+typedef struct ztest_shared_opts {
+	char zo_pool[MAXNAMELEN];
+	char zo_dir[MAXNAMELEN];
+	char zo_alt_ztest[MAXNAMELEN];
+	char zo_alt_libpath[MAXNAMELEN];
+	uint64_t zo_vdevs;
+	uint64_t zo_vdevtime;
+	size_t zo_vdev_size;
+	int zo_ashift;
+	int zo_mirrors;
+	int zo_raidz;
+	int zo_raidz_parity;
+	int zo_datasets;
+	int zo_threads;
+	uint64_t zo_passtime;
+	uint64_t zo_killrate;
+	int zo_verbose;
+	int zo_init;
+	uint64_t zo_time;
+	uint64_t zo_maxloops;
+	uint64_t zo_metaslab_gang_bang;
+} ztest_shared_opts_t;
+
+static const ztest_shared_opts_t ztest_opts_defaults = {
+	.zo_pool = { 'z', 't', 'e', 's', 't', '\0' },
+	.zo_dir = { '/', 't', 'm', 'p', '\0' },
+	.zo_alt_ztest = { '\0' },
+	.zo_alt_libpath = { '\0' },
+	.zo_vdevs = 5,
+	.zo_ashift = SPA_MINBLOCKSHIFT,
+	.zo_mirrors = 2,
+	.zo_raidz = 4,
+	.zo_raidz_parity = 1,
+	.zo_vdev_size = SPA_MINDEVSIZE,
+	.zo_datasets = 7,
+	.zo_threads = 23,
+	.zo_passtime = 60,		/* 60 seconds */
+	.zo_killrate = 70,		/* 70% kill rate */
+	.zo_verbose = 0,
+	.zo_init = 1,
+	.zo_time = 300,			/* 5 minutes */
+	.zo_maxloops = 50,		/* max loops during spa_freeze() */
+	.zo_metaslab_gang_bang = 32 << 10
+};
+
+extern uint64_t metaslab_gang_bang;
+extern uint64_t metaslab_df_alloc_threshold;
+
+static ztest_shared_opts_t *ztest_shared_opts;
+static ztest_shared_opts_t ztest_opts;
+
+typedef struct ztest_shared_ds {
+	uint64_t	zd_seq;
+} ztest_shared_ds_t;
+
+static ztest_shared_ds_t *ztest_shared_ds;
+#define	ZTEST_GET_SHARED_DS(d) (&ztest_shared_ds[d])
 
 #define	BT_MAGIC	0x123456789abcdefULL
-#define	MAXFAULTS() (MAX(zs->zs_mirrors, 1) * (zopt_raidz_parity + 1) - 1)
+#define	MAXFAULTS() \
+	(MAX(zs->zs_mirrors, 1) * (ztest_opts.zo_raidz_parity + 1) - 1)
 
 enum ztest_io_type {
 	ZTEST_IO_WRITE_TAG,
@@ -205,10 +267,10 @@ typedef struct ztest_od {
  * Per-dataset state.
  */
 typedef struct ztest_ds {
+	ztest_shared_ds_t *zd_shared;
 	objset_t	*zd_os;
 	rwlock_t	zd_zilog_lock;
 	zilog_t		*zd_zilog;
-	uint64_t	zd_seq;
 	ztest_od_t	*zd_od;		/* debugging aid */
 	char		zd_name[MAXNAMELEN];
 	mutex_t		zd_dirobj_lock;
@@ -225,11 +287,17 @@ typedef struct ztest_info {
 	ztest_func_t	*zi_func;	/* test function */
 	uint64_t	zi_iters;	/* iterations per execution */
 	uint64_t	*zi_interval;	/* execute every <interval> seconds */
-	uint64_t	zi_call_count;	/* per-pass count */
-	uint64_t	zi_call_time;	/* per-pass time */
-	uint64_t	zi_call_next;	/* next time to call this function */
 } ztest_info_t;
 
+typedef struct ztest_shared_callstate {
+	uint64_t	zc_count;	/* per-pass count */
+	uint64_t	zc_time;	/* per-pass time */
+	uint64_t	zc_next;	/* next time to call this function */
+} ztest_shared_callstate_t;
+
+static ztest_shared_callstate_t *ztest_shared_callstate;
+#define	ZTEST_GET_SHARED_CALLSTATE(c) (&ztest_shared_callstate[c])
+
 /*
  * Note: these aren't static because we want dladdr() to work.
  */
@@ -297,8 +365,10 @@ ztest_info_t ztest_info[] = {
 	{ ztest_dsl_dataset_promote_busy,	1,	&zopt_rarely	},
 	{ ztest_vdev_attach_detach,		1,	&zopt_rarely },
 	{ ztest_vdev_LUN_growth,		1,	&zopt_rarely	},
-	{ ztest_vdev_add_remove,		1,	&zopt_vdevtime },
-	{ ztest_vdev_aux_add_remove,		1,	&zopt_vdevtime	},
+	{ ztest_vdev_add_remove,		1,
+	    &ztest_opts.zo_vdevtime				},
+	{ ztest_vdev_aux_add_remove,		1,
+	    &ztest_opts.zo_vdevtime				},
 };
 
 #define	ZTEST_FUNCS	(sizeof (ztest_info) / sizeof (ztest_info_t))
@@ -316,8 +386,7 @@ typedef struct ztest_cb_list {
  * Stuff we need to share writably between parent and child.
  */
 typedef struct ztest_shared {
-	char		*zs_pool;
-	spa_t		*zs_spa;
+	boolean_t	zs_do_init;
 	hrtime_t	zs_proc_start;
 	hrtime_t	zs_proc_stop;
 	hrtime_t	zs_thread_start;
@@ -328,13 +397,11 @@ typedef struct ztest_shared {
 	uint64_t	zs_vdev_aux;
 	uint64_t	zs_alloc;
 	uint64_t	zs_space;
-	uint64_t	zs_guid;
-	mutex_t		zs_vdev_lock;
-	rwlock_t	zs_name_lock;
-	ztest_info_t	zs_info[ZTEST_FUNCS];
 	uint64_t	zs_splits;
 	uint64_t	zs_mirrors;
-	ztest_ds_t	zs_zd[];
+	uint64_t	zs_metaslab_sz;
+	uint64_t	zs_metaslab_df_alloc_threshold;
+	uint64_t	zs_guid;
 } ztest_shared_t;
 
 #define	ID_PARALLEL	-1ULL
@@ -342,20 +409,19 @@ typedef struct ztest_shared {
 static char ztest_dev_template[] = "%s/%s.%llua";
 static char ztest_aux_template[] = "%s/%s.%s.%llu";
 ztest_shared_t *ztest_shared;
-uint64_t *ztest_seq;
 
-static int ztest_random_fd;
-static int ztest_dump_core = 1;
+static spa_t *ztest_spa = NULL;
+static ztest_ds_t *ztest_ds;
 
+static mutex_t ztest_vdev_lock;
+static rwlock_t ztest_name_lock;
+

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201205300559.q4U5xkQ5029981>