Replace ZoL with OpenZFS where applicable

Afterward, git grep ZoL matches:
  * README.md:  * [ZoL Site](https://zfsonlinux.org)
  - Correct
  * etc/default/zfs.in:# ZoL userland configuration.
  - Changing this would induce a needless upgrade-check,
    if the user has modified the configuration;
    this can be updated the next time the defaults change
  * module/zfs/dmu_send.c:   * ZoL < 0.7 does not handle [...]
  - Before 0.7 is ZoL, so fair enough

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Issue #11956
This commit is contained in:
наб 2021-05-03 21:21:21 +02:00 committed by Brian Behlendorf
parent cb18cf6b0a
commit b1dd6351bb
26 changed files with 35 additions and 34 deletions

View File

@ -3,7 +3,7 @@
* *
* Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049). * Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049).
* Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC. * Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC.
* Refer to the ZoL git commit log for authoritative copyright attribution. * Refer to the OpenZFS git commit log for authoritative copyright attribution.
* *
* The contents of this file are subject to the terms of the * The contents of this file are subject to the terms of the
* Common Development and Distribution License Version 1.0 (CDDL-1.0). * Common Development and Distribution License Version 1.0 (CDDL-1.0).

View File

@ -3,7 +3,7 @@
* *
* Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049). * Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049).
* Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC. * Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC.
* Refer to the ZoL git commit log for authoritative copyright attribution. * Refer to the OpenZFS git commit log for authoritative copyright attribution.
* *
* The contents of this file are subject to the terms of the * The contents of this file are subject to the terms of the
* Common Development and Distribution License Version 1.0 (CDDL-1.0). * Common Development and Distribution License Version 1.0 (CDDL-1.0).

View File

@ -3,7 +3,7 @@
* *
* Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049). * Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049).
* Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC. * Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC.
* Refer to the ZoL git commit log for authoritative copyright attribution. * Refer to the OpenZFS git commit log for authoritative copyright attribution.
* *
* The contents of this file are subject to the terms of the * The contents of this file are subject to the terms of the
* Common Development and Distribution License Version 1.0 (CDDL-1.0). * Common Development and Distribution License Version 1.0 (CDDL-1.0).

View File

@ -3,7 +3,7 @@
* *
* Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049). * Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049).
* Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC. * Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC.
* Refer to the ZoL git commit log for authoritative copyright attribution. * Refer to the OpenZFS git commit log for authoritative copyright attribution.
* *
* The contents of this file are subject to the terms of the * The contents of this file are subject to the terms of the
* Common Development and Distribution License Version 1.0 (CDDL-1.0). * Common Development and Distribution License Version 1.0 (CDDL-1.0).

View File

@ -3,7 +3,7 @@
* *
* Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049). * Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049).
* Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC. * Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC.
* Refer to the ZoL git commit log for authoritative copyright attribution. * Refer to the OpenZFS git commit log for authoritative copyright attribution.
* *
* The contents of this file are subject to the terms of the * The contents of this file are subject to the terms of the
* Common Development and Distribution License Version 1.0 (CDDL-1.0). * Common Development and Distribution License Version 1.0 (CDDL-1.0).

View File

@ -3,7 +3,7 @@
* *
* Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049). * Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049).
* Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC. * Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC.
* Refer to the ZoL git commit log for authoritative copyright attribution. * Refer to the OpenZFS git commit log for authoritative copyright attribution.
* *
* The contents of this file are subject to the terms of the * The contents of this file are subject to the terms of the
* Common Development and Distribution License Version 1.0 (CDDL-1.0). * Common Development and Distribution License Version 1.0 (CDDL-1.0).

View File

@ -3,7 +3,7 @@
* *
* Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049). * Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049).
* Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC. * Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC.
* Refer to the ZoL git commit log for authoritative copyright attribution. * Refer to the OpenZFS git commit log for authoritative copyright attribution.
* *
* The contents of this file are subject to the terms of the * The contents of this file are subject to the terms of the
* Common Development and Distribution License Version 1.0 (CDDL-1.0). * Common Development and Distribution License Version 1.0 (CDDL-1.0).

View File

