Author: mmacy Date: Sat Oct 17 00:05:34 2020 New Revision: 366774 URL: https://svnweb.freebsd.org/changeset/base/366774
Log: Update OpenZFS to 2.0.0-rc3-gbd565f Added: vendor-sys/openzfs/dist/tests/zfs-tests/tests/functional/acl/posix-sa/ vendor-sys/openzfs/dist/tests/zfs-tests/tests/functional/acl/posix-sa/Makefile.am (contents, props changed) vendor-sys/openzfs/dist/tests/zfs-tests/tests/functional/acl/posix-sa/cleanup.ksh vendor-sys/openzfs/dist/tests/zfs-tests/tests/functional/acl/posix-sa/posix_001_pos.ksh vendor-sys/openzfs/dist/tests/zfs-tests/tests/functional/acl/posix-sa/posix_002_pos.ksh vendor-sys/openzfs/dist/tests/zfs-tests/tests/functional/acl/posix-sa/posix_003_pos.ksh vendor-sys/openzfs/dist/tests/zfs-tests/tests/functional/acl/posix-sa/posix_004_pos.ksh vendor-sys/openzfs/dist/tests/zfs-tests/tests/functional/acl/posix-sa/setup.ksh vendor-sys/openzfs/dist/tests/zfs-tests/tests/functional/acl/posix/posix_004_pos.ksh Modified: vendor-sys/openzfs/dist/CODE_OF_CONDUCT.md vendor-sys/openzfs/dist/META vendor-sys/openzfs/dist/README.md vendor-sys/openzfs/dist/cmd/arc_summary/arc_summary2 vendor-sys/openzfs/dist/cmd/arc_summary/arc_summary3 vendor-sys/openzfs/dist/cmd/dbufstat/dbufstat.in vendor-sys/openzfs/dist/cmd/zdb/zdb.c vendor-sys/openzfs/dist/cmd/zdb/zdb_il.c vendor-sys/openzfs/dist/cmd/zed/agents/zfs_agents.c vendor-sys/openzfs/dist/cmd/zed/agents/zfs_mod.c vendor-sys/openzfs/dist/cmd/zed/agents/zfs_retire.c vendor-sys/openzfs/dist/cmd/zed/zed.c vendor-sys/openzfs/dist/cmd/zed/zed.h vendor-sys/openzfs/dist/cmd/zed/zed_conf.c vendor-sys/openzfs/dist/cmd/zed/zed_conf.h vendor-sys/openzfs/dist/cmd/zed/zed_event.c vendor-sys/openzfs/dist/cmd/zed/zed_event.h vendor-sys/openzfs/dist/cmd/zed/zed_exec.c vendor-sys/openzfs/dist/cmd/zed/zed_exec.h vendor-sys/openzfs/dist/cmd/zed/zed_file.c vendor-sys/openzfs/dist/cmd/zed/zed_file.h vendor-sys/openzfs/dist/cmd/zed/zed_log.c vendor-sys/openzfs/dist/cmd/zed/zed_log.h vendor-sys/openzfs/dist/cmd/zed/zed_strings.c vendor-sys/openzfs/dist/cmd/zed/zed_strings.h vendor-sys/openzfs/dist/cmd/zvol_id/Makefile.am vendor-sys/openzfs/dist/config/kernel-bio.m4 vendor-sys/openzfs/dist/configure.ac vendor-sys/openzfs/dist/contrib/dracut/90zfs/module-setup.sh.in vendor-sys/openzfs/dist/contrib/pyzfs/README vendor-sys/openzfs/dist/contrib/pyzfs/libzfs_core/__init__.py vendor-sys/openzfs/dist/copy-builtin vendor-sys/openzfs/dist/etc/init.d/README.md vendor-sys/openzfs/dist/include/os/freebsd/linux/compiler.h vendor-sys/openzfs/dist/include/os/freebsd/spl/rpc/xdr.h vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/atomic.h vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/byteorder.h vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/ccompile.h vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/cmn_err.h vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/condvar.h vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/kmem.h vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/kmem_cache.h vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/kstat.h vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/proc.h vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/procfs_list.h vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/sig.h vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/simd_x86.h vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/sunddi.h vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/sysmacros.h vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/taskq.h vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/uio.h vendor-sys/openzfs/dist/include/os/freebsd/zfs/sys/zfs_ctldir.h vendor-sys/openzfs/dist/include/os/freebsd/zfs/sys/zfs_dir.h vendor-sys/openzfs/dist/include/os/freebsd/zfs/sys/zfs_vfsops_os.h vendor-sys/openzfs/dist/include/os/freebsd/zfs/sys/zfs_vnops.h vendor-sys/openzfs/dist/include/os/linux/spl/rpc/xdr.h vendor-sys/openzfs/dist/include/os/linux/spl/sys/acl.h vendor-sys/openzfs/dist/include/os/linux/spl/sys/atomic.h vendor-sys/openzfs/dist/include/os/linux/spl/sys/byteorder.h vendor-sys/openzfs/dist/include/os/linux/spl/sys/callb.h vendor-sys/openzfs/dist/include/os/linux/spl/sys/callo.h vendor-sys/openzfs/dist/include/os/linux/spl/sys/cmn_err.h vendor-sys/openzfs/dist/include/os/linux/spl/sys/condvar.h vendor-sys/openzfs/dist/include/os/linux/spl/sys/console.h vendor-sys/openzfs/dist/include/os/linux/spl/sys/cred.h vendor-sys/openzfs/dist/include/os/linux/spl/sys/ctype.h vendor-sys/openzfs/dist/include/os/linux/spl/sys/debug.h vendor-sys/openzfs/dist/include/os/linux/spl/sys/disp.h vendor-sys/openzfs/dist/include/os/linux/spl/sys/dkio.h vendor-sys/openzfs/dist/include/os/linux/spl/sys/fcntl.h vendor-sys/openzfs/dist/include/os/linux/spl/sys/file.h vendor-sys/openzfs/dist/include/os/linux/spl/sys/inttypes.h vendor-sys/openzfs/dist/include/os/linux/spl/sys/isa_defs.h vendor-sys/openzfs/dist/include/os/linux/spl/sys/kmem.h vendor-sys/openzfs/dist/include/os/linux/spl/sys/kmem_cache.h vendor-sys/openzfs/dist/include/os/linux/spl/sys/kstat.h vendor-sys/openzfs/dist/include/os/linux/spl/sys/list.h vendor-sys/openzfs/dist/include/os/linux/spl/sys/mod_os.h vendor-sys/openzfs/dist/include/os/linux/spl/sys/mutex.h vendor-sys/openzfs/dist/include/os/linux/spl/sys/param.h vendor-sys/openzfs/dist/include/os/linux/spl/sys/proc.h vendor-sys/openzfs/dist/include/os/linux/spl/sys/processor.h vendor-sys/openzfs/dist/include/os/linux/spl/sys/random.h vendor-sys/openzfs/dist/include/os/linux/spl/sys/rwlock.h vendor-sys/openzfs/dist/include/os/linux/spl/sys/shrinker.h vendor-sys/openzfs/dist/include/os/linux/spl/sys/sid.h vendor-sys/openzfs/dist/include/os/linux/spl/sys/signal.h vendor-sys/openzfs/dist/include/os/linux/spl/sys/simd.h vendor-sys/openzfs/dist/include/os/linux/spl/sys/stat.h vendor-sys/openzfs/dist/include/os/linux/spl/sys/strings.h vendor-sys/openzfs/dist/include/os/linux/spl/sys/sunddi.h vendor-sys/openzfs/dist/include/os/linux/spl/sys/sysmacros.h vendor-sys/openzfs/dist/include/os/linux/spl/sys/systeminfo.h vendor-sys/openzfs/dist/include/os/linux/spl/sys/taskq.h vendor-sys/openzfs/dist/include/os/linux/spl/sys/thread.h vendor-sys/openzfs/dist/include/os/linux/spl/sys/time.h vendor-sys/openzfs/dist/include/os/linux/spl/sys/timer.h vendor-sys/openzfs/dist/include/os/linux/spl/sys/tsd.h vendor-sys/openzfs/dist/include/os/linux/spl/sys/types.h vendor-sys/openzfs/dist/include/os/linux/spl/sys/types32.h vendor-sys/openzfs/dist/include/os/linux/spl/sys/uio.h vendor-sys/openzfs/dist/include/os/linux/spl/sys/user.h vendor-sys/openzfs/dist/include/os/linux/spl/sys/vfs.h vendor-sys/openzfs/dist/include/os/linux/spl/sys/vmem.h vendor-sys/openzfs/dist/include/os/linux/spl/sys/vmsystm.h vendor-sys/openzfs/dist/include/os/linux/spl/sys/vnode.h vendor-sys/openzfs/dist/include/os/linux/spl/sys/wait.h vendor-sys/openzfs/dist/include/os/linux/spl/sys/zmod.h vendor-sys/openzfs/dist/include/os/linux/spl/sys/zone.h vendor-sys/openzfs/dist/include/os/linux/zfs/sys/zfs_ctldir.h vendor-sys/openzfs/dist/include/os/linux/zfs/sys/zfs_vnops.h vendor-sys/openzfs/dist/include/sys/dmu.h vendor-sys/openzfs/dist/include/sys/mod.h vendor-sys/openzfs/dist/include/sys/nvpair.h vendor-sys/openzfs/dist/include/sys/pathname.h vendor-sys/openzfs/dist/include/sys/spa.h vendor-sys/openzfs/dist/include/sys/u8_textprep.h vendor-sys/openzfs/dist/include/sys/zfs_context.h vendor-sys/openzfs/dist/include/sys/zfs_ioctl.h vendor-sys/openzfs/dist/include/sys/zfs_znode.h vendor-sys/openzfs/dist/include/sys/zil.h vendor-sys/openzfs/dist/lib/libspl/include/os/freebsd/sys/param.h vendor-sys/openzfs/dist/lib/libspl/include/sys/acl.h vendor-sys/openzfs/dist/lib/libspl/os/freebsd/getmntany.c vendor-sys/openzfs/dist/lib/libzfs/libzfs_sendrecv.c vendor-sys/openzfs/dist/lib/libzfs/libzfs_util.c vendor-sys/openzfs/dist/lib/libzfs/os/freebsd/libzfs_compat.c vendor-sys/openzfs/dist/lib/libzfsbootenv/libzfsbootenv.pc.in vendor-sys/openzfs/dist/lib/libzutil/os/linux/zutil_import_os.c vendor-sys/openzfs/dist/man/man1/raidz_test.1 vendor-sys/openzfs/dist/man/man5/zfs-module-parameters.5 vendor-sys/openzfs/dist/man/man8/zed.8.in vendor-sys/openzfs/dist/man/man8/zfsprops.8 vendor-sys/openzfs/dist/man/man8/zpool.8 vendor-sys/openzfs/dist/module/Makefile.in vendor-sys/openzfs/dist/module/os/freebsd/spl/list.c vendor-sys/openzfs/dist/module/os/freebsd/spl/spl_kstat.c vendor-sys/openzfs/dist/module/os/freebsd/spl/spl_taskq.c vendor-sys/openzfs/dist/module/os/freebsd/zfs/kmod_core.c vendor-sys/openzfs/dist/module/os/freebsd/zfs/sysctl_os.c vendor-sys/openzfs/dist/module/os/freebsd/zfs/zfs_acl.c vendor-sys/openzfs/dist/module/os/freebsd/zfs/zfs_ctldir.c vendor-sys/openzfs/dist/module/os/freebsd/zfs/zfs_vfsops.c vendor-sys/openzfs/dist/module/os/freebsd/zfs/zfs_vnops.c vendor-sys/openzfs/dist/module/os/linux/spl/README.md vendor-sys/openzfs/dist/module/os/linux/spl/spl-atomic.c vendor-sys/openzfs/dist/module/os/linux/spl/spl-condvar.c vendor-sys/openzfs/dist/module/os/linux/spl/spl-cred.c vendor-sys/openzfs/dist/module/os/linux/spl/spl-err.c vendor-sys/openzfs/dist/module/os/linux/spl/spl-generic.c vendor-sys/openzfs/dist/module/os/linux/spl/spl-kmem-cache.c vendor-sys/openzfs/dist/module/os/linux/spl/spl-kmem.c vendor-sys/openzfs/dist/module/os/linux/spl/spl-kstat.c vendor-sys/openzfs/dist/module/os/linux/spl/spl-proc.c vendor-sys/openzfs/dist/module/os/linux/spl/spl-taskq.c vendor-sys/openzfs/dist/module/os/linux/spl/spl-thread.c vendor-sys/openzfs/dist/module/os/linux/spl/spl-tsd.c vendor-sys/openzfs/dist/module/os/linux/spl/spl-vmem.c vendor-sys/openzfs/dist/module/os/linux/spl/spl-xdr.c vendor-sys/openzfs/dist/module/os/linux/spl/spl-zlib.c vendor-sys/openzfs/dist/module/os/linux/zfs/zfs_acl.c vendor-sys/openzfs/dist/module/os/linux/zfs/zfs_ctldir.c vendor-sys/openzfs/dist/module/os/linux/zfs/zfs_dir.c vendor-sys/openzfs/dist/module/os/linux/zfs/zfs_vfsops.c vendor-sys/openzfs/dist/module/os/linux/zfs/zfs_vnops.c vendor-sys/openzfs/dist/module/unicode/u8_textprep.c vendor-sys/openzfs/dist/module/zcommon/zfs_prop.c vendor-sys/openzfs/dist/module/zfs/dmu_objset.c vendor-sys/openzfs/dist/module/zfs/dmu_redact.c vendor-sys/openzfs/dist/module/zfs/dmu_traverse.c vendor-sys/openzfs/dist/module/zfs/dmu_zfetch.c vendor-sys/openzfs/dist/module/zfs/dsl_scan.c vendor-sys/openzfs/dist/module/zfs/pathname.c vendor-sys/openzfs/dist/module/zfs/range_tree.c vendor-sys/openzfs/dist/module/zfs/spa.c vendor-sys/openzfs/dist/module/zfs/vdev.c vendor-sys/openzfs/dist/module/zfs/vdev_label.c vendor-sys/openzfs/dist/module/zfs/vdev_removal.c vendor-sys/openzfs/dist/module/zfs/zfeature.c vendor-sys/openzfs/dist/module/zfs/zfs_ioctl.c vendor-sys/openzfs/dist/module/zfs/zfs_log.c vendor-sys/openzfs/dist/module/zfs/zil.c vendor-sys/openzfs/dist/module/zstd/lib/zstd.c vendor-sys/openzfs/dist/rpm/generic/zfs-dkms.spec.in vendor-sys/openzfs/dist/rpm/generic/zfs-kmod.spec.in vendor-sys/openzfs/dist/rpm/generic/zfs.spec.in vendor-sys/openzfs/dist/rpm/redhat/zfs-kmod.spec.in vendor-sys/openzfs/dist/scripts/zimport.sh vendor-sys/openzfs/dist/tests/runfiles/common.run vendor-sys/openzfs/dist/tests/runfiles/linux.run vendor-sys/openzfs/dist/tests/zfs-tests/include/libtest.shlib vendor-sys/openzfs/dist/tests/zfs-tests/tests/functional/acl/Makefile.am vendor-sys/openzfs/dist/tests/zfs-tests/tests/functional/acl/posix/Makefile.am vendor-sys/openzfs/dist/tests/zfs-tests/tests/functional/acl/posix/posix_003_pos.ksh vendor-sys/openzfs/dist/tests/zfs-tests/tests/functional/acl/posix/setup.ksh vendor-sys/openzfs/dist/tests/zfs-tests/tests/functional/arc/dbufstats_001_pos.ksh vendor-sys/openzfs/dist/tests/zfs-tests/tests/functional/arc/dbufstats_002_pos.ksh vendor-sys/openzfs/dist/tests/zfs-tests/tests/functional/channel_program/synctask_core/tst.get_number_props.zcp vendor-sys/openzfs/dist/tests/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_test_race.ksh vendor-sys/openzfs/dist/tests/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_sparse.ksh vendor-sys/openzfs/dist/tests/zfs-tests/tests/functional/cli_user/misc/misc.cfg vendor-sys/openzfs/dist/tests/zfs-tests/tests/functional/history/history_002_pos.ksh vendor-sys/openzfs/dist/tests/zfs-tests/tests/functional/nopwrite/nopwrite_recsize.ksh vendor-sys/openzfs/dist/tests/zfs-tests/tests/functional/redacted_send/redacted_negative.ksh vendor-sys/openzfs/dist/tests/zfs-tests/tests/functional/rsend/rsend.kshlib vendor-sys/openzfs/dist/tests/zfs-tests/tests/functional/rsend/rsend_008_pos.ksh vendor-sys/openzfs/dist/tests/zfs-tests/tests/functional/rsend/rsend_012_pos.ksh vendor-sys/openzfs/dist/tests/zfs-tests/tests/functional/rsend/rsend_024_pos.ksh vendor-sys/openzfs/dist/tests/zfs-tests/tests/functional/rsend/send_freeobjects.ksh Modified: vendor-sys/openzfs/dist/CODE_OF_CONDUCT.md ============================================================================== --- vendor-sys/openzfs/dist/CODE_OF_CONDUCT.md Fri Oct 16 21:51:17 2020 (r366773) +++ vendor-sys/openzfs/dist/CODE_OF_CONDUCT.md Sat Oct 17 00:05:34 2020 (r366774) @@ -1,2 +1,2 @@ The [OpenZFS Code of Conduct](http://www.open-zfs.org/wiki/Code_of_Conduct) -applies to spaces associated with the ZFS on Linux project, including GitHub. +applies to spaces associated with the OpenZFS project, including GitHub. Modified: vendor-sys/openzfs/dist/META ============================================================================== --- vendor-sys/openzfs/dist/META Fri Oct 16 21:51:17 2020 (r366773) +++ vendor-sys/openzfs/dist/META Sat Oct 17 00:05:34 2020 (r366774) @@ -2,9 +2,9 @@ Meta: 1 Name: zfs Branch: 1.0 Version: 2.0.0 -Release: rc2 +Release: rc3 Release-Tags: relext License: CDDL Author: OpenZFS -Linux-Maximum: 5.8 +Linux-Maximum: 5.9 Linux-Minimum: 3.10 Modified: vendor-sys/openzfs/dist/README.md ============================================================================== --- vendor-sys/openzfs/dist/README.md Fri Oct 16 21:51:17 2020 (r366773) +++ vendor-sys/openzfs/dist/README.md Sat Oct 17 00:05:34 2020 (r366774) @@ -16,8 +16,8 @@ This repository contains the code for running OpenZFS # Installation -Full documentation for installing OpenZFS on your favorite Linux distribution can -be found at the [ZoL Site](https://zfsonlinux.org/). +Full documentation for installing OpenZFS on your favorite operating system can +be found at the [Getting Started Page](https://openzfs.github.io/openzfs-docs/Getting%20Started/index.html). # Contribute & Develop Modified: vendor-sys/openzfs/dist/cmd/arc_summary/arc_summary2 ============================================================================== --- vendor-sys/openzfs/dist/cmd/arc_summary/arc_summary2 Fri Oct 16 21:51:17 2020 (r366773) +++ vendor-sys/openzfs/dist/cmd/arc_summary/arc_summary2 Sat Oct 17 00:05:34 2020 (r366774) @@ -42,7 +42,7 @@ Provides basic information on the ARC, its efficiency, the L2ARC (if present), the Data Management Unit (DMU), Virtual Devices (VDEVs), and tunables. See the in-source documentation and code at -https://github.com/zfsonlinux/zfs/blob/master/module/zfs/arc.c for details. +https://github.com/openzfs/zfs/blob/master/module/zfs/arc.c for details. """ import getopt Modified: vendor-sys/openzfs/dist/cmd/arc_summary/arc_summary3 ============================================================================== --- vendor-sys/openzfs/dist/cmd/arc_summary/arc_summary3 Fri Oct 16 21:51:17 2020 (r366773) +++ vendor-sys/openzfs/dist/cmd/arc_summary/arc_summary3 Sat Oct 17 00:05:34 2020 (r366774) @@ -32,7 +32,7 @@ Provides basic information on the ARC, its efficiency, the L2ARC (if present), the Data Management Unit (DMU), Virtual Devices (VDEVs), and tunables. See the in-source documentation and code at -https://github.com/zfsonlinux/zfs/blob/master/module/zfs/arc.c for details. +https://github.com/openzfs/zfs/blob/master/module/zfs/arc.c for details. The original introduction to arc_summary can be found at http://cuddletech.com/?p=454 """ @@ -43,7 +43,7 @@ import subprocess import sys import time -DESCRIPTION = 'Print ARC and other statistics for ZFS on Linux' +DESCRIPTION = 'Print ARC and other statistics for OpenZFS' INDENT = ' '*8 LINE_LENGTH = 72 DATE_FORMAT = '%a %b %d %H:%M:%S %Y' @@ -831,7 +831,7 @@ def section_vdev(kstats_dict): # Currently [Nov 2017] the VDEV cache is disabled, because it is actually # harmful. When this is the case, we just skip the whole entry. See - # https://github.com/zfsonlinux/zfs/blob/master/module/zfs/vdev_cache.c + # https://github.com/openzfs/zfs/blob/master/module/zfs/vdev_cache.c # for details tunables = get_vdev_params() @@ -857,7 +857,7 @@ def section_vdev(kstats_dict): def section_zil(kstats_dict): """Collect information on the ZFS Intent Log. Some of the information - taken from https://github.com/zfsonlinux/zfs/blob/master/include/sys/zil.h + taken from https://github.com/openzfs/zfs/blob/master/include/sys/zil.h """ zil_stats = isolate_section('zil', kstats_dict) Modified: vendor-sys/openzfs/dist/cmd/dbufstat/dbufstat.in ============================================================================== --- vendor-sys/openzfs/dist/cmd/dbufstat/dbufstat.in Fri Oct 16 21:51:17 2020 (r366773) +++ vendor-sys/openzfs/dist/cmd/dbufstat/dbufstat.in Sat Oct 17 00:05:34 2020 (r366774) @@ -113,6 +113,21 @@ cmd = ("Usage: dbufstat [-bdhnrtvx] [-i file] [-f fiel raw = 0 +if sys.platform.startswith("freebsd"): + import io + # Requires py-sysctl on FreeBSD + import sysctl + + def default_ifile(): + dbufs = sysctl.filter("kstat.zfs.misc.dbufs")[0].value + sys.stdin = io.StringIO(dbufs) + return "-" + +elif sys.platform.startswith("linux"): + def default_ifile(): + return "/proc/spl/kstat/zfs/dbufs" + + def print_incompat_helper(incompat): cnt = 0 for key in sorted(incompat): @@ -645,7 +660,7 @@ def main(): sys.exit(1) if not ifile: - ifile = '/proc/spl/kstat/zfs/dbufs' + ifile = default_ifile() if ifile is not "-": try: Modified: vendor-sys/openzfs/dist/cmd/zdb/zdb.c ============================================================================== --- vendor-sys/openzfs/dist/cmd/zdb/zdb.c Fri Oct 16 21:51:17 2020 (r366773) +++ vendor-sys/openzfs/dist/cmd/zdb/zdb.c Sat Oct 17 00:05:34 2020 (r366774) @@ -1120,7 +1120,21 @@ dump_zap(objset_t *os, uint64_t object, void *data, si (void) zap_lookup(os, object, attr.za_name, attr.za_integer_length, attr.za_num_integers, prop); if (attr.za_integer_length == 1) { - (void) printf("%s", (char *)prop); + if (strcmp(attr.za_name, + DSL_CRYPTO_KEY_MASTER_KEY) == 0 || + strcmp(attr.za_name, + DSL_CRYPTO_KEY_HMAC_KEY) == 0 || + strcmp(attr.za_name, DSL_CRYPTO_KEY_IV) == 0 || + strcmp(attr.za_name, DSL_CRYPTO_KEY_MAC) == 0 || + strcmp(attr.za_name, DMU_POOL_CHECKSUM_SALT) == 0) { + uint8_t *u8 = prop; + + for (i = 0; i < attr.za_num_integers; i++) { + (void) printf("%02x", u8[i]); + } + } else { + (void) printf("%s", (char *)prop); + } } else { for (i = 0; i < attr.za_num_integers; i++) { switch (attr.za_integer_length) { Modified: vendor-sys/openzfs/dist/cmd/zdb/zdb_il.c ============================================================================== --- vendor-sys/openzfs/dist/cmd/zdb/zdb_il.c Fri Oct 16 21:51:17 2020 (r366773) +++ vendor-sys/openzfs/dist/cmd/zdb/zdb_il.c Sat Oct 17 00:05:34 2020 (r366774) @@ -62,9 +62,9 @@ print_log_bp(const blkptr_t *bp, const char *prefix) /* ARGSUSED */ static void -zil_prt_rec_create(zilog_t *zilog, int txtype, void *arg) +zil_prt_rec_create(zilog_t *zilog, int txtype, const void *arg) { - lr_create_t *lr = arg; + const lr_create_t *lr = arg; time_t crtime = lr->lr_crtime[0]; char *name, *link; lr_attr_t *lrattr; @@ -98,9 +98,9 @@ zil_prt_rec_create(zilog_t *zilog, int txtype, void *a /* ARGSUSED */ static void -zil_prt_rec_remove(zilog_t *zilog, int txtype, void *arg) +zil_prt_rec_remove(zilog_t *zilog, int txtype, const void *arg) { - lr_remove_t *lr = arg; + const lr_remove_t *lr = arg; (void) printf("%sdoid %llu, name %s\n", tab_prefix, (u_longlong_t)lr->lr_doid, (char *)(lr + 1)); @@ -108,9 +108,9 @@ zil_prt_rec_remove(zilog_t *zilog, int txtype, void *a /* ARGSUSED */ static void -zil_prt_rec_link(zilog_t *zilog, int txtype, void *arg) +zil_prt_rec_link(zilog_t *zilog, int txtype, const void *arg) { - lr_link_t *lr = arg; + const 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, @@ -119,9 +119,9 @@ zil_prt_rec_link(zilog_t *zilog, int txtype, void *arg /* ARGSUSED */ static void -zil_prt_rec_rename(zilog_t *zilog, int txtype, void *arg) +zil_prt_rec_rename(zilog_t *zilog, int txtype, const void *arg) { - lr_rename_t *lr = arg; + const lr_rename_t *lr = arg; char *snm = (char *)(lr + 1); char *tnm = snm + strlen(snm) + 1; @@ -148,11 +148,11 @@ zil_prt_rec_write_cb(void *data, size_t len, void *unu /* ARGSUSED */ static void -zil_prt_rec_write(zilog_t *zilog, int txtype, void *arg) +zil_prt_rec_write(zilog_t *zilog, int txtype, const void *arg) { - lr_write_t *lr = arg; + const lr_write_t *lr = arg; abd_t *data; - blkptr_t *bp = &lr->lr_blkptr; + const blkptr_t *bp = &lr->lr_blkptr; zbookmark_phys_t zb; int verbose = MAX(dump_opt['d'], dump_opt['i']); int error; @@ -211,9 +211,9 @@ out: /* ARGSUSED */ static void -zil_prt_rec_truncate(zilog_t *zilog, int txtype, void *arg) +zil_prt_rec_truncate(zilog_t *zilog, int txtype, const void *arg) { - lr_truncate_t *lr = arg; + const 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, @@ -222,9 +222,9 @@ zil_prt_rec_truncate(zilog_t *zilog, int txtype, void /* ARGSUSED */ static void -zil_prt_rec_setattr(zilog_t *zilog, int txtype, void *arg) +zil_prt_rec_setattr(zilog_t *zilog, int txtype, const void *arg) { - lr_setattr_t *lr = arg; + const lr_setattr_t *lr = arg; time_t atime = (time_t)lr->lr_atime[0]; time_t mtime = (time_t)lr->lr_mtime[0]; @@ -268,15 +268,15 @@ zil_prt_rec_setattr(zilog_t *zilog, int txtype, void * /* ARGSUSED */ static void -zil_prt_rec_acl(zilog_t *zilog, int txtype, void *arg) +zil_prt_rec_acl(zilog_t *zilog, int txtype, const void *arg) { - lr_acl_t *lr = arg; + const 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)(zilog_t *, int, void *); +typedef void (*zil_prt_rec_func_t)(zilog_t *, int, const void *); typedef struct zil_rec_info { zil_prt_rec_func_t zri_print; const char *zri_name; @@ -309,7 +309,7 @@ static zil_rec_info_t zil_rec_info[TX_MAX_TYPE] = { /* ARGSUSED */ static int -print_log_record(zilog_t *zilog, lr_t *lr, void *arg, uint64_t claim_txg) +print_log_record(zilog_t *zilog, const lr_t *lr, void *arg, uint64_t claim_txg) { int txtype; int verbose = MAX(dump_opt['d'], dump_opt['i']); @@ -343,7 +343,8 @@ print_log_record(zilog_t *zilog, lr_t *lr, void *arg, /* ARGSUSED */ static int -print_log_block(zilog_t *zilog, blkptr_t *bp, void *arg, uint64_t claim_txg) +print_log_block(zilog_t *zilog, const blkptr_t *bp, void *arg, + uint64_t claim_txg) { char blkbuf[BP_SPRINTF_LEN + 10]; int verbose = MAX(dump_opt['d'], dump_opt['i']); Modified: vendor-sys/openzfs/dist/cmd/zed/agents/zfs_agents.c ============================================================================== --- vendor-sys/openzfs/dist/cmd/zed/agents/zfs_agents.c Fri Oct 16 21:51:17 2020 (r366773) +++ vendor-sys/openzfs/dist/cmd/zed/agents/zfs_agents.c Sat Oct 17 00:05:34 2020 (r366774) @@ -177,9 +177,9 @@ zfs_agent_post_event(const char *class, const char *su } /* - * On ZFS on Linux, we don't get the expected FM_RESOURCE_REMOVED - * ereport from vdev_disk layer after a hot unplug. Fortunately we - * get a EC_DEV_REMOVE from our disk monitor and it is a suitable + * On Linux, we don't get the expected FM_RESOURCE_REMOVED ereport + * from the vdev_disk layer after a hot unplug. Fortunately we do + * get an EC_DEV_REMOVE from our disk monitor and it is a suitable * proxy so we remap it here for the benefit of the diagnosis engine. */ if ((strcmp(class, EC_DEV_REMOVE) == 0) && Modified: vendor-sys/openzfs/dist/cmd/zed/agents/zfs_mod.c ============================================================================== --- vendor-sys/openzfs/dist/cmd/zed/agents/zfs_mod.c Fri Oct 16 21:51:17 2020 (r366773) +++ vendor-sys/openzfs/dist/cmd/zed/agents/zfs_mod.c Sat Oct 17 00:05:34 2020 (r366774) @@ -63,9 +63,7 @@ * If the device could not be replaced, then the second online attempt will * trigger the FMA fault that we skipped earlier. * - * ZFS on Linux porting notes: - * Linux udev provides a disk insert for both the disk and the partition - * + * On Linux udev provides a disk insert for both the disk and the partition. */ #include <ctype.h> Modified: vendor-sys/openzfs/dist/cmd/zed/agents/zfs_retire.c ============================================================================== --- vendor-sys/openzfs/dist/cmd/zed/agents/zfs_retire.c Fri Oct 16 21:51:17 2020 (r366773) +++ vendor-sys/openzfs/dist/cmd/zed/agents/zfs_retire.c Sat Oct 17 00:05:34 2020 (r366774) @@ -364,7 +364,7 @@ zfs_retire_recv(fmd_hdl_t *hdl, fmd_event_t *ep, nvlis return; /* - * Note: on zfsonlinux statechange events are more than just + * Note: on Linux statechange events are more than just * healthy ones so we need to confirm the actual state value. */ if (strcmp(class, "resource.fs.zfs.statechange") == 0 && Modified: vendor-sys/openzfs/dist/cmd/zed/zed.c ============================================================================== --- vendor-sys/openzfs/dist/cmd/zed/zed.c Fri Oct 16 21:51:17 2020 (r366773) +++ vendor-sys/openzfs/dist/cmd/zed/zed.c Sat Oct 17 00:05:34 2020 (r366774) @@ -1,6 +1,6 @@ /* - * This file is part of the ZFS Event Daemon (ZED) - * for ZFS on Linux (ZoL) <http://zfsonlinux.org/>. + * This file is part of the ZFS Event Daemon (ZED). + * * Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049). * Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC. * Refer to the ZoL git commit log for authoritative copyright attribution. Modified: vendor-sys/openzfs/dist/cmd/zed/zed.h ============================================================================== --- vendor-sys/openzfs/dist/cmd/zed/zed.h Fri Oct 16 21:51:17 2020 (r366773) +++ vendor-sys/openzfs/dist/cmd/zed/zed.h Sat Oct 17 00:05:34 2020 (r366774) @@ -1,6 +1,6 @@ /* - * This file is part of the ZFS Event Daemon (ZED) - * for ZFS on Linux (ZoL) <http://zfsonlinux.org/>. + * This file is part of the ZFS Event Daemon (ZED). + * * Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049). * Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC. * Refer to the ZoL git commit log for authoritative copyright attribution. Modified: vendor-sys/openzfs/dist/cmd/zed/zed_conf.c ============================================================================== --- vendor-sys/openzfs/dist/cmd/zed/zed_conf.c Fri Oct 16 21:51:17 2020 (r366773) +++ vendor-sys/openzfs/dist/cmd/zed/zed_conf.c Sat Oct 17 00:05:34 2020 (r366774) @@ -1,6 +1,6 @@ /* - * This file is part of the ZFS Event Daemon (ZED) - * for ZFS on Linux (ZoL) <http://zfsonlinux.org/>. + * This file is part of the ZFS Event Daemon (ZED). + * * Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049). * Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC. * Refer to the ZoL git commit log for authoritative copyright attribution. Modified: vendor-sys/openzfs/dist/cmd/zed/zed_conf.h ============================================================================== --- vendor-sys/openzfs/dist/cmd/zed/zed_conf.h Fri Oct 16 21:51:17 2020 (r366773) +++ vendor-sys/openzfs/dist/cmd/zed/zed_conf.h Sat Oct 17 00:05:34 2020 (r366774) @@ -1,6 +1,6 @@ /* - * This file is part of the ZFS Event Daemon (ZED) - * for ZFS on Linux (ZoL) <http://zfsonlinux.org/>. + * This file is part of the ZFS Event Daemon (ZED). + * * Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049). * Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC. * Refer to the ZoL git commit log for authoritative copyright attribution. Modified: vendor-sys/openzfs/dist/cmd/zed/zed_event.c ============================================================================== --- vendor-sys/openzfs/dist/cmd/zed/zed_event.c Fri Oct 16 21:51:17 2020 (r366773) +++ vendor-sys/openzfs/dist/cmd/zed/zed_event.c Sat Oct 17 00:05:34 2020 (r366774) @@ -1,6 +1,6 @@ /* - * This file is part of the ZFS Event Daemon (ZED) - * for ZFS on Linux (ZoL) <http://zfsonlinux.org/>. + * This file is part of the ZFS Event Daemon (ZED). + * * Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049). * Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC. * Refer to the ZoL git commit log for authoritative copyright attribution. Modified: vendor-sys/openzfs/dist/cmd/zed/zed_event.h ============================================================================== --- vendor-sys/openzfs/dist/cmd/zed/zed_event.h Fri Oct 16 21:51:17 2020 (r366773) +++ vendor-sys/openzfs/dist/cmd/zed/zed_event.h Sat Oct 17 00:05:34 2020 (r366774) @@ -1,6 +1,6 @@ /* - * This file is part of the ZFS Event Daemon (ZED) - * for ZFS on Linux (ZoL) <http://zfsonlinux.org/>. + * This file is part of the ZFS Event Daemon (ZED). + * * Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049). * Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC. * Refer to the ZoL git commit log for authoritative copyright attribution. Modified: vendor-sys/openzfs/dist/cmd/zed/zed_exec.c ============================================================================== --- vendor-sys/openzfs/dist/cmd/zed/zed_exec.c Fri Oct 16 21:51:17 2020 (r366773) +++ vendor-sys/openzfs/dist/cmd/zed/zed_exec.c Sat Oct 17 00:05:34 2020 (r366774) @@ -1,6 +1,6 @@ /* - * This file is part of the ZFS Event Daemon (ZED) - * for ZFS on Linux (ZoL) <http://zfsonlinux.org/>. + * This file is part of the ZFS Event Daemon (ZED). + * * Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049). * Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC. * Refer to the ZoL git commit log for authoritative copyright attribution. Modified: vendor-sys/openzfs/dist/cmd/zed/zed_exec.h ============================================================================== --- vendor-sys/openzfs/dist/cmd/zed/zed_exec.h Fri Oct 16 21:51:17 2020 (r366773) +++ vendor-sys/openzfs/dist/cmd/zed/zed_exec.h Sat Oct 17 00:05:34 2020 (r366774) @@ -1,6 +1,6 @@ /* - * This file is part of the ZFS Event Daemon (ZED) - * for ZFS on Linux (ZoL) <http://zfsonlinux.org/>. + * This file is part of the ZFS Event Daemon (ZED). + * * Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049). * Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC. * Refer to the ZoL git commit log for authoritative copyright attribution. Modified: vendor-sys/openzfs/dist/cmd/zed/zed_file.c ============================================================================== --- vendor-sys/openzfs/dist/cmd/zed/zed_file.c Fri Oct 16 21:51:17 2020 (r366773) +++ vendor-sys/openzfs/dist/cmd/zed/zed_file.c Sat Oct 17 00:05:34 2020 (r366774) @@ -1,6 +1,6 @@ /* - * This file is part of the ZFS Event Daemon (ZED) - * for ZFS on Linux (ZoL) <http://zfsonlinux.org/>. + * This file is part of the ZFS Event Daemon (ZED). + * * Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049). * Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC. * Refer to the ZoL git commit log for authoritative copyright attribution. Modified: vendor-sys/openzfs/dist/cmd/zed/zed_file.h ============================================================================== --- vendor-sys/openzfs/dist/cmd/zed/zed_file.h Fri Oct 16 21:51:17 2020 (r366773) +++ vendor-sys/openzfs/dist/cmd/zed/zed_file.h Sat Oct 17 00:05:34 2020 (r366774) @@ -1,6 +1,6 @@ /* - * This file is part of the ZFS Event Daemon (ZED) - * for ZFS on Linux (ZoL) <http://zfsonlinux.org/>. + * This file is part of the ZFS Event Daemon (ZED). + * * Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049). * Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC. * Refer to the ZoL git commit log for authoritative copyright attribution. Modified: vendor-sys/openzfs/dist/cmd/zed/zed_log.c ============================================================================== --- vendor-sys/openzfs/dist/cmd/zed/zed_log.c Fri Oct 16 21:51:17 2020 (r366773) +++ vendor-sys/openzfs/dist/cmd/zed/zed_log.c Sat Oct 17 00:05:34 2020 (r366774) @@ -1,6 +1,6 @@ /* - * This file is part of the ZFS Event Daemon (ZED) - * for ZFS on Linux (ZoL) <http://zfsonlinux.org/>. + * This file is part of the ZFS Event Daemon (ZED). + * * Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049). * Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC. * Refer to the ZoL git commit log for authoritative copyright attribution. Modified: vendor-sys/openzfs/dist/cmd/zed/zed_log.h ============================================================================== --- vendor-sys/openzfs/dist/cmd/zed/zed_log.h Fri Oct 16 21:51:17 2020 (r366773) +++ vendor-sys/openzfs/dist/cmd/zed/zed_log.h Sat Oct 17 00:05:34 2020 (r366774) @@ -1,6 +1,6 @@ /* - * This file is part of the ZFS Event Daemon (ZED) - * for ZFS on Linux (ZoL) <http://zfsonlinux.org/>. + * This file is part of the ZFS Event Daemon (ZED). + * * Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049). * Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC. * Refer to the ZoL git commit log for authoritative copyright attribution. Modified: vendor-sys/openzfs/dist/cmd/zed/zed_strings.c ============================================================================== --- vendor-sys/openzfs/dist/cmd/zed/zed_strings.c Fri Oct 16 21:51:17 2020 (r366773) +++ vendor-sys/openzfs/dist/cmd/zed/zed_strings.c Sat Oct 17 00:05:34 2020 (r366774) @@ -1,6 +1,6 @@ /* - * This file is part of the ZFS Event Daemon (ZED) - * for ZFS on Linux (ZoL) <http://zfsonlinux.org/>. + * This file is part of the ZFS Event Daemon (ZED). + * * Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049). * Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC. * Refer to the ZoL git commit log for authoritative copyright attribution. Modified: vendor-sys/openzfs/dist/cmd/zed/zed_strings.h ============================================================================== --- vendor-sys/openzfs/dist/cmd/zed/zed_strings.h Fri Oct 16 21:51:17 2020 (r366773) +++ vendor-sys/openzfs/dist/cmd/zed/zed_strings.h Sat Oct 17 00:05:34 2020 (r366774) @@ -1,6 +1,6 @@ /* - * This file is part of the ZFS Event Daemon (ZED) - * for ZFS on Linux (ZoL) <http://zfsonlinux.org/>. + * This file is part of the ZFS Event Daemon (ZED). + * * Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049). * Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC. * Refer to the ZoL git commit log for authoritative copyright attribution. Modified: vendor-sys/openzfs/dist/cmd/zvol_id/Makefile.am ============================================================================== --- vendor-sys/openzfs/dist/cmd/zvol_id/Makefile.am Fri Oct 16 21:51:17 2020 (r366773) +++ vendor-sys/openzfs/dist/cmd/zvol_id/Makefile.am Sat Oct 17 00:05:34 2020 (r366774) @@ -1,7 +1,7 @@ include $(top_srcdir)/config/Rules.am # Disable GCC stack protection for zvol_id. This is a kludge and should be -# removed once https://github.com/zfsonlinux/zfs/issues/569 is resolved. +# removed once https://github.com/openzfs/zfs/issues/569 is resolved. AM_CFLAGS += -fno-stack-protector udev_PROGRAMS = zvol_id Modified: vendor-sys/openzfs/dist/config/kernel-bio.m4 ============================================================================== --- vendor-sys/openzfs/dist/config/kernel-bio.m4 Fri Oct 16 21:51:17 2020 (r366773) +++ vendor-sys/openzfs/dist/config/kernel-bio.m4 Sat Oct 17 00:05:34 2020 (r366774) @@ -344,7 +344,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_BLKG_TRYGET], [ #include <linux/bio.h> #include <linux/fs.h> ],[ - struct blkcg_gq blkg __attribute__ ((unused)); + struct blkcg_gq blkg __attribute__ ((unused)) = {}; bool rc __attribute__ ((unused)); rc = blkg_tryget(&blkg); ], [], [$ZFS_META_LICENSE]) Modified: vendor-sys/openzfs/dist/configure.ac ============================================================================== --- vendor-sys/openzfs/dist/configure.ac Fri Oct 16 21:51:17 2020 (r366773) +++ vendor-sys/openzfs/dist/configure.ac Sat Oct 17 00:05:34 2020 (r366774) @@ -237,6 +237,7 @@ AC_CONFIG_FILES([ tests/zfs-tests/tests/functional/Makefile tests/zfs-tests/tests/functional/acl/Makefile tests/zfs-tests/tests/functional/acl/posix/Makefile + tests/zfs-tests/tests/functional/acl/posix-sa/Makefile tests/zfs-tests/tests/functional/alloc_class/Makefile tests/zfs-tests/tests/functional/arc/Makefile tests/zfs-tests/tests/functional/atime/Makefile Modified: vendor-sys/openzfs/dist/contrib/dracut/90zfs/module-setup.sh.in ============================================================================== --- vendor-sys/openzfs/dist/contrib/dracut/90zfs/module-setup.sh.in Fri Oct 16 21:51:17 2020 (r366773) +++ vendor-sys/openzfs/dist/contrib/dracut/90zfs/module-setup.sh.in Sat Oct 17 00:05:34 2020 (r366774) @@ -41,7 +41,8 @@ install() { dracut_install @bindir@/zgenhostid dracut_install @sbindir@/zfs dracut_install @sbindir@/zpool - # Workaround for zfsonlinux/zfs#4749 by ensuring libgcc_s.so(.1) is included + # Workaround for https://github.com/openzfs/zfs/issues/4749 by + # ensuring libgcc_s.so(.1) is included if [[ -n "$(ldd @sbindir@/zpool | grep -F 'libgcc_s.so')" ]]; then # Dracut will have already tracked and included it :; Modified: vendor-sys/openzfs/dist/contrib/pyzfs/README ============================================================================== --- vendor-sys/openzfs/dist/contrib/pyzfs/README Fri Oct 16 21:51:17 2020 (r366773) +++ vendor-sys/openzfs/dist/contrib/pyzfs/README Sat Oct 17 00:05:34 2020 (r366774) @@ -25,4 +25,4 @@ a temporary directory specified by, for instance, TMP variable on a memory backed filesystem. Package documentation: http://pyzfs.readthedocs.org -Package development: https://github.com/zfsonlinux/zfs +Package development: https://github.com/openzfs/zfs Modified: vendor-sys/openzfs/dist/contrib/pyzfs/libzfs_core/__init__.py ============================================================================== --- vendor-sys/openzfs/dist/contrib/pyzfs/libzfs_core/__init__.py Fri Oct 16 21:51:17 2020 (r366773) +++ vendor-sys/openzfs/dist/contrib/pyzfs/libzfs_core/__init__.py Sat Oct 17 00:05:34 2020 (r366774) @@ -32,7 +32,7 @@ of the error codes to the exceptions by interpreting a in which the error code is produced. To submit an issue or contribute to development of this package -please visit its `GitHub repository <https://github.com/zfsonlinux/zfs>`_. +please visit its `GitHub repository <https://github.com/openzfs/zfs>`_. .. data:: MAXNAMELEN Modified: vendor-sys/openzfs/dist/copy-builtin ============================================================================== --- vendor-sys/openzfs/dist/copy-builtin Fri Oct 16 21:51:17 2020 (r366773) +++ vendor-sys/openzfs/dist/copy-builtin Sat Oct 17 00:05:34 2020 (r366774) @@ -35,9 +35,9 @@ config ZFS select ZLIB_INFLATE select ZLIB_DEFLATE help - This is the ZFS filesystem from the ZFS On Linux project. + This is the ZFS filesystem from the OpenZFS project. - See https://zfsonlinux.org/ + See https://github.com/openzfs/zfs To compile this file system support as a module, choose M here. Modified: vendor-sys/openzfs/dist/etc/init.d/README.md ============================================================================== --- vendor-sys/openzfs/dist/etc/init.d/README.md Fri Oct 16 21:51:17 2020 (r366773) +++ vendor-sys/openzfs/dist/etc/init.d/README.md Sat Oct 17 00:05:34 2020 (r366774) @@ -16,7 +16,7 @@ DESCRIPTION SUPPORT If you find that they don't work for your platform, please report this - at the ZFS On Linux issue tracker at https://github.com/zfsonlinux/zfs/issues. + at the OpenZFS issue tracker at https://github.com/openzfs/zfs/issues. Please include: Modified: vendor-sys/openzfs/dist/include/os/freebsd/linux/compiler.h ============================================================================== --- vendor-sys/openzfs/dist/include/os/freebsd/linux/compiler.h Fri Oct 16 21:51:17 2020 (r366773) +++ vendor-sys/openzfs/dist/include/os/freebsd/linux/compiler.h Sat Oct 17 00:05:34 2020 (r366774) @@ -68,7 +68,7 @@ #define noinline __noinline #define ____cacheline_aligned __aligned(CACHE_LINE_SIZE) -#ifndef _KERNEL +#if !defined(_KERNEL) && !defined(_STANDALONE) #define likely(x) __builtin_expect(!!(x), 1) #define unlikely(x) __builtin_expect(!!(x), 0) #endif Modified: vendor-sys/openzfs/dist/include/os/freebsd/spl/rpc/xdr.h ============================================================================== --- vendor-sys/openzfs/dist/include/os/freebsd/spl/rpc/xdr.h Fri Oct 16 21:51:17 2020 (r366773) +++ vendor-sys/openzfs/dist/include/os/freebsd/spl/rpc/xdr.h Sat Oct 17 00:05:34 2020 (r366774) @@ -33,7 +33,7 @@ #include <rpc/types.h> #include_next <rpc/xdr.h> -#ifndef _KERNEL +#if !defined(_KERNEL) && !defined(_STANDALONE) #include <assert.h> @@ -66,6 +66,6 @@ xdrmem_control(XDR *xdrs, int request, void *info) xdrmem_control((xdrs), (req), (op)) : \ (*(xdrs)->x_ops->x_control)(xdrs, req, op)) -#endif /* !_KERNEL */ +#endif /* !_KERNEL && !_STANDALONE */ #endif /* !_OPENSOLARIS_RPC_XDR_H_ */ Modified: vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/atomic.h ============================================================================== --- vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/atomic.h Fri Oct 16 21:51:17 2020 (r366773) +++ vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/atomic.h Sat Oct 17 00:05:34 2020 (r366774) @@ -29,6 +29,8 @@ #ifndef _OPENSOLARIS_SYS_ATOMIC_H_ #define _OPENSOLARIS_SYS_ATOMIC_H_ +#ifndef _STANDALONE + #include <sys/types.h> #include <machine/atomic.h> @@ -178,5 +180,14 @@ atomic_cas_ptr(volatile void *target, void *cmp, void (uint32_t)cmp, (uint32_t)newval)); } #endif /* !defined(COMPAT_32BIT) && defined(__LP64__) */ + +#else /* _STANDALONE */ +/* + * sometimes atomic_add_64 is defined, sometimes not, but the + * following is always right for the boot loader. + */ +#undef atomic_add_64 +#define atomic_add_64(ptr, val) *(ptr) += val +#endif /* !_STANDALONE */ #endif /* !_OPENSOLARIS_SYS_ATOMIC_H_ */ Modified: vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/byteorder.h ============================================================================== --- vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/byteorder.h Fri Oct 16 21:51:17 2020 (r366773) +++ vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/byteorder.h Sat Oct 17 00:05:34 2020 (r366774) @@ -80,10 +80,11 @@ #define BE_64(x) BSWAP_64(x) #endif +#if !defined(_STANDALONE) #if BYTE_ORDER == _BIG_ENDIAN #define htonll(x) BMASK_64(x) #define ntohll(x) BMASK_64(x) -#else +#else /* BYTE_ORDER == _LITTLE_ENDIAN */ #ifndef __LP64__ static __inline__ uint64_t htonll(uint64_t n) @@ -96,11 +97,12 @@ ntohll(uint64_t n) { return ((((uint64_t)ntohl(n)) << 32) + ntohl(n >> 32)); } -#else +#else /* !__LP64__ */ #define htonll(x) BSWAP_64(x) #define ntohll(x) BSWAP_64(x) -#endif -#endif +#endif /* __LP64__ */ +#endif /* BYTE_ORDER */ +#endif /* _STANDALONE */ #define BE_IN32(xa) htonl(*((uint32_t *)(void *)(xa))) Modified: vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/ccompile.h ============================================================================== --- vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/ccompile.h Fri Oct 16 21:51:17 2020 (r366773) +++ vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/ccompile.h Sat Oct 17 00:05:34 2020 (r366774) @@ -113,9 +113,9 @@ extern "C" { #define __VPRINTFLIKE(__n) __sun_attr__((__VPRINTFLIKE__(__n))) #define __KPRINTFLIKE(__n) __sun_attr__((__KPRINTFLIKE__(__n))) #define __KVPRINTFLIKE(__n) __sun_attr__((__KVPRINTFLIKE__(__n))) -#ifdef _KERNEL +#if defined(_KERNEL) || defined(_STANDALONE) #define __NORETURN __sun_attr__((__noreturn__)) -#endif +#endif /* _KERNEL || _STANDALONE */ #define __CONST __sun_attr__((__const__)) #define __PURE __sun_attr__((__pure__)) @@ -174,7 +174,7 @@ typedef int enum_t; #define __exit #endif -#ifdef _KERNEL +#if defined(_KERNEL) || defined(_STANDALONE) #define param_set_charp(a, b) (0) #define ATTR_UID AT_UID #define ATTR_GID AT_GID @@ -183,9 +183,15 @@ typedef int enum_t; #define ATTR_CTIME AT_CTIME #define ATTR_MTIME AT_MTIME #define ATTR_ATIME AT_ATIME +#if defined(_STANDALONE) +#define vmem_free kmem_free +#define vmem_zalloc kmem_zalloc +#define vmem_alloc kmem_zalloc +#else #define vmem_free zfs_kmem_free #define vmem_zalloc(size, flags) zfs_kmem_alloc(size, flags | M_ZERO) #define vmem_alloc zfs_kmem_alloc +#endif #define MUTEX_NOLOCKDEP 0 #define RW_NOLOCKDEP 0 Modified: vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/cmn_err.h ============================================================================== --- vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/cmn_err.h Fri Oct 16 21:51:17 2020 (r366773) +++ vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/cmn_err.h Sat Oct 17 00:05:34 2020 (r366774) @@ -52,42 +52,33 @@ extern "C" { /*PRINTFLIKE2*/ extern void cmn_err(int, const char *, ...) __KPRINTFLIKE(2); -#pragma rarely_called(cmn_err) extern void vzcmn_err(zoneid_t, int, const char *, __va_list) __KVPRINTFLIKE(3); -#pragma rarely_called(vzcmn_err) extern void vcmn_err(int, const char *, __va_list) __KVPRINTFLIKE(2); -#pragma rarely_called(vcmn_err) /*PRINTFLIKE3*/ extern void zcmn_err(zoneid_t, int, const char *, ...) __KPRINTFLIKE(3); -#pragma rarely_called(zcmn_err) extern void vzprintf(zoneid_t, const char *, __va_list) __KVPRINTFLIKE(2); -#pragma rarely_called(vzprintf) /*PRINTFLIKE2*/ extern void zprintf(zoneid_t, const char *, ...) __KPRINTFLIKE(2); -#pragma rarely_called(zprintf) extern void vuprintf(const char *, __va_list) __KVPRINTFLIKE(1); -#pragma rarely_called(vuprintf) /*PRINTFLIKE1*/ extern void panic(const char *, ...) __KPRINTFLIKE(1) __NORETURN; -#pragma rarely_called(panic) extern void vpanic(const char *, __va_list) __KVPRINTFLIKE(1) __NORETURN; -#pragma rarely_called(vpanic) #endif /* !_ASM */ Modified: vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/condvar.h ============================================================================== --- vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/condvar.h Fri Oct 16 21:51:17 2020 (r366773) +++ vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/condvar.h Sat Oct 17 00:05:34 2020 (r366774) @@ -36,6 +36,7 @@ #include <sys/spl_condvar.h> #include <sys/mutex.h> #include <sys/time.h> +#include <sys/errno.h> /* * cv_timedwait() is similar to cv_wait() except that it additionally expects Modified: vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/kmem.h ============================================================================== --- vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/kmem.h Fri Oct 16 21:51:17 2020 (r366773) +++ vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/kmem.h Sat Oct 17 00:05:34 2020 (r366774) @@ -29,6 +29,7 @@ #ifndef _OPENSOLARIS_SYS_KMEM_H_ #define _OPENSOLARIS_SYS_KMEM_H_ +#ifdef _KERNEL #include <sys/param.h> #include <sys/malloc.h> #include <sys/vmem.h> @@ -93,5 +94,14 @@ void *calloc(size_t n, size_t s); zfs_kmem_alloc((size), (kmflags) | M_ZERO) #define kmem_free(buf, size) zfs_kmem_free((buf), (size)) +#endif /* _KERNEL */ + +#ifdef _STANDALONE +/* + * At the moment, we just need it for the type. We redirect the alloc/free + * routines to the usual Free and Malloc in that environment. + */ +typedef int kmem_cache_t; +#endif /* _STANDALONE */ #endif /* _OPENSOLARIS_SYS_KMEM_H_ */ Modified: vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/kmem_cache.h ============================================================================== --- vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/kmem_cache.h Fri Oct 16 21:51:17 2020 (r366773) +++ vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/kmem_cache.h Sat Oct 17 00:05:34 2020 (r366774) @@ -30,6 +30,7 @@ #ifndef _SPL_KMEM_CACHE_H #define _SPL_KMEM_CACHE_H +#ifdef _KERNEL #include <sys/taskq.h> /* kmem move callback return values */ @@ -45,5 +46,7 @@ extern void spl_kmem_cache_set_move(kmem_cache_t *, kmem_cbrc_t (*)(void *, void *, size_t, void *)); #define kmem_cache_set_move(skc, move) spl_kmem_cache_set_move(skc, move) + +#endif /* _KERNEL */ #endif Modified: vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/kstat.h ============================================================================== --- vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/kstat.h Fri Oct 16 21:51:17 2020 (r366773) +++ vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/kstat.h Sat Oct 17 00:05:34 2020 (r366774) @@ -6,7 +6,6 @@ * UCRL-CODE-235197 * * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. * * The SPL is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -24,8 +23,11 @@ #ifndef _SPL_KSTAT_H #define _SPL_KSTAT_H + #include <sys/types.h> +#ifndef _STANDALONE #include <sys/sysctl.h> +#endif struct list_head {}; #include <sys/mutex.h> #include <sys/proc.h> @@ -129,9 +131,10 @@ struct kstat_s { kstat_raw_ops_t ks_raw_ops; /* ops table for raw type */ char *ks_raw_buf; /* buf used for raw ops */ size_t ks_raw_bufsize; /* size of raw ops buffer */ +#ifndef _STANDALONE struct sysctl_ctx_list ks_sysctl_ctx; struct sysctl_oid *ks_sysctl_root; - +#endif /* _STANDALONE */ }; typedef struct kstat_named_s { @@ -216,10 +219,16 @@ extern void kstat_runq_exit(kstat_io_t *); __kstat_set_seq_raw_ops(k, h, d, a) #define kstat_set_raw_ops(k, h, d, a) \ __kstat_set_raw_ops(k, h, d, a) +#ifndef _STANDALONE #define kstat_create(m, i, n, c, t, s, f) \ __kstat_create(m, i, n, c, t, s, f) #define kstat_install(k) __kstat_install(k) #define kstat_delete(k) __kstat_delete(k) +#else +#define kstat_create(m, i, n, c, t, s, f) ((kstat_t *)0) +#define kstat_install(k) +#define kstat_delete(k) +#endif #endif /* _SPL_KSTAT_H */ Modified: vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/proc.h ============================================================================== --- vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/proc.h Fri Oct 16 21:51:17 2020 (r366773) +++ vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/proc.h Sat Oct 17 00:05:34 2020 (r366774) @@ -41,7 +41,7 @@ #include <sys/kmem.h> #include <sys/malloc.h> - +#ifdef _KERNEL #define CPU curcpu #define minclsyspri PRIBIO #define defclsyspri minclsyspri @@ -111,4 +111,5 @@ zfs_proc_is_caller(proc_t *p) return (p == curproc); } +#endif /* _KERNEL */ #endif /* _OPENSOLARIS_SYS_PROC_H_ */ Modified: vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/procfs_list.h ============================================================================== --- vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/procfs_list.h Fri Oct 16 21:51:17 2020 (r366773) +++ vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/procfs_list.h Sat Oct 17 00:05:34 2020 (r366774) @@ -25,6 +25,8 @@ #ifndef _SPL_PROCFS_LIST_H #define _SPL_PROCFS_LIST_H +#ifndef _STANDALONE + #include <sys/kstat.h> #include <sys/mutex.h> @@ -63,5 +65,9 @@ void procfs_list_install(const char *module, void procfs_list_uninstall(procfs_list_t *procfs_list); void procfs_list_destroy(procfs_list_t *procfs_list); void procfs_list_add(procfs_list_t *procfs_list, void *p); + +#else +typedef int procfs_list_t; +#endif /* !_STANDALONE */ #endif /* _SPL_PROCFS_LIST_H */ Modified: vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/sig.h ============================================================================== --- vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/sig.h Fri Oct 16 21:51:17 2020 (r366773) +++ vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/sig.h Sat Oct 17 00:05:34 2020 (r366774) @@ -29,6 +29,8 @@ #ifndef _OPENSOLARIS_SYS_SIG_H_ #define _OPENSOLARIS_SYS_SIG_H_ +#ifndef _STANDALONE + #include_next <sys/signal.h> #include <sys/param.h> #include <sys/lock.h> @@ -62,4 +64,7 @@ issig(int why) } return (0); } + +#endif /* !_STANDALONE */ + #endif /* _OPENSOLARIS_SYS_SIG_H_ */ Modified: vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/simd_x86.h ============================================================================== --- vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/simd_x86.h Fri Oct 16 21:51:17 2020 (r366773) +++ vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/simd_x86.h Sat Oct 17 00:05:34 2020 (r366774) @@ -26,15 +26,12 @@ * $FreeBSD$ */ -#include <sys/cdefs.h> #include <sys/types.h> -#include <sys/systm.h> +#include <sys/cdefs.h> #include <sys/proc.h> -#ifdef __i386__ -#include <x86/fpu.h> -#else -#include <machine/fpu.h> -#endif +#include <sys/systm.h> + +#include <machine/pcb.h> #include <x86/x86_var.h> #include <x86/specialreg.h> Modified: vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/sunddi.h ============================================================================== --- vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/sunddi.h Fri Oct 16 21:51:17 2020 (r366773) +++ vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/sunddi.h Sat Oct 17 00:05:34 2020 (r366774) @@ -6,7 +6,6 @@ * UCRL-CODE-235197 * * This file is part of the SPL, Solaris Porting Layer. - * For details, see <http://zfsonlinux.org/>. * * The SPL is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Modified: vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/sysmacros.h ============================================================================== --- vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/sysmacros.h Fri Oct 16 21:51:17 2020 (r366773) +++ vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/sysmacros.h Sat Oct 17 00:05:34 2020 (r366774) @@ -31,6 +31,7 @@ #define _SYS_SYSMACROS_H #include <sys/param.h> +#include <sys/systm.h> #include <sys/isa_defs.h> #include <sys/libkern.h> #include <sys/zone.h> @@ -71,7 +72,11 @@ extern "C" { #define DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d)) #endif +#ifdef _STANDALONE +#define boot_ncpus 1 +#else /* _STANDALONE */ #define boot_ncpus mp_ncpus +#endif /* _STANDALONE */ #define kpreempt_disable() critical_enter() #define kpreempt_enable() critical_exit() #define CPU_SEQID curcpu @@ -319,7 +324,7 @@ extern unsigned char bcd_to_byte[256]; /* avoid any possibility of clashing with <stddef.h> version */ -#define offsetof(s, m) ((size_t)(&(((s *)0)->m))) +#define offsetof(type, field) __offsetof(type, field) #endif /* Modified: vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/taskq.h ============================================================================== --- vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/taskq.h Fri Oct 16 21:51:17 2020 (r366773) +++ vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/taskq.h Sat Oct 17 00:05:34 2020 (r366774) @@ -26,6 +26,8 @@ #ifndef _SYS_TASKQ_H #define _SYS_TASKQ_H +#ifdef _KERNEL + #include <sys/types.h> #include <sys/proc.h> #include <sys/taskqueue.h> @@ -111,5 +113,12 @@ void taskq_resume(taskq_t *); #ifdef __cplusplus } #endif + +#endif /* _KERNEL */ + +#ifdef _STANDALONE +typedef int taskq_ent_t; +#define taskq_init_ent(x) +#endif /* _STANDALONE */ #endif /* _SYS_TASKQ_H */ Modified: vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/uio.h ============================================================================== --- vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/uio.h Fri Oct 16 21:51:17 2020 (r366773) +++ vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/uio.h Sat Oct 17 00:05:34 2020 (r366774) @@ -29,6 +29,8 @@ #ifndef _OPENSOLARIS_SYS_UIO_H_ #define _OPENSOLARIS_SYS_UIO_H_ +#ifndef _STANDALONE + #include_next <sys/uio.h> #include <sys/_uio.h> #include <sys/debug.h> @@ -106,5 +108,7 @@ uio_index_at_offset(uio_t *uio, offset_t off, uint_t * return (off); } + +#endif /* !_STANDALONE */ #endif /* !_OPENSOLARIS_SYS_UIO_H_ */ Modified: vendor-sys/openzfs/dist/include/os/freebsd/zfs/sys/zfs_ctldir.h ============================================================================== --- vendor-sys/openzfs/dist/include/os/freebsd/zfs/sys/zfs_ctldir.h Fri Oct 16 21:51:17 2020 (r366773) +++ vendor-sys/openzfs/dist/include/os/freebsd/zfs/sys/zfs_ctldir.h Sat Oct 17 00:05:34 2020 (r366774) @@ -48,7 +48,7 @@ int zfsctl_root(zfsvfs_t *, int, vnode_t **); void zfsctl_init(void); void zfsctl_fini(void); boolean_t zfsctl_is_node(vnode_t *); -int zfsctl_snapshot_unmount(char *snapname, int flags); +int zfsctl_snapshot_unmount(const char *snapname, int flags); int zfsctl_rename_snapshot(const char *from, const char *to); int zfsctl_destroy_snapshot(const char *snapname, int force); int zfsctl_umount_snapshots(vfs_t *, int, cred_t *); Modified: vendor-sys/openzfs/dist/include/os/freebsd/zfs/sys/zfs_dir.h ============================================================================== --- vendor-sys/openzfs/dist/include/os/freebsd/zfs/sys/zfs_dir.h Fri Oct 16 21:51:17 2020 (r366773) +++ vendor-sys/openzfs/dist/include/os/freebsd/zfs/sys/zfs_dir.h Sat Oct 17 00:05:34 2020 (r366774) @@ -52,11 +52,7 @@ extern int zfs_dirent_lookup(znode_t *, const char *, *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** _______________________________________________ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
