Date: Sat, 17 Oct 2020 01:06:05 +0000 (UTC) From: Matt Macy <mmacy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r366780 - in head/sys: cddl/contrib/opensolaris/common/unicode contrib/openzfs contrib/openzfs/cmd/arc_summary contrib/openzfs/cmd/dbufstat contrib/openzfs/cmd/zdb contrib/openzfs/cmd/z... Message-ID: <202010170106.09H16519080019@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mmacy Date: Sat Oct 17 01:06:04 2020 New Revision: 366780 URL: https://svnweb.freebsd.org/changeset/base/366780 Log: Update OpenZFS to 2.0.0-rc3-gfc5966 - fix panic due to tqid overflow - Improve libzfs_error_init messages - Expose zfetch_max_idistance tunable - Make dbufstat work on FreeBSD - Fix EIO after resuming receive of new dataset over an existing one Added: head/sys/contrib/openzfs/tests/zfs-tests/tests/functional/acl/posix-sa/ - copied from r366775, vendor-sys/openzfs/dist/tests/zfs-tests/tests/functional/acl/posix-sa/ head/sys/contrib/openzfs/tests/zfs-tests/tests/functional/acl/posix/posix_004_pos.ksh - copied unchanged from r366775, vendor-sys/openzfs/dist/tests/zfs-tests/tests/functional/acl/posix/posix_004_pos.ksh Deleted: head/sys/cddl/contrib/opensolaris/common/unicode/u8_textprep.c Modified: head/sys/contrib/openzfs/CODE_OF_CONDUCT.md head/sys/contrib/openzfs/META head/sys/contrib/openzfs/README.md head/sys/contrib/openzfs/cmd/arc_summary/arc_summary2 head/sys/contrib/openzfs/cmd/arc_summary/arc_summary3 head/sys/contrib/openzfs/cmd/dbufstat/dbufstat.in head/sys/contrib/openzfs/cmd/zdb/zdb.c head/sys/contrib/openzfs/cmd/zdb/zdb_il.c head/sys/contrib/openzfs/cmd/zed/agents/zfs_agents.c head/sys/contrib/openzfs/cmd/zed/agents/zfs_mod.c head/sys/contrib/openzfs/cmd/zed/agents/zfs_retire.c head/sys/contrib/openzfs/cmd/zed/zed.c head/sys/contrib/openzfs/cmd/zed/zed.h head/sys/contrib/openzfs/cmd/zed/zed_conf.c head/sys/contrib/openzfs/cmd/zed/zed_conf.h head/sys/contrib/openzfs/cmd/zed/zed_event.c head/sys/contrib/openzfs/cmd/zed/zed_event.h head/sys/contrib/openzfs/cmd/zed/zed_exec.c head/sys/contrib/openzfs/cmd/zed/zed_exec.h head/sys/contrib/openzfs/cmd/zed/zed_file.c head/sys/contrib/openzfs/cmd/zed/zed_file.h head/sys/contrib/openzfs/cmd/zed/zed_log.c head/sys/contrib/openzfs/cmd/zed/zed_log.h head/sys/contrib/openzfs/cmd/zed/zed_strings.c head/sys/contrib/openzfs/cmd/zed/zed_strings.h head/sys/contrib/openzfs/cmd/zvol_id/Makefile.am head/sys/contrib/openzfs/config/kernel-bio.m4 head/sys/contrib/openzfs/configure.ac head/sys/contrib/openzfs/contrib/dracut/90zfs/module-setup.sh.in head/sys/contrib/openzfs/contrib/pyzfs/README head/sys/contrib/openzfs/contrib/pyzfs/libzfs_core/__init__.py head/sys/contrib/openzfs/copy-builtin head/sys/contrib/openzfs/etc/init.d/README.md head/sys/contrib/openzfs/include/os/freebsd/spl/sys/kstat.h head/sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_x86.h head/sys/contrib/openzfs/include/os/freebsd/spl/sys/sunddi.h head/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_ctldir.h head/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_dir.h head/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_vfsops_os.h head/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_vnops.h head/sys/contrib/openzfs/include/os/linux/spl/rpc/xdr.h head/sys/contrib/openzfs/include/os/linux/spl/sys/acl.h head/sys/contrib/openzfs/include/os/linux/spl/sys/atomic.h head/sys/contrib/openzfs/include/os/linux/spl/sys/byteorder.h head/sys/contrib/openzfs/include/os/linux/spl/sys/callb.h head/sys/contrib/openzfs/include/os/linux/spl/sys/callo.h head/sys/contrib/openzfs/include/os/linux/spl/sys/cmn_err.h head/sys/contrib/openzfs/include/os/linux/spl/sys/condvar.h head/sys/contrib/openzfs/include/os/linux/spl/sys/console.h head/sys/contrib/openzfs/include/os/linux/spl/sys/cred.h head/sys/contrib/openzfs/include/os/linux/spl/sys/ctype.h head/sys/contrib/openzfs/include/os/linux/spl/sys/debug.h head/sys/contrib/openzfs/include/os/linux/spl/sys/disp.h head/sys/contrib/openzfs/include/os/linux/spl/sys/dkio.h head/sys/contrib/openzfs/include/os/linux/spl/sys/fcntl.h head/sys/contrib/openzfs/include/os/linux/spl/sys/file.h head/sys/contrib/openzfs/include/os/linux/spl/sys/inttypes.h head/sys/contrib/openzfs/include/os/linux/spl/sys/isa_defs.h head/sys/contrib/openzfs/include/os/linux/spl/sys/kmem.h head/sys/contrib/openzfs/include/os/linux/spl/sys/kmem_cache.h head/sys/contrib/openzfs/include/os/linux/spl/sys/kstat.h head/sys/contrib/openzfs/include/os/linux/spl/sys/list.h head/sys/contrib/openzfs/include/os/linux/spl/sys/mod_os.h head/sys/contrib/openzfs/include/os/linux/spl/sys/mutex.h head/sys/contrib/openzfs/include/os/linux/spl/sys/param.h head/sys/contrib/openzfs/include/os/linux/spl/sys/proc.h head/sys/contrib/openzfs/include/os/linux/spl/sys/processor.h head/sys/contrib/openzfs/include/os/linux/spl/sys/random.h head/sys/contrib/openzfs/include/os/linux/spl/sys/rwlock.h head/sys/contrib/openzfs/include/os/linux/spl/sys/shrinker.h head/sys/contrib/openzfs/include/os/linux/spl/sys/sid.h head/sys/contrib/openzfs/include/os/linux/spl/sys/signal.h head/sys/contrib/openzfs/include/os/linux/spl/sys/simd.h head/sys/contrib/openzfs/include/os/linux/spl/sys/stat.h head/sys/contrib/openzfs/include/os/linux/spl/sys/strings.h head/sys/contrib/openzfs/include/os/linux/spl/sys/sunddi.h head/sys/contrib/openzfs/include/os/linux/spl/sys/sysmacros.h head/sys/contrib/openzfs/include/os/linux/spl/sys/systeminfo.h head/sys/contrib/openzfs/include/os/linux/spl/sys/taskq.h head/sys/contrib/openzfs/include/os/linux/spl/sys/thread.h head/sys/contrib/openzfs/include/os/linux/spl/sys/time.h head/sys/contrib/openzfs/include/os/linux/spl/sys/timer.h head/sys/contrib/openzfs/include/os/linux/spl/sys/tsd.h head/sys/contrib/openzfs/include/os/linux/spl/sys/types.h head/sys/contrib/openzfs/include/os/linux/spl/sys/types32.h head/sys/contrib/openzfs/include/os/linux/spl/sys/uio.h head/sys/contrib/openzfs/include/os/linux/spl/sys/user.h head/sys/contrib/openzfs/include/os/linux/spl/sys/vfs.h head/sys/contrib/openzfs/include/os/linux/spl/sys/vmem.h head/sys/contrib/openzfs/include/os/linux/spl/sys/vmsystm.h head/sys/contrib/openzfs/include/os/linux/spl/sys/vnode.h head/sys/contrib/openzfs/include/os/linux/spl/sys/wait.h head/sys/contrib/openzfs/include/os/linux/spl/sys/zmod.h head/sys/contrib/openzfs/include/os/linux/spl/sys/zone.h head/sys/contrib/openzfs/include/os/linux/zfs/sys/zfs_ctldir.h head/sys/contrib/openzfs/include/os/linux/zfs/sys/zfs_vnops.h head/sys/contrib/openzfs/include/sys/dmu.h head/sys/contrib/openzfs/include/sys/mod.h head/sys/contrib/openzfs/include/sys/pathname.h head/sys/contrib/openzfs/include/sys/spa.h head/sys/contrib/openzfs/include/sys/u8_textprep.h head/sys/contrib/openzfs/include/sys/zfs_ioctl.h head/sys/contrib/openzfs/include/sys/zfs_znode.h head/sys/contrib/openzfs/include/sys/zil.h head/sys/contrib/openzfs/lib/libspl/include/sys/acl.h head/sys/contrib/openzfs/lib/libspl/os/freebsd/getmntany.c head/sys/contrib/openzfs/lib/libzfs/libzfs_sendrecv.c head/sys/contrib/openzfs/lib/libzfs/libzfs_util.c head/sys/contrib/openzfs/lib/libzfs/os/freebsd/libzfs_compat.c head/sys/contrib/openzfs/lib/libzfsbootenv/libzfsbootenv.pc.in head/sys/contrib/openzfs/lib/libzutil/os/linux/zutil_import_os.c head/sys/contrib/openzfs/man/man1/raidz_test.1 head/sys/contrib/openzfs/man/man5/zfs-module-parameters.5 head/sys/contrib/openzfs/man/man8/zed.8.in head/sys/contrib/openzfs/man/man8/zfsprops.8 head/sys/contrib/openzfs/man/man8/zpool.8 head/sys/contrib/openzfs/module/Makefile.in head/sys/contrib/openzfs/module/os/freebsd/spl/spl_kstat.c head/sys/contrib/openzfs/module/os/freebsd/spl/spl_taskq.c head/sys/contrib/openzfs/module/os/freebsd/zfs/kmod_core.c head/sys/contrib/openzfs/module/os/freebsd/zfs/sysctl_os.c head/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_acl.c head/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c head/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c head/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops.c head/sys/contrib/openzfs/module/os/linux/spl/README.md head/sys/contrib/openzfs/module/os/linux/spl/spl-atomic.c head/sys/contrib/openzfs/module/os/linux/spl/spl-condvar.c head/sys/contrib/openzfs/module/os/linux/spl/spl-cred.c head/sys/contrib/openzfs/module/os/linux/spl/spl-err.c head/sys/contrib/openzfs/module/os/linux/spl/spl-generic.c head/sys/contrib/openzfs/module/os/linux/spl/spl-kmem-cache.c head/sys/contrib/openzfs/module/os/linux/spl/spl-kmem.c head/sys/contrib/openzfs/module/os/linux/spl/spl-kstat.c head/sys/contrib/openzfs/module/os/linux/spl/spl-proc.c head/sys/contrib/openzfs/module/os/linux/spl/spl-taskq.c head/sys/contrib/openzfs/module/os/linux/spl/spl-thread.c head/sys/contrib/openzfs/module/os/linux/spl/spl-tsd.c head/sys/contrib/openzfs/module/os/linux/spl/spl-vmem.c head/sys/contrib/openzfs/module/os/linux/spl/spl-xdr.c head/sys/contrib/openzfs/module/os/linux/spl/spl-zlib.c head/sys/contrib/openzfs/module/os/linux/zfs/zfs_acl.c head/sys/contrib/openzfs/module/os/linux/zfs/zfs_ctldir.c head/sys/contrib/openzfs/module/os/linux/zfs/zfs_dir.c head/sys/contrib/openzfs/module/os/linux/zfs/zfs_vfsops.c head/sys/contrib/openzfs/module/os/linux/zfs/zfs_vnops.c head/sys/contrib/openzfs/module/unicode/u8_textprep.c head/sys/contrib/openzfs/module/zcommon/zfs_prop.c head/sys/contrib/openzfs/module/zfs/dmu_objset.c head/sys/contrib/openzfs/module/zfs/dmu_redact.c head/sys/contrib/openzfs/module/zfs/dmu_traverse.c head/sys/contrib/openzfs/module/zfs/dmu_zfetch.c head/sys/contrib/openzfs/module/zfs/dsl_scan.c head/sys/contrib/openzfs/module/zfs/pathname.c head/sys/contrib/openzfs/module/zfs/range_tree.c head/sys/contrib/openzfs/module/zfs/spa.c head/sys/contrib/openzfs/module/zfs/vdev.c head/sys/contrib/openzfs/module/zfs/vdev_label.c head/sys/contrib/openzfs/module/zfs/vdev_removal.c head/sys/contrib/openzfs/module/zfs/zfeature.c head/sys/contrib/openzfs/module/zfs/zfs_ioctl.c head/sys/contrib/openzfs/module/zfs/zfs_log.c head/sys/contrib/openzfs/module/zfs/zil.c head/sys/contrib/openzfs/module/zstd/lib/zstd.c head/sys/contrib/openzfs/rpm/generic/zfs-dkms.spec.in head/sys/contrib/openzfs/rpm/generic/zfs-kmod.spec.in head/sys/contrib/openzfs/rpm/generic/zfs.spec.in head/sys/contrib/openzfs/rpm/redhat/zfs-kmod.spec.in head/sys/contrib/openzfs/scripts/zimport.sh head/sys/contrib/openzfs/tests/runfiles/common.run head/sys/contrib/openzfs/tests/runfiles/linux.run head/sys/contrib/openzfs/tests/zfs-tests/include/libtest.shlib head/sys/contrib/openzfs/tests/zfs-tests/tests/functional/acl/Makefile.am head/sys/contrib/openzfs/tests/zfs-tests/tests/functional/acl/posix/Makefile.am head/sys/contrib/openzfs/tests/zfs-tests/tests/functional/acl/posix/posix_003_pos.ksh head/sys/contrib/openzfs/tests/zfs-tests/tests/functional/acl/posix/setup.ksh head/sys/contrib/openzfs/tests/zfs-tests/tests/functional/arc/dbufstats_001_pos.ksh head/sys/contrib/openzfs/tests/zfs-tests/tests/functional/arc/dbufstats_002_pos.ksh head/sys/contrib/openzfs/tests/zfs-tests/tests/functional/channel_program/synctask_core/tst.get_number_props.zcp head/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_test_race.ksh head/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_sparse.ksh head/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_user/misc/misc.cfg head/sys/contrib/openzfs/tests/zfs-tests/tests/functional/history/history_002_pos.ksh head/sys/contrib/openzfs/tests/zfs-tests/tests/functional/nopwrite/nopwrite_recsize.ksh head/sys/contrib/openzfs/tests/zfs-tests/tests/functional/redacted_send/redacted_negative.ksh head/sys/contrib/openzfs/tests/zfs-tests/tests/functional/rsend/rsend.kshlib head/sys/contrib/openzfs/tests/zfs-tests/tests/functional/rsend/rsend_008_pos.ksh head/sys/contrib/openzfs/tests/zfs-tests/tests/functional/rsend/rsend_012_pos.ksh head/sys/contrib/openzfs/tests/zfs-tests/tests/functional/rsend/rsend_024_pos.ksh head/sys/contrib/openzfs/tests/zfs-tests/tests/functional/rsend/send_freeobjects.ksh head/sys/modules/dtrace/fasttrap/Makefile Directory Properties: head/sys/contrib/openzfs/ (props changed) Modified: head/sys/contrib/openzfs/CODE_OF_CONDUCT.md ============================================================================== --- head/sys/contrib/openzfs/CODE_OF_CONDUCT.md Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/CODE_OF_CONDUCT.md Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/META ============================================================================== --- head/sys/contrib/openzfs/META Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/META Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/README.md ============================================================================== --- head/sys/contrib/openzfs/README.md Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/README.md Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/cmd/arc_summary/arc_summary2 ============================================================================== --- head/sys/contrib/openzfs/cmd/arc_summary/arc_summary2 Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/cmd/arc_summary/arc_summary2 Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/cmd/arc_summary/arc_summary3 ============================================================================== --- head/sys/contrib/openzfs/cmd/arc_summary/arc_summary3 Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/cmd/arc_summary/arc_summary3 Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/cmd/dbufstat/dbufstat.in ============================================================================== --- head/sys/contrib/openzfs/cmd/dbufstat/dbufstat.in Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/cmd/dbufstat/dbufstat.in Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/cmd/zdb/zdb.c ============================================================================== --- head/sys/contrib/openzfs/cmd/zdb/zdb.c Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/cmd/zdb/zdb.c Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/cmd/zdb/zdb_il.c ============================================================================== --- head/sys/contrib/openzfs/cmd/zdb/zdb_il.c Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/cmd/zdb/zdb_il.c Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/cmd/zed/agents/zfs_agents.c ============================================================================== --- head/sys/contrib/openzfs/cmd/zed/agents/zfs_agents.c Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/cmd/zed/agents/zfs_agents.c Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/cmd/zed/agents/zfs_mod.c ============================================================================== --- head/sys/contrib/openzfs/cmd/zed/agents/zfs_mod.c Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/cmd/zed/agents/zfs_mod.c Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/cmd/zed/agents/zfs_retire.c ============================================================================== --- head/sys/contrib/openzfs/cmd/zed/agents/zfs_retire.c Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/cmd/zed/agents/zfs_retire.c Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/cmd/zed/zed.c ============================================================================== --- head/sys/contrib/openzfs/cmd/zed/zed.c Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/cmd/zed/zed.c Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/cmd/zed/zed.h ============================================================================== --- head/sys/contrib/openzfs/cmd/zed/zed.h Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/cmd/zed/zed.h Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/cmd/zed/zed_conf.c ============================================================================== --- head/sys/contrib/openzfs/cmd/zed/zed_conf.c Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/cmd/zed/zed_conf.c Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/cmd/zed/zed_conf.h ============================================================================== --- head/sys/contrib/openzfs/cmd/zed/zed_conf.h Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/cmd/zed/zed_conf.h Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/cmd/zed/zed_event.c ============================================================================== --- head/sys/contrib/openzfs/cmd/zed/zed_event.c Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/cmd/zed/zed_event.c Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/cmd/zed/zed_event.h ============================================================================== --- head/sys/contrib/openzfs/cmd/zed/zed_event.h Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/cmd/zed/zed_event.h Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/cmd/zed/zed_exec.c ============================================================================== --- head/sys/contrib/openzfs/cmd/zed/zed_exec.c Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/cmd/zed/zed_exec.c Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/cmd/zed/zed_exec.h ============================================================================== --- head/sys/contrib/openzfs/cmd/zed/zed_exec.h Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/cmd/zed/zed_exec.h Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/cmd/zed/zed_file.c ============================================================================== --- head/sys/contrib/openzfs/cmd/zed/zed_file.c Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/cmd/zed/zed_file.c Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/cmd/zed/zed_file.h ============================================================================== --- head/sys/contrib/openzfs/cmd/zed/zed_file.h Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/cmd/zed/zed_file.h Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/cmd/zed/zed_log.c ============================================================================== --- head/sys/contrib/openzfs/cmd/zed/zed_log.c Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/cmd/zed/zed_log.c Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/cmd/zed/zed_log.h ============================================================================== --- head/sys/contrib/openzfs/cmd/zed/zed_log.h Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/cmd/zed/zed_log.h Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/cmd/zed/zed_strings.c ============================================================================== --- head/sys/contrib/openzfs/cmd/zed/zed_strings.c Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/cmd/zed/zed_strings.c Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/cmd/zed/zed_strings.h ============================================================================== --- head/sys/contrib/openzfs/cmd/zed/zed_strings.h Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/cmd/zed/zed_strings.h Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/cmd/zvol_id/Makefile.am ============================================================================== --- head/sys/contrib/openzfs/cmd/zvol_id/Makefile.am Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/cmd/zvol_id/Makefile.am Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/config/kernel-bio.m4 ============================================================================== --- head/sys/contrib/openzfs/config/kernel-bio.m4 Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/config/kernel-bio.m4 Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/configure.ac ============================================================================== --- head/sys/contrib/openzfs/configure.ac Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/configure.ac Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/contrib/dracut/90zfs/module-setup.sh.in ============================================================================== --- head/sys/contrib/openzfs/contrib/dracut/90zfs/module-setup.sh.in Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/contrib/dracut/90zfs/module-setup.sh.in Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/contrib/pyzfs/README ============================================================================== --- head/sys/contrib/openzfs/contrib/pyzfs/README Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/contrib/pyzfs/README Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/contrib/pyzfs/libzfs_core/__init__.py ============================================================================== --- head/sys/contrib/openzfs/contrib/pyzfs/libzfs_core/__init__.py Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/contrib/pyzfs/libzfs_core/__init__.py Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/copy-builtin ============================================================================== --- head/sys/contrib/openzfs/copy-builtin Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/copy-builtin Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/etc/init.d/README.md ============================================================================== --- head/sys/contrib/openzfs/etc/init.d/README.md Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/etc/init.d/README.md Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/include/os/freebsd/spl/sys/kstat.h ============================================================================== --- head/sys/contrib/openzfs/include/os/freebsd/spl/sys/kstat.h Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/include/os/freebsd/spl/sys/kstat.h Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_x86.h ============================================================================== --- head/sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_x86.h Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_x86.h Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/include/os/freebsd/spl/sys/sunddi.h ============================================================================== --- head/sys/contrib/openzfs/include/os/freebsd/spl/sys/sunddi.h Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/include/os/freebsd/spl/sys/sunddi.h Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_ctldir.h ============================================================================== --- head/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_ctldir.h Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_ctldir.h Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_dir.h ============================================================================== --- head/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_dir.h Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_dir.h Sat Oct 17 01:06:04 2020 (r366780) @@ -52,11 +52,7 @@ extern int zfs_dirent_lookup(znode_t *, const char *, extern int zfs_link_create(znode_t *, const char *, znode_t *, dmu_tx_t *, int); extern int zfs_link_destroy(znode_t *, const char *, znode_t *, dmu_tx_t *, int, boolean_t *); -#if 0 -extern int zfs_dirlook(vnode_t *, const char *, vnode_t **, int); -#else extern int zfs_dirlook(znode_t *, const char *name, znode_t **); -#endif extern void zfs_mknode(znode_t *, vattr_t *, dmu_tx_t *, cred_t *, uint_t, znode_t **, zfs_acl_ids_t *); extern void zfs_rmnode(znode_t *); Modified: head/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_vfsops_os.h ============================================================================== --- head/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_vfsops_os.h Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_vfsops_os.h Sat Oct 17 01:06:04 2020 (r366780) @@ -72,6 +72,7 @@ struct zfsvfs { boolean_t z_fuid_dirty; /* need to sync fuid table ? */ struct zfs_fuid_info *z_fuid_replay; /* fuid info for replay */ zilog_t *z_log; /* intent log pointer */ + uint_t z_acl_type; /* type of acl usable on this fs */ uint_t z_acl_mode; /* acl chmod/mode behavior */ uint_t z_acl_inherit; /* acl inheritance behavior */ zfs_case_t z_case; /* case-sense */ Modified: head/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_vnops.h ============================================================================== --- head/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_vnops.h Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_vnops.h Sat Oct 17 01:06:04 2020 (r366780) @@ -32,21 +32,21 @@ int dmu_write_pages(objset_t *os, uint64_t object, uin uint64_t size, struct vm_page **ppa, dmu_tx_t *tx); int dmu_read_pages(objset_t *os, uint64_t object, vm_page_t *ma, int count, int *rbehind, int *rahead, int last_size); -extern int zfs_remove(znode_t *dzp, char *name, cred_t *cr, int flags); -extern int zfs_mkdir(znode_t *dzp, char *dirname, vattr_t *vap, +extern int zfs_remove(znode_t *dzp, const char *name, cred_t *cr, int flags); +extern int zfs_mkdir(znode_t *dzp, const char *dirname, vattr_t *vap, znode_t **zpp, cred_t *cr, int flags, vsecattr_t *vsecp); -extern int zfs_rmdir(znode_t *dzp, char *name, znode_t *cwd, +extern int zfs_rmdir(znode_t *dzp, const char *name, znode_t *cwd, cred_t *cr, int flags); extern int zfs_setattr(znode_t *zp, vattr_t *vap, int flag, cred_t *cr); -extern int zfs_rename(znode_t *sdzp, char *snm, znode_t *tdzp, - char *tnm, cred_t *cr, int flags); +extern int zfs_rename(znode_t *sdzp, const char *snm, znode_t *tdzp, + const char *tnm, cred_t *cr, int flags); extern int zfs_symlink(znode_t *dzp, const char *name, vattr_t *vap, const char *link, znode_t **zpp, cred_t *cr, int flags); extern int zfs_link(znode_t *tdzp, znode_t *sp, - char *name, cred_t *cr, int flags); + const char *name, cred_t *cr, int flags); extern int zfs_space(znode_t *zp, int cmd, struct flock *bfp, int flag, offset_t offset, cred_t *cr); -extern int zfs_create(znode_t *dzp, char *name, vattr_t *vap, int excl, +extern int zfs_create(znode_t *dzp, const char *name, vattr_t *vap, int excl, int mode, znode_t **zpp, cred_t *cr, int flag, vsecattr_t *vsecp); extern int zfs_setsecattr(znode_t *zp, vsecattr_t *vsecp, int flag, cred_t *cr); Modified: head/sys/contrib/openzfs/include/os/linux/spl/rpc/xdr.h ============================================================================== --- head/sys/contrib/openzfs/include/os/linux/spl/rpc/xdr.h Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/include/os/linux/spl/rpc/xdr.h Sat Oct 17 01:06:04 2020 (r366780) @@ -3,7 +3,6 @@ * Written by Ricardo Correia <Ricardo.M.Correia@Sun.COM> * * 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: head/sys/contrib/openzfs/include/os/linux/spl/sys/acl.h ============================================================================== --- head/sys/contrib/openzfs/include/os/linux/spl/sys/acl.h Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/include/os/linux/spl/sys/acl.h Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/include/os/linux/spl/sys/atomic.h ============================================================================== --- head/sys/contrib/openzfs/include/os/linux/spl/sys/atomic.h Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/include/os/linux/spl/sys/atomic.h Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/include/os/linux/spl/sys/byteorder.h ============================================================================== --- head/sys/contrib/openzfs/include/os/linux/spl/sys/byteorder.h Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/include/os/linux/spl/sys/byteorder.h Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/include/os/linux/spl/sys/callb.h ============================================================================== --- head/sys/contrib/openzfs/include/os/linux/spl/sys/callb.h Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/include/os/linux/spl/sys/callb.h Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/include/os/linux/spl/sys/callo.h ============================================================================== --- head/sys/contrib/openzfs/include/os/linux/spl/sys/callo.h Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/include/os/linux/spl/sys/callo.h Sat Oct 17 01:06:04 2020 (r366780) @@ -5,7 +5,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: head/sys/contrib/openzfs/include/os/linux/spl/sys/cmn_err.h ============================================================================== --- head/sys/contrib/openzfs/include/os/linux/spl/sys/cmn_err.h Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/include/os/linux/spl/sys/cmn_err.h Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/include/os/linux/spl/sys/condvar.h ============================================================================== --- head/sys/contrib/openzfs/include/os/linux/spl/sys/condvar.h Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/include/os/linux/spl/sys/condvar.h Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/include/os/linux/spl/sys/console.h ============================================================================== --- head/sys/contrib/openzfs/include/os/linux/spl/sys/console.h Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/include/os/linux/spl/sys/console.h Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/include/os/linux/spl/sys/cred.h ============================================================================== --- head/sys/contrib/openzfs/include/os/linux/spl/sys/cred.h Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/include/os/linux/spl/sys/cred.h Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/include/os/linux/spl/sys/ctype.h ============================================================================== --- head/sys/contrib/openzfs/include/os/linux/spl/sys/ctype.h Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/include/os/linux/spl/sys/ctype.h Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/include/os/linux/spl/sys/debug.h ============================================================================== --- head/sys/contrib/openzfs/include/os/linux/spl/sys/debug.h Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/include/os/linux/spl/sys/debug.h Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/include/os/linux/spl/sys/disp.h ============================================================================== --- head/sys/contrib/openzfs/include/os/linux/spl/sys/disp.h Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/include/os/linux/spl/sys/disp.h Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/include/os/linux/spl/sys/dkio.h ============================================================================== --- head/sys/contrib/openzfs/include/os/linux/spl/sys/dkio.h Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/include/os/linux/spl/sys/dkio.h Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/include/os/linux/spl/sys/fcntl.h ============================================================================== --- head/sys/contrib/openzfs/include/os/linux/spl/sys/fcntl.h Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/include/os/linux/spl/sys/fcntl.h Sat Oct 17 01:06:04 2020 (r366780) @@ -5,7 +5,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: head/sys/contrib/openzfs/include/os/linux/spl/sys/file.h ============================================================================== --- head/sys/contrib/openzfs/include/os/linux/spl/sys/file.h Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/include/os/linux/spl/sys/file.h Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/include/os/linux/spl/sys/inttypes.h ============================================================================== --- head/sys/contrib/openzfs/include/os/linux/spl/sys/inttypes.h Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/include/os/linux/spl/sys/inttypes.h Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/include/os/linux/spl/sys/isa_defs.h ============================================================================== --- head/sys/contrib/openzfs/include/os/linux/spl/sys/isa_defs.h Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/include/os/linux/spl/sys/isa_defs.h Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/include/os/linux/spl/sys/kmem.h ============================================================================== --- head/sys/contrib/openzfs/include/os/linux/spl/sys/kmem.h Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/include/os/linux/spl/sys/kmem.h Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/include/os/linux/spl/sys/kmem_cache.h ============================================================================== --- head/sys/contrib/openzfs/include/os/linux/spl/sys/kmem_cache.h Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/include/os/linux/spl/sys/kmem_cache.h Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/include/os/linux/spl/sys/kstat.h ============================================================================== --- head/sys/contrib/openzfs/include/os/linux/spl/sys/kstat.h Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/include/os/linux/spl/sys/kstat.h Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/include/os/linux/spl/sys/list.h ============================================================================== --- head/sys/contrib/openzfs/include/os/linux/spl/sys/list.h Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/include/os/linux/spl/sys/list.h Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/include/os/linux/spl/sys/mod_os.h ============================================================================== --- head/sys/contrib/openzfs/include/os/linux/spl/sys/mod_os.h Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/include/os/linux/spl/sys/mod_os.h Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/include/os/linux/spl/sys/mutex.h ============================================================================== --- head/sys/contrib/openzfs/include/os/linux/spl/sys/mutex.h Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/include/os/linux/spl/sys/mutex.h Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/include/os/linux/spl/sys/param.h ============================================================================== --- head/sys/contrib/openzfs/include/os/linux/spl/sys/param.h Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/include/os/linux/spl/sys/param.h Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/include/os/linux/spl/sys/proc.h ============================================================================== --- head/sys/contrib/openzfs/include/os/linux/spl/sys/proc.h Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/include/os/linux/spl/sys/proc.h Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/include/os/linux/spl/sys/processor.h ============================================================================== --- head/sys/contrib/openzfs/include/os/linux/spl/sys/processor.h Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/include/os/linux/spl/sys/processor.h Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/include/os/linux/spl/sys/random.h ============================================================================== --- head/sys/contrib/openzfs/include/os/linux/spl/sys/random.h Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/include/os/linux/spl/sys/random.h Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/include/os/linux/spl/sys/rwlock.h ============================================================================== --- head/sys/contrib/openzfs/include/os/linux/spl/sys/rwlock.h Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/include/os/linux/spl/sys/rwlock.h Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/include/os/linux/spl/sys/shrinker.h ============================================================================== --- head/sys/contrib/openzfs/include/os/linux/spl/sys/shrinker.h Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/include/os/linux/spl/sys/shrinker.h Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/include/os/linux/spl/sys/sid.h ============================================================================== --- head/sys/contrib/openzfs/include/os/linux/spl/sys/sid.h Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/include/os/linux/spl/sys/sid.h Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/include/os/linux/spl/sys/signal.h ============================================================================== --- head/sys/contrib/openzfs/include/os/linux/spl/sys/signal.h Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/include/os/linux/spl/sys/signal.h Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/include/os/linux/spl/sys/simd.h ============================================================================== --- head/sys/contrib/openzfs/include/os/linux/spl/sys/simd.h Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/include/os/linux/spl/sys/simd.h Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/include/os/linux/spl/sys/stat.h ============================================================================== --- head/sys/contrib/openzfs/include/os/linux/spl/sys/stat.h Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/include/os/linux/spl/sys/stat.h Sat Oct 17 01:06:04 2020 (r366780) @@ -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: head/sys/contrib/openzfs/include/os/linux/spl/sys/strings.h ============================================================================== --- head/sys/contrib/openzfs/include/os/linux/spl/sys/strings.h Sat Oct 17 00:44:04 2020 (r366779) +++ head/sys/contrib/openzfs/include/os/linux/spl/sys/strings.h Sat Oct 17 01:06:04 2020 (r366780) @@ -4,7 +4,6 @@ * UCRL-CODE-235197 *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010170106.09H16519080019>