@ -3,7 +3,7 @@
* *
* Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049). * Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049).
* Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC. * Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC.
* Refer to the ZoL git commit log for authoritative copyright attribution. * Refer to the OpenZFS git commit log for authoritative copyright attribution.
* *
* The contents of this file are subject to the terms of the * The contents of this file are subject to the terms of the
* Common Development and Distribution License Version 1.0 (CDDL-1.0). * Common Development and Distribution License Version 1.0 (CDDL-1.0).

View File

@ -3,7 +3,7 @@
* *
* Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049). * Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049).
* Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC. * Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC.
* Refer to the ZoL git commit log for authoritative copyright attribution. * Refer to the OpenZFS git commit log for authoritative copyright attribution.
* *
* The contents of this file are subject to the terms of the * The contents of this file are subject to the terms of the
* Common Development and Distribution License Version 1.0 (CDDL-1.0). * Common Development and Distribution License Version 1.0 (CDDL-1.0).

View File

@ -3,7 +3,7 @@
* *
* Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049). * Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049).
* Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC. * Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC.
* Refer to the ZoL git commit log for authoritative copyright attribution. * Refer to the OpenZFS git commit log for authoritative copyright attribution.
* *
* The contents of this file are subject to the terms of the * The contents of this file are subject to the terms of the
* Common Development and Distribution License Version 1.0 (CDDL-1.0). * Common Development and Distribution License Version 1.0 (CDDL-1.0).

View File

@ -3,7 +3,7 @@
* *
* Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049). * Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049).
* Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC. * Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC.
* Refer to the ZoL git commit log for authoritative copyright attribution. * Refer to the OpenZFS git commit log for authoritative copyright attribution.
* *
* The contents of this file are subject to the terms of the * The contents of this file are subject to the terms of the
* Common Development and Distribution License Version 1.0 (CDDL-1.0). * Common Development and Distribution License Version 1.0 (CDDL-1.0).

View File

@ -3,7 +3,7 @@
* *
* Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049). * Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049).
* Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC. * Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC.
* Refer to the ZoL git commit log for authoritative copyright attribution. * Refer to the OpenZFS git commit log for authoritative copyright attribution.
* *
* The contents of this file are subject to the terms of the * The contents of this file are subject to the terms of the
* Common Development and Distribution License Version 1.0 (CDDL-1.0). * Common Development and Distribution License Version 1.0 (CDDL-1.0).

View File

@ -3,7 +3,7 @@
* *
* Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049). * Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049).
* Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC. * Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC.
* Refer to the ZoL git commit log for authoritative copyright attribution. * Refer to the OpenZFS git commit log for authoritative copyright attribution.
* *
* The contents of this file are subject to the terms of the * The contents of this file are subject to the terms of the
* Common Development and Distribution License Version 1.0 (CDDL-1.0). * Common Development and Distribution License Version 1.0 (CDDL-1.0).

View File

@ -3,7 +3,7 @@
* *
* Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049). * Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049).
* Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC. * Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC.
* Refer to the ZoL git commit log for authoritative copyright attribution. * Refer to the OpenZFS git commit log for authoritative copyright attribution.
* *
* The contents of this file are subject to the terms of the * The contents of this file are subject to the terms of the
* Common Development and Distribution License Version 1.0 (CDDL-1.0). * Common Development and Distribution License Version 1.0 (CDDL-1.0).

View File

@ -1,9 +1,9 @@
#!/bin/sh #!/bin/sh
# #
# Add ZoL filesystem capabilities to an initrd, usually for a native ZFS root. # Add OpenZFS filesystem capabilities to an initrd, usually for a native ZFS root.
# #
# This hook installs udev rules for ZoL. # This hook installs udev rules for OpenZFS.
PREREQ="udev" PREREQ="udev"
# These prerequisites are provided by the zfsutils package. The zdb utility is # These prerequisites are provided by the zfsutils package. The zdb utility is

View File

@ -252,9 +252,9 @@ def skipUnlessBookmarksSupported(f):
def snap_always_unmounted_before_destruction(): def snap_always_unmounted_before_destruction():
# Apparently ZoL automatically unmounts the snapshot # Apparently OpenZFS automatically unmounts the snapshot
# only if it is mounted at its default .zfs/snapshot # only if it is mounted at its default .zfs/snapshot
# mountpoint. # mountpoint under Linux.
return ( return (
platform.system() != 'Linux', 'snapshot is not auto-unmounted') platform.system() != 'Linux', 'snapshot is not auto-unmounted')

View File

@ -366,7 +366,7 @@ bio_set_op_attrs(struct bio *bio, unsigned rw, unsigned flags)
* *
* 4.8 - 4.9 API, * 4.8 - 4.9 API,
* REQ_FLUSH was renamed to REQ_PREFLUSH. For consistency with previous * REQ_FLUSH was renamed to REQ_PREFLUSH. For consistency with previous
* ZoL releases, prefer the WRITE_FLUSH_FUA flag set if it's available. * OpenZFS releases, prefer the WRITE_FLUSH_FUA flag set if it's available.
* *
* 4.10 API, * 4.10 API,
* The read/write flags and their modifiers, including WRITE_FLUSH, * The read/write flags and their modifiers, including WRITE_FLUSH,

View File

@ -2,7 +2,7 @@
.\" This file is part of the ZFS Event Daemon (ZED). .\" This file is part of the ZFS Event Daemon (ZED).
.\" Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049). .\" Developed at Lawrence Livermore National Laboratory (LLNL-CODE-403049).
.\" Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC. .\" Copyright (C) 2013-2014 Lawrence Livermore National Security, LLC.
.\" Refer to the ZoL git commit log for authoritative copyright attribution. .\" Refer to the OpenZFS git commit log for authoritative copyright attribution.
.\" .\"
.\" The contents of this file are subject to the terms of the .\" The contents of this file are subject to the terms of the
.\" Common Development and Distribution License Version 1.0 (CDDL-1.0). .\" Common Development and Distribution License Version 1.0 (CDDL-1.0).

View File

@ -337,7 +337,7 @@ Q256(size_t bitlen, const uint32_t *data, uint32_t *restrict p)
* *
* Checksum functions like this one can go over the stack frame size check * Checksum functions like this one can go over the stack frame size check
* Linux imposes on 32-bit platforms (-Wframe-larger-than=1024). We can * Linux imposes on 32-bit platforms (-Wframe-larger-than=1024). We can
* safely ignore the compiler error since we know that in ZoL, that * safely ignore the compiler error since we know that in OpenZFS, that
* the function will be called from a worker thread that won't be using * the function will be called from a worker thread that won't be using
* much stack. The only function that goes over the 1k limit is Q512(), * much stack. The only function that goes over the 1k limit is Q512(),
* which only goes over it by a hair (1248 bytes on ARM32). * which only goes over it by a hair (1248 bytes on ARM32).

View File

@ -128,8 +128,8 @@ Requires: %{name}-kmod = %{version}
Provides: %{name}-kmod-common = %{version} Provides: %{name}-kmod-common = %{version}
Obsoletes: spl Obsoletes: spl
# zfs-fuse provides the same commands and man pages that ZoL does. Renaming # zfs-fuse provides the same commands and man pages that OpenZFS does.
# those on either side would conflict with all available documentation. # Renaming those on either side would conflict with all available documentation.
Conflicts: zfs-fuse Conflicts: zfs-fuse
%if 0%{?rhel}%{?fedora}%{?suse_version} %if 0%{?rhel}%{?fedora}%{?suse_version}

View File

@ -1,10 +1,10 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# #
# Verify that an assortment of known good reference pools can be imported # Verify that an assortment of known good reference pools can be imported
# using different versions of the ZoL code. # using different versions of OpenZFS code.
# #
# By default references pools for the major ZFS implementation will be # By default references pools for the major ZFS implementation will be
# checked against the most recent ZoL tags and the master development branch. # checked against the most recent OpenZFS tags and the master development branch.
# Alternate tags or branches may be verified with the '-s <src-tag> option. # Alternate tags or branches may be verified with the '-s <src-tag> option.
# Passing the keyword "installed" will instruct the script to test whatever # Passing the keyword "installed" will instruct the script to test whatever
# version is installed. # version is installed.
@ -98,7 +98,7 @@ OPTIONS:
-c No color -c No color
-k Keep temporary directory -k Keep temporary directory
-r <repo> Source repository ($REPO) -r <repo> Source repository ($REPO)
-s <src-tag>... Verify ZoL versions with the listed tags -s <src-tag>... Verify OpenZFS versions with the listed tags
-i <pool-dir> Pool image directory -i <pool-dir> Pool image directory
-p <pool-tag>... Verify pools created with the listed tags -p <pool-tag>... Verify pools created with the listed tags
-f <path> Temporary directory to use -f <path> Temporary directory to use

View File

@ -53,7 +53,7 @@ log_onexit cleanup
# #
# Create $TESTFILE, snapshot and clone. # Create $TESTFILE, snapshot and clone.
# Same as 002 except that atime applies to root dataset (ZoL#8675). # Same as 002 except that atime applies to root dataset (OpenZFS#8675).
# #
setup_snap_clone setup_snap_clone
reset_atime reset_atime

View File

@ -52,7 +52,7 @@ log_onexit cleanup
# #
# Create $TESTFILE, snapshot and clone. # Create $TESTFILE, snapshot and clone.
# Same as 001 except that atime/relatime applies to root dataset (ZoL#8675). # Same as 001 except that atime/relatime applies to root dataset (OpenZFS#8675).
# #
setup_snap_clone setup_snap_clone
reset_atime reset_atime

View File

@ -53,7 +53,7 @@ log_onexit cleanup
# #
# Create $TESTFILE, snapshot and clone. # Create $TESTFILE, snapshot and clone.
# Same as 003 except that atime/relatime applies to root dataset (ZoL#8675). # Same as 003 except that atime/relatime applies to root dataset (OpenZFS#8675).
# #
setup_snap_clone setup_snap_clone
reset_atime reset_atime

View File

@ -87,10 +87,11 @@ log_must zfs set mountpoint=$MNTPT $TESTPOOL2
# At this point, layout of datasets in two pools will look like below. # At this point, layout of datasets in two pools will look like below.
# Previously, on next `zfs mount -a`, pthreads assigned to TESTFS1 and TESTFS2 # Previously, on next `zfs mount -a`, pthreads assigned to TESTFS1 and TESTFS2
# could race, and TESTFS2 usually (actually always) won in ZoL. Note that the # could race, and TESTFS2 usually (actually always) won in OpenZFS.
# problem is how two or more threads could initially be assigned to the same # Note that the problem is how two or more threads could initially be assigned
# top level directory, not this specific layout. This layout is just an example # to the same top level directory, not this specific layout.
# that can reproduce race, and is also the layout reported in #8833. # This layout is just an example that can reproduce race,
# and is also the layout reported in #8833.
# #
# NAME MOUNTED MOUNTPOINT # NAME MOUNTED MOUNTPOINT
# ---------------------------------------------- # ----------------------------------------------

View File

@ -84,7 +84,7 @@ log_must mkdir -p /$TESTPOOL/$TESTFS2/xattrsadir
log_must zfs set xattr=sa $TESTPOOL/$TESTFS2 log_must zfs set xattr=sa $TESTPOOL/$TESTFS2
log_must xattrtest -f 10 -x 3 -s 32768 -r -k -p /$TESTPOOL/$TESTFS2/xattrsadir log_must xattrtest -f 10 -x 3 -s 32768 -r -k -p /$TESTPOOL/$TESTFS2/xattrsadir
# ZoL issue #7432 # OpenZFS issue #7432
log_must zfs set compression=on xattr=sa $TESTPOOL/$TESTFS2 log_must zfs set compression=on xattr=sa $TESTPOOL/$TESTFS2
log_must touch /$TESTPOOL/$TESTFS2/attrs log_must touch /$TESTPOOL/$TESTFS2/attrs
log_must eval "python -c 'print \"a\" * 4096' | \ log_must eval "python -c 'print \"a\" * 4096' | \