Tag zfs-2.3.1

META file and changelog updated.

Signed-off-by: Tony Hutter <hutter2@llnl.gov>

.cirrus.yml

@@ -0,0 +1,21 @@
+env:
+  CIRRUS_CLONE_DEPTH: 1
+  ARCH: amd64
+
+build_task:
+  matrix:
+    freebsd_instance:
+      image_family: freebsd-12-4
+    freebsd_instance:
+      image_family: freebsd-13-2
+    freebsd_instance:
+      image_family: freebsd-14-0-snap
+  prepare_script:
+    - pkg install -y autoconf automake libtool gettext-runtime gmake ksh93 py39-packaging py39-cffi py39-sysctl
+  configure_script:
+    - env MAKE=gmake ./autogen.sh
+    - env MAKE=gmake ./configure --with-config="user" --with-python=3.9
+  build_script:
+    - gmake -j `sysctl -n kern.smp.cpus`
+  install_script:
+    - gmake install

.github/ISSUE_TEMPLATE/feature_request.md

@@ -14,7 +14,7 @@ Please check our issue tracker before opening a new feature request.
 Filling out the following template will help other contributors better understand your proposed feature.
 -->
 
-### Describe the feature you would like to see added to OpenZFS
+### Describe the feature would like to see added to OpenZFS
 
 <!--
 Provide a clear and concise description of the feature.

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,6 +2,11 @@
 
 <!--- Provide a general summary of your changes in the Title above -->
 
+<!---
+Documentation on ZFS Buildbot options can be found at
+https://openzfs.github.io/openzfs-docs/Developer%20Resources/Buildbot%20Options.html
+-->
+
 ### Motivation and Context
 <!--- Why is this change required? What problem does it solve? -->
 <!--- If it fixes an open issue, please link to the issue here. -->
@@ -22,7 +27,6 @@
 - [ ] New feature (non-breaking change which adds functionality)
 - [ ] Performance enhancement (non-breaking change which improves efficiency)
 - [ ] Code cleanup (non-breaking change which makes code smaller or more readable)
-- [ ] Quality assurance (non-breaking change which makes the code more robust against bugs)
 - [ ] Breaking change (fix or feature that would cause existing functionality to change)
 - [ ] Library ABI change (libzfs, libzfs\_core, libnvpair, libuutil and libzfsbootenv)
 - [ ] Documentation (a change to man pages or other documentation)

.github/codeql-cpp.yml

@@ -2,4 +2,3 @@ name: "Custom CodeQL Analysis"
 
 queries:
   - uses: ./.github/codeql/custom-queries/cpp/deprecatedFunctionUsage.ql
-  - uses: ./.github/codeql/custom-queries/cpp/dslDatasetHoldReleMismatch.ql

.github/codeql/custom-queries/cpp/dslDatasetHoldReleMismatch.ql

@@ -1,34 +0,0 @@
-/**
- * @name Detect mismatched dsl_dataset_hold/_rele pairs
- * @description Flags instances of issue #12014 where
- *   - a dataset held with dsl_dataset_hold_obj() ends up in dsl_dataset_rele_flags(), or
- *   - a dataset held with dsl_dataset_hold_obj_flags() ends up in dsl_dataset_rele().
- * @kind problem
- * @severity error
- * @tags correctness
- * @id cpp/dslDatasetHoldReleMismatch
- */
-
-import cpp
-
-from Variable ds, Call holdCall, Call releCall, string message
-where
-    ds.getType().toString() = "dsl_dataset_t *" and
-    holdCall.getASuccessor*() = releCall and
-    (
-        (holdCall.getTarget().getName() = "dsl_dataset_hold_obj_flags" and
-         holdCall.getArgument(4).(AddressOfExpr).getOperand().(VariableAccess).getTarget() = ds and
-         releCall.getTarget().getName() = "dsl_dataset_rele" and
-         releCall.getArgument(0).(VariableAccess).getTarget() = ds and
-         message = "Held with dsl_dataset_hold_obj_flags but released with dsl_dataset_rele")
-        or
-        (holdCall.getTarget().getName() = "dsl_dataset_hold_obj" and
-         holdCall.getArgument(3).(AddressOfExpr).getOperand().(VariableAccess).getTarget() = ds and
-         releCall.getTarget().getName() = "dsl_dataset_rele_flags" and
-         releCall.getArgument(0).(VariableAccess).getTarget() = ds and
-         message = "Held with dsl_dataset_hold_obj but released with dsl_dataset_rele_flags")
-    )
-select releCall,
-       "Mismatched release: held with $@ but released with " + releCall.getTarget().getName() + " for dataset $@",
-       holdCall, holdCall.getTarget().getName(),
-       ds, ds.toString()

.github/workflows/labels.yml

@@ -1,49 +0,0 @@
-name: labels
-
-on:
-  pull_request_target:
-    types: [ opened, synchronize, reopened, converted_to_draft, ready_for_review ]
-
-permissions:
-  pull-requests: write
-
-jobs:
-  open:
-    runs-on: ubuntu-latest
-    if: ${{ github.event.action == 'opened' && github.event.pull_request.draft }}
-    steps:
-      - env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          ISSUE: ${{ github.event.pull_request.html_url }}
-        run: |
-          gh pr edit $ISSUE --add-label "Status: Work in Progress"
-
-  push:
-    runs-on: ubuntu-latest
-    if: ${{ github.event.action == 'synchronize' || github.event.action == 'reopened' }}
-    steps:
-      - env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          ISSUE: ${{ github.event.pull_request.html_url }}
-        run: |
-          gh pr edit $ISSUE --remove-label "Status: Accepted,Status: Inactive,Status: Revision Needed,Status: Stale"
-
-  draft:
-    runs-on: ubuntu-latest
-    if: ${{ github.event.action == 'converted_to_draft' }}
-    steps:
-      - env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          ISSUE: ${{ github.event.pull_request.html_url }}
-        run: |
-          gh pr edit $ISSUE --remove-label "Status: Accepted,Status: Code Review Needed,Status: Inactive,Status: Revision Needed,Status: Stale" --add-label "Status: Work in Progress"
-
-  rfr:
-    runs-on: ubuntu-latest
-    if: ${{ github.event.action == 'ready_for_review' }}
-    steps:
-      - env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          ISSUE: ${{ github.event.pull_request.html_url }}
-        run: |
-          gh pr edit $ISSUE --remove-label "Status: Accepted,Status: Inactive,Status: Revision Needed,Status: Stale,Status: Work in Progress" --add-label "Status: Code Review Needed"

.github/workflows/scripts/generate-ci-type.py

@@ -29,7 +29,6 @@ FULL_RUN_IGNORE_REGEX = list(map(re.compile, [
 Patterns of files that are considered to trigger full CI.
 """
 FULL_RUN_REGEX = list(map(re.compile, [
-    r'\.github/workflows/scripts/.*',
     r'cmd.*',
     r'configs/.*',
     r'META',
@@ -65,7 +64,7 @@ if __name__ == '__main__':
 
     # check last (HEAD) commit message
     last_commit_message_raw = subprocess.run([
-        'git', 'show', '-s', '--format=%B', head
+        'git', 'show', '-s', '--format=%B', 'HEAD'
     ], check=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
 
     for line in last_commit_message_raw.stdout.decode().splitlines():

.github/workflows/scripts/qemu-1-setup.sh

@@ -6,23 +6,40 @@
 
 set -eu
 
-# We've been seeing this script take over 15min to run.  This may or
-# may not be normal.  Just to get a little more insight, print out
-# a message to stdout with the top running process, and do this every
-# 30 seconds.  We can delete this watchdog later once we get a better
-# handle on what the timeout value should be.
-(while [ 1 ] ; do sleep 30 && echo "[watchdog: $(ps -eo cmd --sort=-pcpu  | head -n 2 | tail -n 1)}')]"; done) &
-
 # install needed packages
 export DEBIAN_FRONTEND="noninteractive"
 sudo apt-get -y update
 sudo apt-get install -y axel cloud-image-utils daemonize guestfs-tools \
-  virt-manager linux-modules-extra-$(uname -r) zfsutils-linux
+  ksmtuned virt-manager linux-modules-extra-$(uname -r) zfsutils-linux
 
 # generate ssh keys
 rm -f ~/.ssh/id_ed25519
 ssh-keygen -t ed25519 -f ~/.ssh/id_ed25519 -q -N ""
 
+# we expect RAM shortage
+cat << EOF | sudo tee /etc/ksmtuned.conf > /dev/null
+# /etc/ksmtuned.conf - Configuration file for ksmtuned
+# https://docs.redhat.com/en/documentation/red_hat_enterprise_linux/7/html/virtualization_tuning_and_optimization_guide/chap-ksm
+KSM_MONITOR_INTERVAL=60
+
+# Millisecond sleep between ksm scans for 16Gb server.
+# Smaller servers sleep more, bigger sleep less.
+KSM_SLEEP_MSEC=30
+
+KSM_NPAGES_BOOST=0
+KSM_NPAGES_DECAY=0
+KSM_NPAGES_MIN=1000
+KSM_NPAGES_MAX=25000
+
+KSM_THRES_COEF=80
+KSM_THRES_CONST=8192
+
+LOGFILE=/var/log/ksmtuned.log
+DEBUG=1
+EOF
+sudo systemctl restart ksm
+sudo systemctl restart ksmtuned
+
 # not needed
 sudo systemctl stop docker.socket
 sudo systemctl stop multipathd.socket
@@ -48,14 +65,16 @@ $DISK
 sync
 sleep 1
 
-# swap with same size as RAM (16GiB)
+# swap with same size as RAM
 sudo mkswap $DISK-part1
 sudo swapon $DISK-part1
 
-# JBOD 2xdisk for OpenZFS storage (test vm's)
+# 60GB data disk
 SSD1="$DISK-part2"
-sudo fallocate -l 12G /test.ssd2
+
-SSD2=$(sudo losetup -b 4096 -f /test.ssd2 --show)
+# 10GB data disk on ext4
+sudo fallocate -l 10G /test.ssd1
+SSD2=$(sudo losetup -b 4096 -f /test.ssd1 --show)
 
 # adjust zfs module parameter and create pool
 exec 1>/dev/null
@@ -64,14 +83,11 @@ ARC_MAX=$((1024*1024*512))
 echo $ARC_MIN | sudo tee /sys/module/zfs/parameters/zfs_arc_min
 echo $ARC_MAX | sudo tee /sys/module/zfs/parameters/zfs_arc_max
 echo 1 | sudo tee /sys/module/zfs/parameters/zvol_use_blk_mq
-sudo zpool create -f -o ashift=12 zpool $SSD1 $SSD2 -O relatime=off \
+sudo zpool create -f -o ashift=12 zpool $SSD1 $SSD2 \
-  -O atime=off -O xattr=sa -O compression=lz4 -O sync=disabled \
+  -O relatime=off -O atime=off -O xattr=sa -O compression=lz4 \
-  -O redundant_metadata=none -O mountpoint=/mnt/tests
+  -O mountpoint=/mnt/tests
 
 # no need for some scheduler
 for i in /sys/block/s*/queue/scheduler; do
-  echo "none" | sudo tee $i
+  echo "none" | sudo tee $i > /dev/null
 done
-
-# Kill off our watchdog
-kill $(jobs -p)

.github/workflows/scripts/qemu-2-start.sh

@@ -12,23 +12,19 @@ OS="$1"
 # OS variant (virt-install --os-variant list)
 OSv=$OS
 
-# FreeBSD urls's
+# compressed with .zst extension
-FREEBSD_REL="https://download.freebsd.org/releases/CI-IMAGES"
+REPO="https://github.com/mcmilk/openzfs-freebsd-images"
-FREEBSD_SNAP="https://download.freebsd.org/snapshots/CI-IMAGES"
+FREEBSD="$REPO/releases/download/v2024-12-14"
-URLxz=""
+URLzs=""
 
 # Ubuntu mirrors
-UBMIRROR="https://cloud-images.ubuntu.com"
+#UBMIRROR="https://cloud-images.ubuntu.com"
 #UBMIRROR="https://mirrors.cloud.tencent.com/ubuntu-cloud-images"
-#UBMIRROR="https://mirror.citrahost.com/ubuntu-cloud-images"
+UBMIRROR="https://mirror.citrahost.com/ubuntu-cloud-images"
 
 # default nic model for vm's
 NIC="virtio"
 
-# additional options for virt-install
-OPTS[0]=""
-OPTS[1]=""
-
 case "$OS" in
   almalinux8)
     OSNAME="AlmaLinux 8"
@@ -38,14 +34,11 @@ case "$OS" in
     OSNAME="AlmaLinux 9"
     URL="https://repo.almalinux.org/almalinux/9/cloud/x86_64/images/AlmaLinux-9-GenericCloud-latest.x86_64.qcow2"
     ;;
-  almalinux10)
-    OSNAME="AlmaLinux 10"
-    OSv="almalinux9"
-    URL="https://repo.almalinux.org/almalinux/10/cloud/x86_64/images/AlmaLinux-10-GenericCloud-latest.x86_64.qcow2"
-    ;;
   archlinux)
     OSNAME="Archlinux"
     URL="https://geo.mirror.pkgbuild.com/images/latest/Arch-Linux-x86_64-cloudimg.qcow2"
+    # dns sometimes fails with that url  :/
+    echo "89.187.191.12  geo.mirror.pkgbuild.com" | sudo tee /etc/hosts > /dev/null
     ;;
   centos-stream10)
     OSNAME="CentOS Stream 10"
@@ -65,67 +58,60 @@ case "$OS" in
     OSNAME="Debian 12"
     URL="https://cloud.debian.org/images/cloud/bookworm/latest/debian-12-generic-amd64.qcow2"
     ;;
-  debian13)
+  fedora40)
-    OSNAME="Debian 13"
+    OSNAME="Fedora 40"
-    # TODO: Overwrite OSv to debian13 for virt-install until it's added to osinfo
+    OSv="fedora-unknown"
-    OSv="debian12"
+    URL="https://download.fedoraproject.org/pub/fedora/linux/releases/40/Cloud/x86_64/images/Fedora-Cloud-Base-Generic.x86_64-40-1.14.qcow2"
-    URL="https://cloud.debian.org/images/cloud/trixie/latest/debian-13-generic-amd64.qcow2"
-    OPTS[0]="--boot"
-    OPTS[1]="uefi=on"
     ;;
   fedora41)
     OSNAME="Fedora 41"
     OSv="fedora-unknown"
     URL="https://download.fedoraproject.org/pub/fedora/linux/releases/41/Cloud/x86_64/images/Fedora-Cloud-Base-Generic-41-1.4.x86_64.qcow2"
     ;;
-  fedora42)
+  freebsd13-3r)
-    OSNAME="Fedora 42"
+    OSNAME="FreeBSD 13.3-RELEASE"
-    OSv="fedora-unknown"
-    URL="https://download.fedoraproject.org/pub/fedora/linux/releases/42/Cloud/x86_64/images/Fedora-Cloud-Base-Generic-42-1.1.x86_64.qcow2"
-    ;;
-  freebsd13-5r)
-    FreeBSD="13.5-RELEASE"
-    OSNAME="FreeBSD $FreeBSD"
     OSv="freebsd13.0"
-    URLxz="$FREEBSD_REL/$FreeBSD/amd64/Latest/FreeBSD-$FreeBSD-amd64-BASIC-CI.raw.xz"
+    URLzs="$FREEBSD/amd64-freebsd-13.3-RELEASE.qcow2.zst"
-    KSRC="$FREEBSD_REL/../amd64/$FreeBSD/src.txz"
+    BASH="/usr/local/bin/bash"
     NIC="rtl8139"
     ;;
+  freebsd13-4r)
+    OSNAME="FreeBSD 13.4-RELEASE"
+    OSv="freebsd13.0"
+    URLzs="$FREEBSD/amd64-freebsd-13.4-RELEASE.qcow2.zst"
+    BASH="/usr/local/bin/bash"
+    NIC="rtl8139"
+    ;;
+  freebsd14-1r)
+    OSNAME="FreeBSD 14.1-RELEASE"
+    OSv="freebsd14.0"
+    URLzs="$FREEBSD/amd64-freebsd-14.1-RELEASE.qcow2.zst"
+    BASH="/usr/local/bin/bash"
+    ;;
   freebsd14-2r)
-    FreeBSD="14.2-RELEASE"
+    OSNAME="FreeBSD 14.2-RELEASE"
-    OSNAME="FreeBSD $FreeBSD"
     OSv="freebsd14.0"
-    KSRC="$FREEBSD_REL/../amd64/$FreeBSD/src.txz"
+    URLzs="$FREEBSD/amd64-freebsd-14.2-RELEASE.qcow2.zst"
-    URLxz="$FREEBSD_REL/$FreeBSD/amd64/Latest/FreeBSD-$FreeBSD-amd64-BASIC-CI.raw.xz"
+    BASH="/usr/local/bin/bash"
     ;;
-  freebsd14-3r)
+  freebsd13-4s)
-    FreeBSD="14.3-RELEASE"
+    OSNAME="FreeBSD 13.4-STABLE"
-    OSNAME="FreeBSD $FreeBSD"
-    OSv="freebsd14.0"
-    URLxz="$FREEBSD_REL/$FreeBSD/amd64/Latest/FreeBSD-$FreeBSD-amd64-BASIC-CI.raw.xz"
-    KSRC="$FREEBSD_REL/../amd64/$FreeBSD/src.txz"
-    ;;
-  freebsd13-5s)
-    FreeBSD="13.5-STABLE"
-    OSNAME="FreeBSD $FreeBSD"
     OSv="freebsd13.0"
-    URLxz="$FREEBSD_SNAP/$FreeBSD/amd64/Latest/FreeBSD-$FreeBSD-amd64-BASIC-CI.raw.xz"
+    URLzs="$FREEBSD/amd64-freebsd-13.4-STABLE.qcow2.zst"
-    KSRC="$FREEBSD_SNAP/../amd64/$FreeBSD/src.txz"
+    BASH="/usr/local/bin/bash"
     NIC="rtl8139"
     ;;
-  freebsd14-3s)
+  freebsd14-2s)
-    FreeBSD="14.3-STABLE"
+    OSNAME="FreeBSD 14.2-STABLE"
-    OSNAME="FreeBSD $FreeBSD"
     OSv="freebsd14.0"
-    URLxz="$FREEBSD_SNAP/$FreeBSD/amd64/Latest/FreeBSD-$FreeBSD-amd64-BASIC-CI-ufs.raw.xz"
+    URLzs="$FREEBSD/amd64-freebsd-14.2-STABLE.qcow2.zst"
-    KSRC="$FREEBSD_SNAP/../amd64/$FreeBSD/src.txz"
+    BASH="/usr/local/bin/bash"
     ;;
   freebsd15-0c)
-    FreeBSD="15.0-ALPHA3"
+    OSNAME="FreeBSD 15.0-CURRENT"
-    OSNAME="FreeBSD $FreeBSD"
     OSv="freebsd14.0"
-    URLxz="$FREEBSD_SNAP/$FreeBSD/amd64/Latest/FreeBSD-$FreeBSD-amd64-BASIC-CI-ufs.raw.xz"
+    URLzs="$FREEBSD/amd64-freebsd-15.0-CURRENT.qcow2.zst"
-    KSRC="$FREEBSD_SNAP/../amd64/$FreeBSD/src.txz"
+    BASH="/usr/local/bin/bash"
     ;;
   tumbleweed)
     OSNAME="openSUSE Tumbleweed"
@@ -133,6 +119,11 @@ case "$OS" in
     MIRROR="http://opensuse-mirror-gce-us.susecloud.net"
     URL="$MIRROR/tumbleweed/appliances/openSUSE-MicroOS.x86_64-OpenStack-Cloud.qcow2"
     ;;
+  ubuntu20)
+    OSNAME="Ubuntu 20.04"
+    OSv="ubuntu20.04"
+    URL="$UBMIRROR/focal/current/focal-server-cloudimg-amd64.img"
+    ;;
   ubuntu22)
     OSNAME="Ubuntu 22.04"
     OSv="ubuntu22.04"
@@ -156,7 +147,7 @@ echo "ENV=$ENV" >> $ENV
 # result path
 echo 'RESPATH="/var/tmp/test_results"' >> $ENV
 
-# FreeBSD 13 has problems with: e1000 and virtio
+# FreeBSD 13 has problems with: e1000+virtio
 echo "NIC=$NIC" >> $ENV
 
 # freebsd15 -> used in zfs-qemu.yml
@@ -168,48 +159,34 @@ echo "OSv=\"$OSv\"" >> $ENV
 # FreeBSD 15 (Current) -> used for summary
 echo "OSNAME=\"$OSNAME\"" >> $ENV
 
-# default vm count for testings
-VMs=2
-echo "VMs=\"$VMs\"" >> $ENV
-
-# default cpu count for testing vm's
-CPU=2
-echo "CPU=\"$CPU\"" >> $ENV
-
 sudo mkdir -p "/mnt/tests"
 sudo chown -R $(whoami) /mnt/tests
 
-DISK="/dev/zvol/zpool/openzfs"
-sudo zfs create -ps -b 64k -V 80g zpool/openzfs
-while true; do test -b $DISK && break; sleep 1; done
-
 # we are downloading via axel, curl and wget are mostly slower and
 # require more return value checking
-IMG="/mnt/tests/cloud-image"
+IMG="/mnt/tests/cloudimg.qcow2"
-if [ ! -z "$URLxz" ]; then
+if [ ! -z "$URLzs" ]; then
-  echo "Loading $URLxz ..."
+  echo "Loading image $URLzs ..."
-  time axel -q -o "$IMG" "$URLxz"
+  time axel -q -o "$IMG.zst" "$URLzs"
-  echo "Loading $KSRC ..."
+  zstd -q -d --rm "$IMG.zst"
-  time axel -q -o ~/src.txz $KSRC
 else
-  echo "Loading $URL ..."
+  echo "Loading image $URL ..."
   time axel -q -o "$IMG" "$URL"
 fi
 
+DISK="/dev/zvol/zpool/openzfs"
+FORMAT="raw"
+sudo zfs create -ps -b 64k -V 80g zpool/openzfs
+while true; do test -b $DISK && break; sleep 1; done
 echo "Importing VM image to zvol..."
-if [ ! -z "$URLxz" ]; then
+sudo qemu-img dd -f qcow2 -O raw if=$IMG of=$DISK bs=4M
-  xzcat -T0 $IMG | sudo dd of=$DISK bs=4M
-else
-  sudo qemu-img dd -f qcow2 -O raw if=$IMG of=$DISK bs=4M
-fi
 rm -f $IMG
 
 PUBKEY=$(cat ~/.ssh/id_ed25519.pub)
-if [ ${OS:0:7} != "freebsd" ]; then
+cat <<EOF > /tmp/user-data
-  cat <<EOF > /tmp/user-data
 #cloud-config
 
-hostname: $OS
+fqdn: $OS
 
 users:
 - name: root
@@ -225,19 +202,6 @@ growpart:
   devices: ['/']
   ignore_growroot_disabled: false
 EOF
-else
-  cat <<EOF > /tmp/user-data
-#cloud-config
-
-hostname: $OS
-
-# minimized config without sudo for nuageinit of FreeBSD
-growpart:
-  mode: auto
-  devices: ['/']
-  ignore_growroot_disabled: false
-EOF
-fi
 
 sudo virsh net-update default add ip-dhcp-host \
   "<host mac='52:54:00:83:79:00' ip='192.168.122.10'/>" --live --config
@@ -253,15 +217,15 @@ sudo virt-install \
   --graphics none \
   --network bridge=virbr0,model=$NIC,mac='52:54:00:83:79:00' \
   --cloud-init user-data=/tmp/user-data \
-  --disk $DISK,bus=virtio,cache=none,format=raw,driver.discard=unmap \
+  --disk $DISK,bus=virtio,cache=none,format=$FORMAT,driver.discard=unmap \
-  --import --noautoconsole ${OPTS[0]} ${OPTS[1]} >/dev/null
+  --import --noautoconsole >/dev/null
 
 # Give the VMs hostnames so we don't have to refer to them with
 # hardcoded IP addresses.
 #
 # vm0:          Initial VM we install dependencies and build ZFS on.
 # vm1..2        Testing VMs
-for ((i=0; i<=VMs; i++)); do
+for i in {0..9} ; do
   echo "192.168.122.1$i vm$i" | sudo tee -a /etc/hosts
 done
 
@@ -275,29 +239,3 @@ StrictHostKeyChecking no
 # small timeout, used in while loops later
 ConnectTimeout 1
 EOF
-
-if [ ${OS:0:7} != "freebsd" ]; then
-  # enable KSM on Linux
-  sudo virsh dommemstat --domain "openzfs" --period 5
-  sudo virsh node-memory-tune 100 50 1
-  echo 1 | sudo tee /sys/kernel/mm/ksm/run > /dev/null
-else
-  # on FreeBSD we need some more init stuff, because of nuageinit
-  BASH="/usr/local/bin/bash"
-  while pidof /usr/bin/qemu-system-x86_64 >/dev/null; do
-    ssh 2>/dev/null root@vm0 "uname -a" && break
-  done
-  ssh root@vm0 "pkg install -y bash ca_root_nss git qemu-guest-agent python3 py311-cloud-init"
-  ssh root@vm0 "chsh -s $BASH root"
-  ssh root@vm0 'sysrc qemu_guest_agent_enable="YES"'
-  ssh root@vm0 'sysrc cloudinit_enable="YES"'
-  ssh root@vm0 "pw add user zfs -w no -s $BASH"
-  ssh root@vm0 'mkdir -p ~zfs/.ssh'
-  ssh root@vm0 'echo "zfs ALL=(ALL:ALL) NOPASSWD: ALL" >> /usr/local/etc/sudoers'
-  ssh root@vm0 'echo "PubkeyAuthentication yes" >> /etc/ssh/sshd_config'
-  scp ~/.ssh/id_ed25519.pub "root@vm0:~zfs/.ssh/authorized_keys"
-  ssh root@vm0 'chown -R zfs ~zfs'
-  ssh root@vm0 'service sshd restart'
-  scp ~/src.txz "root@vm0:/tmp/src.txz"
-  ssh root@vm0 'tar -C / -zxf /tmp/src.txz'
-fi

.github/workflows/scripts/qemu-3-deps-vm.sh

@@ -4,8 +4,6 @@
 # 3) install dependencies for compiling and loading
 #
 # $1: OS name (like 'fedora41')
-# $2: (optional) Experimental Fedora kernel version, like "6.14" to
-#     install instead of Fedora defaults.
 ######################################################################
 
 set -eu
@@ -20,7 +18,7 @@ function archlinux() {
   sudo pacman -Sy --noconfirm base-devel bc cpio cryptsetup dhclient dkms \
     fakeroot fio gdb inetutils jq less linux linux-headers lsscsi nfs-utils \
     parted pax perf python-packaging python-setuptools qemu-guest-agent ksh \
-    samba strace sysstat rng-tools rsync wget xxhash
+    samba sysstat rng-tools rsync wget xxhash
   echo "##[endgroup]"
 }
 
@@ -28,7 +26,6 @@ function debian() {
   export DEBIAN_FRONTEND="noninteractive"
 
   echo "##[group]Running apt-get update+upgrade"
-  sudo sed -i '/[[:alpha:]]-backports/d' /etc/apt/sources.list
   sudo apt-get update -y
   sudo apt-get upgrade -y
   echo "##[endgroup]"
@@ -41,10 +38,9 @@ function debian() {
     libelf-dev libffi-dev libmount-dev libpam0g-dev libselinux-dev libssl-dev \
     libtool libtool-bin libudev-dev libunwind-dev linux-headers-$(uname -r) \
     lsscsi nfs-kernel-server pamtester parted python3 python3-all-dev \
-    python3-cffi python3-dev python3-distlib python3-packaging libtirpc-dev \
+    python3-cffi python3-dev python3-distlib python3-packaging \
     python3-setuptools python3-sphinx qemu-guest-agent rng-tools rpm2cpio \
-    rsync samba strace sysstat uuid-dev watchdog wget xfslibs-dev xxhash \
+    rsync samba sysstat uuid-dev watchdog wget xfslibs-dev  xxhash zlib1g-dev
-    zlib1g-dev
   echo "##[endgroup]"
 }
 
@@ -53,13 +49,12 @@ function freebsd() {
 
   echo "##[group]Install Development Tools"
   sudo pkg install -y autoconf automake autotools base64 checkbashisms fio \
-    gdb gettext gettext-runtime git gmake gsed jq ksh lcov libtool lscpu \
+    gdb gettext gettext-runtime git gmake gsed jq ksh93 lcov libtool lscpu \
     pkgconf python python3 pamtester pamtester qemu-guest-agent rsync xxhash
   sudo pkg install -xy \
     '^samba4[[:digit:]]+$' \
     '^py3[[:digit:]]+-cffi$' \
     '^py3[[:digit:]]+-sysctl$' \
-    '^py3[[:digit:]]+-setuptools$' \
     '^py3[[:digit:]]+-packaging$'
   echo "##[endgroup]"
 }
@@ -88,8 +83,8 @@ function rhel() {
     libuuid-devel lsscsi mdadm nfs-utils openssl-devel pam-devel pamtester \
     parted perf python3 python3-cffi python3-devel python3-packaging \
     kernel-devel python3-setuptools qemu-guest-agent rng-tools rpcgen \
-    rpm-build rsync samba strace sysstat systemd watchdog wget xfsprogs-devel \
+    rpm-build rsync samba sysstat systemd watchdog wget xfsprogs-devel xxhash \
-    xxhash zlib-devel
+    zlib-devel
   echo "##[endgroup]"
 }
 
@@ -99,25 +94,6 @@ function tumbleweed() {
   echo "##[endgroup]"
 }
 
-# $1: Kernel version to install (like '6.14rc7')
-function install_fedora_experimental_kernel {
-
-  our_version="$1"
-  sudo dnf -y copr enable @kernel-vanilla/stable
-  sudo dnf -y copr enable @kernel-vanilla/mainline
-  all="$(sudo dnf list --showduplicates kernel-* python3-perf* perf* bpftool*)"
-  echo "Available versions:"
-  echo "$all"
-
-  # You can have a bunch of minor variants of the version we want '6.14'.
-  # Pick the newest variant (sorted by version number).
-  specific_version=$(echo "$all" | grep $our_version | awk '{print $2}' | sort -V | tail -n 1)
-  list="$(echo "$all" | grep $specific_version | grep -Ev 'kernel-rt|kernel-selftests|kernel-debuginfo' | sed 's/.x86_64//g' | awk '{print $1"-"$2}')"
-  sudo dnf install -y $list
-  sudo dnf -y copr disable @kernel-vanilla/stable
-  sudo dnf -y copr disable @kernel-vanilla/mainline
-}
-
 # Install dependencies
 case "$1" in
   almalinux8)
@@ -130,7 +106,7 @@ case "$1" in
     sudo dnf install -y kernel-abi-whitelists
     echo "##[endgroup]"
     ;;
-  almalinux9|almalinux10|centos-stream9|centos-stream10)
+  almalinux9|centos-stream9|centos-stream10)
     echo "##[group]Enable epel and crb repositories"
     sudo dnf config-manager -y --set-enabled crb
     sudo dnf install -y epel-release
@@ -153,14 +129,6 @@ case "$1" in
   fedora*)
     rhel
     sudo dnf install -y libunwind-devel
-
-    # Fedora 42+ moves /usr/bin/script from 'util-linux' to 'util-linux-script'
-    sudo dnf install -y util-linux-script || true
-
-    # Optional: Install an experimental kernel ($2 = kernel version)
-    if [ -n "${2:-}" ] ; then
-      install_fedora_experimental_kernel "$2"
-    fi
     ;;
   freebsd*)
     freebsd
@@ -173,7 +141,9 @@ case "$1" in
     echo "##[group]Install Ubuntu specific"
     sudo apt-get install -yq linux-tools-common libtirpc-dev \
       linux-modules-extra-$(uname -r)
-    sudo apt-get install -yq dh-sequence-dkms
+    if [ "$1" != "ubuntu20" ]; then
+      sudo apt-get install -yq dh-sequence-dkms
+    fi
     echo "##[endgroup]"
     echo "##[group]Delete Ubuntu OpenZFS modules"
     for i in $(find /lib/modules -name zfs -type d); do sudo rm -rvf $i; done

.github/workflows/scripts/qemu-3-deps.sh

@@ -3,25 +3,12 @@
 #    script on it.
 #
 # $1: OS name (like 'fedora41')
-# $2: (optional) Experimental kernel version to install on fedora,
-#     like "6.14".
 ######################################################################
 
 .github/workflows/scripts/qemu-wait-for-vm.sh vm0
-
-# SPECIAL CASE:
-#
-# If the user passed in an experimental kernel version to test on Fedora,
-# we need to update the kernel version in zfs's META file to allow the
-# build to happen.  We update our local copy of META here, since we know
-# it will be rsync'd up in the next step.
-if [ -n "${2:-}" ] ; then
-  sed -i -E 's/Linux-Maximum: .+/Linux-Maximum: 99.99/g' META
-fi
-
 scp .github/workflows/scripts/qemu-3-deps-vm.sh zfs@vm0:qemu-3-deps-vm.sh
 PID=`pidof /usr/bin/qemu-system-x86_64`
-ssh zfs@vm0 '$HOME/qemu-3-deps-vm.sh' "$@"
+ssh zfs@vm0 '$HOME/qemu-3-deps-vm.sh' $1
 # wait for poweroff to succeed
 tail --pid=$PID -f /dev/null
 sleep 5 # avoid this: "error: Domain is already active"

.github/workflows/scripts/qemu-4-build-vm.sh

@@ -5,13 +5,12 @@
 #
 # Usage:
 #
-#       qemu-4-build-vm.sh OS [--enable-debug][--dkms][--patch-level NUM]
+#       qemu-4-build-vm.sh OS [--enable-debug][--dkms][--poweroff]
-#               [--poweroff][--release][--repo][--tarball]
+#           [--release][--repo][--tarball]
 #
 # OS:           OS name like 'fedora41'
 # --enable-debug:  Build RPMs with '--enable-debug' (for testing)
 # --dkms:       Build DKMS RPMs as well
-# --patch-level NUM:    Use a custom patch level number for packages.
 # --poweroff:   Power-off the VM after building
 # --release     Build zfs-release*.rpm as well
 # --repo        After building everything, copy RPMs into /tmp/repo
@@ -22,7 +21,6 @@
 
 ENABLE_DEBUG=""
 DKMS=""
-PATCH_LEVEL=""
 POWEROFF=""
 RELEASE=""
 REPO=""
@@ -37,11 +35,6 @@ while [[ $# -gt 0 ]]; do
       DKMS=1
       shift
       ;;
-    --patch-level)
-      PATCH_LEVEL=$2
-      shift
-      shift
-      ;;
     --poweroff)
       POWEROFF=1
       shift
@@ -222,10 +215,6 @@ function rpm_build_and_install() {
   run ./autogen.sh
   echo "##[endgroup]"
 
-  if [ -n "$PATCH_LEVEL" ] ; then
-    sed -i -E 's/(Release:\s+)1/\1'$PATCH_LEVEL'/g' META
-  fi
-
   echo "##[group]Configure"
   run ./configure --enable-debuginfo $extra
   echo "##[endgroup]"
@@ -270,9 +259,8 @@ function rpm_build_and_install() {
 
     # ZFS release RPMs are built.  Copy them to the ~/zfs directory just to
     # keep all the RPMs in the same place.
-    cp ~/rpmbuild/RPMS/noarch/*.rpm ~/zfs
+    cp ~/rpmbuild/RPMS/noarch/*.rpm .
-    cp ~/rpmbuild/SRPMS/*.rpm ~/zfs
+    cp ~/rpmbuild/SRPMS/*.rpm .
-
     popd
     rm -fr ~/rpmbuild
     echo "##[endgroup]"
@@ -312,17 +300,6 @@ function deb_build_and_install() {
   echo "##[endgroup]"
 }
 
-function build_tarball {
-  if [ -n "$REPO" ] ; then
-    ./autogen.sh
-    ./configure --with-config=srpm
-    make dist
-    mkdir -p /tmp/repo/releases
-    # The tarball name is based off of 'Version' field in the META file.
-    mv *.tar.gz /tmp/repo/releases/
-  fi
-}
-
 # Debug: show kernel cmdline
 if [ -f /proc/cmdline ] ; then
   cat /proc/cmdline || true
@@ -337,15 +314,9 @@ fi
 #
 # rhel8.10
 # almalinux9.5
-# fedora42
+# fedora40
 source /etc/os-release
- if which hostnamectl &> /dev/null ; then
+sudo hostname "$ID$VERSION_ID"
-  # Fedora 42+ use hostnamectl
-  sudo hostnamectl set-hostname "$ID$VERSION_ID"
-  sudo hostnamectl set-hostname --pretty "$ID$VERSION_ID"
-else
-  sudo hostname "$ID$VERSION_ID"
-fi
 
 # save some sysinfo
 uname -a > /var/tmp/uname.txt
@@ -368,13 +339,6 @@ case "$OS" in
     ;;
   fedora*)
     rpm_build_and_install "$extra"
-
-    # Historically, we've always built the release tarballs on Fedora, since
-    # there was one instance long ago where we built them on CentOS 7, and they
-    # didn't work correctly for everyone.
-    if [ -n "$TARBALL" ] ; then
-        build_tarball
-    fi
     ;;
   debian*|ubuntu*)
     deb_build_and_install "$extra"
@@ -384,6 +348,16 @@ case "$OS" in
     ;;
 esac
 
+# Optionally build tarballs.  The tarball's root directory name will be named
+# after the current tag, like 'zfs-2.3.0' or 'master'.
+if [ -n "$TARBALL" ] ; then
+  tag="$(git symbolic-ref -q --short HEAD || git describe --tags --exact-match)"
+  git archive --format=tar.gz -o $tag.tar.gz $tag
+  if [ -n "$REPO" ] ; then
+    mkdir -p /tmp/repo/releases
+    cp $tag.tar.gz /tmp/repo/releases
+  fi
+fi
 
 # building the zfs module was ok
 echo 0 > /var/tmp/build-exitcode.txt

.github/workflows/scripts/qemu-5-setup.sh

@@ -12,45 +12,41 @@ source /var/tmp/env.txt
 # wait for poweroff to succeed
 PID=$(pidof /usr/bin/qemu-system-x86_64)
 tail --pid=$PID -f /dev/null
-sudo virsh undefine --nvram openzfs
+sudo virsh undefine openzfs
+
+# default values per test vm:
+VMs=2
+CPU=2
 
 # cpu pinning
 CPUSET=("0,1" "2,3")
 
-# additional options for virt-install
-OPTS[0]=""
-OPTS[1]=""
-
 case "$OS" in
   freebsd*)
-    # FreeBSD needs only 6GiB
+    # FreeBSD can't be optimized via ksmtuned
     RAM=6
     ;;
-  debian13)
-    RAM=8
-    # Boot Debian 13 with uefi=on and secureboot=off (ZFS Kernel Module not signed)
-    OPTS[0]="--boot"
-    OPTS[1]="firmware=efi,firmware.feature0.name=secure-boot,firmware.feature0.enabled=no"
-    ;;
   *)
-    # Linux needs more memory, but can be optimized to share it via KSM
+    # Linux can be optimized via ksmtuned
     RAM=8
     ;;
 esac
 
+# this can be different for each distro
+echo "VMs=$VMs" >> $ENV
+
 # create snapshot we can clone later
 sudo zfs snapshot zpool/openzfs@now
 
 # setup the testing vm's
 PUBKEY=$(cat ~/.ssh/id_ed25519.pub)
+for i in $(seq 1 $VMs); do
 
-# start testing VMs
-for ((i=1; i<=VMs; i++)); do
   echo "Creating disk for vm$i..."
   DISK="/dev/zvol/zpool/vm$i"
   FORMAT="raw"
-  sudo zfs clone zpool/openzfs@now zpool/vm$i-system
+  sudo zfs clone zpool/openzfs@now zpool/vm$i
-  sudo zfs create -ps -b 64k -V 64g zpool/vm$i-tests
+  sudo zfs create -ps -b 64k -V 80g zpool/vm$i-2
 
   cat <<EOF > /tmp/user-data
 #cloud-config
@@ -87,51 +83,42 @@ EOF
     --graphics none \
     --cloud-init user-data=/tmp/user-data \
     --network bridge=virbr0,model=$NIC,mac="52:54:00:83:79:0$i" \
-    --disk $DISK-system,bus=virtio,cache=none,format=$FORMAT,driver.discard=unmap \
+    --disk $DISK,bus=virtio,cache=none,format=$FORMAT,driver.discard=unmap \
-    --disk $DISK-tests,bus=virtio,cache=none,format=$FORMAT,driver.discard=unmap \
+    --disk $DISK-2,bus=virtio,cache=none,format=$FORMAT,driver.discard=unmap \
-    --import --noautoconsole ${OPTS[0]} ${OPTS[1]}
+    --import --noautoconsole >/dev/null
 done
 
-# generate some memory stats
+# check the memory state from time to time
 cat <<EOF > cronjob.sh
+# $OS
 exec 1>>/var/tmp/stats.txt
 exec 2>&1
-echo "********************************************************************************"
+echo "*******************************************************"
+date
 uptime
 free -m
+df -h /mnt/tests
 zfs list
 EOF
-
 sudo chmod +x cronjob.sh
 sudo mv -f cronjob.sh /root/cronjob.sh
 echo '*/5 * * * *  /root/cronjob.sh' > crontab.txt
 sudo crontab crontab.txt
 rm crontab.txt
 
-# Save the VM's serial output (ttyS0) to /var/tmp/console.txt
-# - ttyS0 on the VM corresponds to a local /dev/pty/N entry
-# - use 'virsh ttyconsole' to lookup the /dev/pty/N entry
-for ((i=1; i<=VMs; i++)); do
-  mkdir -p $RESPATH/vm$i
-  read "pty" <<< $(sudo virsh ttyconsole vm$i)
-
-  # Create the file so we can tail it, even if there's no output.
-  touch $RESPATH/vm$i/console.txt
-
-  sudo nohup bash -c "cat $pty > $RESPATH/vm$i/console.txt" &
-
-  # Write all VM boot lines to the console to aid in debugging failed boots.
-  # The boot lines from all the VMs will be munged together, so prepend each
-  # line with the vm hostname (like 'vm1:').
-  (while IFS=$'\n' read -r line; do echo "vm$i: $line" ; done < <(sudo tail -f $RESPATH/vm$i/console.txt)) &
-
-done
-echo "Console logging for ${VMs}x $OS started."
-
-
 # check if the machines are okay
 echo "Waiting for vm's to come up...  (${VMs}x CPU=$CPU RAM=$RAM)"
-for ((i=1; i<=VMs; i++)); do
+for i in $(seq 1 $VMs); do
   .github/workflows/scripts/qemu-wait-for-vm.sh vm$i
 done
 echo "All $VMs VMs are up now."
+
+# Save the VM's serial output (ttyS0) to /var/tmp/console.txt
+# - ttyS0 on the VM corresponds to a local /dev/pty/N entry
+# - use 'virsh ttyconsole' to lookup the /dev/pty/N entry
+for i in $(seq 1 $VMs); do
+  mkdir -p $RESPATH/vm$i
+  read "pty" <<< $(sudo virsh ttyconsole vm$i)
+  sudo nohup bash -c "cat $pty > $RESPATH/vm$i/console.txt" &
+done
+echo "Console logging for ${VMs}x $OS started."

.github/workflows/scripts/qemu-6-tests.sh

@@ -21,13 +21,11 @@ function prefix() {
   S=$((DIFF-(M*60)))
 
   CTR=$(cat /tmp/ctr)
-  echo $LINE| grep -q '^\[.*] Test[: ]' && CTR=$((CTR+1)) && echo $CTR > /tmp/ctr
+  echo $LINE| grep -q "^Test[: ]" && CTR=$((CTR+1)) && echo $CTR > /tmp/ctr
 
   BASE="$HOME/work/zfs/zfs"
   COLOR="$BASE/scripts/zfs-tests-color.sh"
-  CLINE=$(echo $LINE| grep '^\[.*] Test[: ]' \
+  CLINE=$(echo $LINE| grep "^Test[ :]" | sed -e 's|/usr/local|/usr|g' \
-    | sed -e 's|^\[.*] Test|Test|g' \
-    | sed -e 's|/usr/local|/usr|g' \
     | sed -e 's| /usr/share/zfs/zfs-tests/tests/| |g' | $COLOR)
   if [ -z "$CLINE" ]; then
     printf "vm${ID}: %s\n" "$LINE"
@@ -47,7 +45,7 @@ if [ -z ${1:-} ]; then
   echo 0 > /tmp/ctr
   date "+%s" > /tmp/tsstart
 
-  for ((i=1; i<=VMs; i++)); do
+  for i in $(seq 1 $VMs); do
     IP="192.168.122.1$i"
     daemonize -c /var/tmp -p vm${i}.pid -o vm${i}log.txt -- \
       $SSH zfs@$IP $TESTS $OS $i $VMs $CI_TYPE
@@ -60,7 +58,7 @@ if [ -z ${1:-} ]; then
   done
 
   # wait for all vm's to finish
-  for ((i=1; i<=VMs; i++)); do
+  for i in $(seq 1 $VMs); do
     tail --pid=$(cat vm${i}.pid) -f /dev/null
     pid=$(cat vm${i}log.pid)
     rm -f vm${i}log.pid
@@ -74,31 +72,19 @@ fi
 export PATH="$PATH:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/sbin:/usr/local/bin"
 case "$1" in
   freebsd*)
-    TDIR="/usr/local/share/zfs"
     sudo kldstat -n zfs 2>/dev/null && sudo kldunload zfs
     sudo -E ./zfs/scripts/zfs.sh
-    sudo mv -f /var/tmp/*.txt /tmp
+    TDIR="/usr/local/share/zfs"
-    sudo newfs -U -t -L tmp /dev/vtbd1 >/dev/null
-    sudo mount -o noatime /dev/vtbd1 /var/tmp
-    sudo chmod 1777 /var/tmp
-    sudo mv -f /tmp/*.txt /var/tmp
     ;;
   *)
     # use xfs @ /var/tmp for all distros
-    TDIR="/usr/share/zfs"
-    sudo -E modprobe zfs
     sudo mv -f /var/tmp/*.txt /tmp
     sudo mkfs.xfs -fq /dev/vdb
     sudo mount -o noatime /dev/vdb /var/tmp
     sudo chmod 1777 /var/tmp
     sudo mv -f /tmp/*.txt /var/tmp
-    ;;
+    sudo -E modprobe zfs
-esac
+    TDIR="/usr/share/zfs"
-
-# enable io_uring on el9/el10
-case "$1" in
-  almalinux9|almalinux10|centos-stream*)
-    sudo sysctl kernel.io_uring_disabled=0 > /dev/null
     ;;
 esac
 
@@ -111,7 +97,7 @@ fi
 sudo dmesg -c > dmesg-prerun.txt
 mount > mount.txt
 df -h > df-prerun.txt
-$TDIR/zfs-tests.sh -vKO -s 3GB -T $TAGS
+$TDIR/zfs-tests.sh -vK -s 3GB -T $TAGS
 RV=$?
 df -h > df-postrun.txt
 echo $RV > tests-exitcode.txt

.github/workflows/scripts/qemu-7-prepare.sh

@@ -28,7 +28,7 @@ BASE="$HOME/work/zfs/zfs"
 MERGE="$BASE/.github/workflows/scripts/merge_summary.awk"
 
 # catch result files of testings (vm's should be there)
-for ((i=1; i<=VMs; i++)); do
+for i in $(seq 1 $VMs); do
   rsync -arL zfs@vm$i:$RESPATH/current $RESPATH/vm$i || true
   scp zfs@vm$i:"/var/tmp/*.txt" $RESPATH/vm$i || true
   scp zfs@vm$i:"/var/tmp/*.rpm" $RESPATH/vm$i || true
@@ -37,7 +37,7 @@ cp -f /var/tmp/*.txt $RESPATH || true
 cd $RESPATH
 
 # prepare result files for summary
-for ((i=1; i<=VMs; i++)); do
+for i in $(seq 1 $VMs); do
   file="vm$i/build-stderr.txt"
   test -s $file && mv -f $file build-stderr.txt
 

.github/workflows/scripts/qemu-8-summary.sh

@@ -45,7 +45,7 @@ fi
 
 echo -e "\nFull logs for download:\n    $1\n"
 
-for ((i=1; i<=VMs; i++)); do
+for i in $(seq 1 $VMs); do
   rv=$(cat vm$i/tests-exitcode.txt)
 
   if [ $rv = 0 ]; then

.github/workflows/zfs-qemu-packages.yml

@@ -32,11 +32,6 @@ on:
         options:
         - "Build RPMs"
         - "Test repo"
-      patch_level:
-        type: string
-        required: false
-        default: ""
-        description: "(optional) patch level number"
       repo_url:
         type: string
         required: false
@@ -52,7 +47,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ['almalinux8', 'almalinux9', 'almalinux10', 'fedora41', 'fedora42']
+        os: ['almalinux8', 'almalinux9', 'fedora40', 'fedora41']
     runs-on: ubuntu-24.04
     steps:
     - uses: actions/checkout@v4
@@ -83,13 +78,7 @@ jobs:
                 mkdir -p /tmp/repo
                 ssh zfs@vm0 '$HOME/zfs/.github/workflows/scripts/qemu-test-repo-vm.sh' ${{ github.event.inputs.repo_url }}
         else
-                EXTRA=""
+                .github/workflows/scripts/qemu-4-build.sh --repo --release --dkms --tarball ${{ matrix.os }}
-                if [ -n "${{ github.event.inputs.patch_level }}" ] ; then
-                        EXTRA="--patch-level ${{ github.event.inputs.patch_level }}"
-                fi
-
-                .github/workflows/scripts/qemu-4-build.sh $EXTRA \
-                        --repo --release --dkms --tarball ${{ matrix.os }}
         fi
 
     - name: Prepare artifacts

.github/workflows/zfs-qemu.yml

@@ -5,11 +5,16 @@ on:
   pull_request:
   workflow_dispatch:
     inputs:
-      fedora_kernel_ver:
+      include_stream9:
-        type: string
+        type: boolean
         required: false
-        default: ""
+        default: false
-        description: "(optional) Experimental kernel version to install on Fedora (like '6.14' or '6.13.3-0.rc3')"
+        description: 'Test on CentOS 9 stream'
+      include_stream10:
+        type: boolean
+        required: false
+        default: false
+        description: 'Test on CentOS 10 stream'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -29,8 +34,8 @@ jobs:
       - name: Generate OS config and CI type
         id: os
         run: |
-          FULL_OS='["almalinux8", "almalinux9", "almalinux10", "centos-stream9", "centos-stream10", "debian12", "debian13", "fedora41", "fedora42", "freebsd13-5r", "freebsd14-3s", "freebsd15-0c", "ubuntu22", "ubuntu24"]'
+          FULL_OS='["almalinux8", "almalinux9", "debian11", "debian12", "fedora40", "fedora41", "freebsd13-3r", "freebsd13-4s", "freebsd14-1r", "freebsd14-2s", "freebsd15-0c", "ubuntu20", "ubuntu22", "ubuntu24"]'
-          QUICK_OS='["almalinux8", "almalinux9", "almalinux10", "debian12", "fedora42", "freebsd14-3s", "ubuntu24"]'
+          QUICK_OS='["almalinux8", "almalinux9", "debian12", "fedora41", "freebsd13-3r", "freebsd14-2r", "ubuntu24"]'
           # determine CI type when running on PR
           ci_type="full"
           if ${{ github.event_name == 'pull_request' }}; then
@@ -43,18 +48,19 @@ jobs:
           else
             os_selection="$FULL_OS"
           fi
+          os_json=$(echo ${os_selection} | jq -c)
 
-          if ${{ github.event.inputs.fedora_kernel_ver != '' }}; then
+          # Add optional runners
-              # They specified a custom kernel version for Fedora.  Use only
+          if [ "${{ github.event.inputs.include_stream9 }}" == 'true' ]; then
-              # Fedora runners.
+            os_json=$(echo $os_json | jq -c '. += ["centos-stream9"]')
-              os_json=$(echo ${os_selection} | jq -c '[.[] | select(startswith("fedora"))]')
+          fi
-          else
+          if [ "${{ github.event.inputs.include_stream10 }}" == 'true' ]; then
-              # Normal case
+            os_json=$(echo $os_json | jq -c '. += ["centos-stream10"]')
-              os_json=$(echo ${os_selection} | jq -c)
           fi
 
-          echo "os=$os_json" | tee -a $GITHUB_OUTPUT
+          echo $os_json
-          echo "ci_type=$ci_type" | tee -a $GITHUB_OUTPUT
+          echo "os=$os_json" >> $GITHUB_OUTPUT
+          echo "ci_type=$ci_type" >> $GITHUB_OUTPUT
 
   qemu-vm:
     name: qemu-x86
@@ -62,12 +68,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # rhl:     almalinux8, almalinux9, centos-stream9, fedora4x
+        # rhl:     almalinux8, almalinux9, centos-stream9, fedora40, fedora41
-        # debian:  debian12, debian13, ubuntu22, ubuntu24
+        # debian:  debian11, debian12, ubuntu20, ubuntu22, ubuntu24
         # misc:    archlinux, tumbleweed
-        # FreeBSD variants of 2025-06:
+        # FreeBSD variants of 2024-12:
-        # FreeBSD Release: freebsd13-5r, freebsd14-2r, freebsd14-3r
+        # FreeBSD Release: freebsd13-3r, freebsd13-4r, freebsd14-1r, freebsd14-2r
-        # FreeBSD Stable:  freebsd13-5s, freebsd14-3s
+        # FreeBSD Stable:  freebsd13-4s, freebsd14-2s
         # FreeBSD Current: freebsd15-0c
         os: ${{ fromJson(needs.test-config.outputs.test_os) }}
     runs-on: ubuntu-24.04
@@ -77,12 +83,8 @@ jobs:
         ref: ${{ github.event.pull_request.head.sha }}
 
     - name: Setup QEMU
-      timeout-minutes: 20
+      timeout-minutes: 10
-      run: |
+      run: .github/workflows/scripts/qemu-1-setup.sh
-        # Add a timestamp to each line to debug timeouts
-        while IFS=$'\n' read -r line; do
-            echo "$(date +'%H:%M:%S') $line"
-        done < <(.github/workflows/scripts/qemu-1-setup.sh)
 
     - name: Start build machine
       timeout-minutes: 10
@@ -90,7 +92,7 @@ jobs:
 
     - name: Install dependencies
       timeout-minutes: 20
-      run: .github/workflows/scripts/qemu-3-deps.sh ${{ matrix.os }} ${{ github.event.inputs.fedora_kernel_ver }}
+      run: .github/workflows/scripts/qemu-3-deps.sh ${{ matrix.os }}
 
     - name: Build modules
       timeout-minutes: 30

.github/workflows/zloop.yml

@@ -12,8 +12,7 @@ jobs:
   zloop:
     runs-on: ubuntu-24.04
     env:
-      WORK_DIR: /mnt/zloop
+      TEST_DIR: /var/tmp/zloop
-      CORE_DIR: /mnt/zloop/cores
     steps:
     - uses: actions/checkout@v4
       with:
@@ -41,37 +40,38 @@ jobs:
         sudo modprobe zfs
     - name: Tests
       run: |
-        sudo truncate -s 256G /mnt/vdev
+        sudo mkdir -p $TEST_DIR
-        sudo zpool create cipool -m $WORK_DIR -O compression=on -o autotrim=on /mnt/vdev
+        # run for 10 minutes or at most 6 iterations for a maximum runner
-        sudo /usr/share/zfs/zloop.sh -t 600 -I 6 -l -m 1 -c $CORE_DIR -f $WORK_DIR -- -T 120 -P 60
+        # time of 60 minutes.
+        sudo /usr/share/zfs/zloop.sh -t 600 -I 6 -l -m 1 -- -T 120 -P 60
     - name: Prepare artifacts
       if: failure()
       run: |
-        sudo chmod +r -R $WORK_DIR/
+        sudo chmod +r -R $TEST_DIR/
     - name: Ztest log
       if: failure()
       run: |
-        grep -B10 -A1000 'ASSERT' $CORE_DIR/*/ztest.out || tail -n 1000 $CORE_DIR/*/ztest.out
+        grep -B10 -A1000 'ASSERT' $TEST_DIR/*/ztest.out || tail -n 1000 $TEST_DIR/*/ztest.out
     - name: Gdb log
       if: failure()
       run: |
-        sed -n '/Backtraces (full)/q;p' $CORE_DIR/*/ztest.gdb
+        sed -n '/Backtraces (full)/q;p' $TEST_DIR/*/ztest.gdb
     - name: Zdb log
       if: failure()
       run: |
-        cat $CORE_DIR/*/ztest.zdb
+        cat $TEST_DIR/*/ztest.zdb
     - uses: actions/upload-artifact@v4
       if: failure()
       with:
         name: Logs
         path: |
-          /mnt/zloop/*/
+          /var/tmp/zloop/*/
-          !/mnt/zloop/cores/*/vdev/
+          !/var/tmp/zloop/*/vdev/
         if-no-files-found: ignore
     - uses: actions/upload-artifact@v4
       if: failure()
       with:
         name: Pool files
         path: |
-          /mnt/zloop/cores/*/vdev/
+          /var/tmp/zloop/*/vdev/
         if-no-files-found: ignore

.mailmap

@@ -23,7 +23,6 @@
 # These maps are making names consistent where they have varied but the email
 # address has never changed. In most cases, the full name is in the
 # Signed-off-by of a commit with a matching author.
-Achill Gilgenast <achill@achill.org>
 Ahelenia Ziemiańska <nabijaczleweli@gmail.com>
 Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
 Alex John <alex@stty.io>
@@ -38,7 +37,6 @@ Crag Wang <crag0715@gmail.com>
 Damian Szuberski <szuberskidamian@gmail.com>
 Daniel Kolesa <daniel@octaforge.org>
 Debabrata Banerjee <dbavatar@gmail.com>
-Diwakar Kristappagari <diwakar-k@hpe.com>
 Finix Yan <yanchongwen@hotmail.com>
 Gaurav Kumar <gauravk.18@gmail.com>
 Gionatan Danti <g.danti@assyoma.it>
@@ -73,7 +71,6 @@ Rob Norris <rob.norris@klarasystems.com>
 Sam Lunt <samuel.j.lunt@gmail.com>
 Sanjeev Bagewadi <sanjeev.bagewadi@gmail.com>
 Sebastian Wuerl <s.wuerl@mailbox.org>
-SHENGYI HONG <aokblast@FreeBSD.org>
 Stoiko Ivanov <github@nomore.at>
 Tamas TEVESZ <ice@extreme.hu>
 WHR <msl0000023508@gmail.com>
@@ -81,14 +78,9 @@ Yanping Gao <yanping.gao@xtaotech.com>
 Youzhong Yang <youzhong@gmail.com>
 
 # Signed-off-by: overriding Author:
-Alexander Ziaee <ziaee@FreeBSD.org> <concussious@runbox.com>
-Felix Schmidt <felixschmidt20@aol.com> <f.sch.prototype@gmail.com>
-Olivier Certner <olce@FreeBSD.org> <olce.freebsd@certner.fr>
-Phil Sutter <phil@nwl.cc> <p.github@nwl.cc>
-poscat <poscat@poscat.moe> <poscat0x04@outlook.com>
-Qiuhao Chen <chenqiuhao1997@gmail.com> <haohao0924@126.com>
 Ryan <errornointernet@envs.net> <error.nointernet@gmail.com>
 Sietse <sietse@wizdom.nu> <uglymotha@wizdom.nu>
+Qiuhao Chen <chenqiuhao1997@gmail.com> <haohao0924@126.com>
 Yuxin Wang <yuxinwang9999@gmail.com> <Bi11gates9999@gmail.com>
 Zhenlei Huang <zlei@FreeBSD.org> <zlei.huang@gmail.com>
 
@@ -105,7 +97,6 @@ Tulsi Jain <tulsi.jain@delphix.com> <tulsi.jain@Tulsi-Jains-MacBook-Pro.local>
 # Mappings from Github no-reply addresses
 ajs124 <git@ajs124.de> <ajs124@users.noreply.github.com>
 Alek Pinchuk <apinchuk@axcient.com> <alek-p@users.noreply.github.com>
-Aleksandr Liber <aleksandr.liber@perforce.com> <61714074+AleksandrLiber@users.noreply.github.com>
 Alexander Lobakin <alobakin@pm.me> <solbjorn@users.noreply.github.com>
 Alexey Smirnoff <fling@member.fsf.org> <fling-@users.noreply.github.com>
 Allen Holl <allen.m.holl@gmail.com> <65494904+allen-4@users.noreply.github.com>
@@ -142,12 +133,10 @@ Fedor Uporov <fuporov.vstack@gmail.com> <60701163+fuporovvStack@users.noreply.gi
 Felix Dörre <felix@dogcraft.de> <felixdoerre@users.noreply.github.com>
 Felix Neumärker <xdch47@posteo.de> <34678034+xdch47@users.noreply.github.com>
 Finix Yan <yancw@info2soft.com> <Finix1979@users.noreply.github.com>
-Friedrich Weber <f.weber@proxmox.com> <56110206+frwbr@users.noreply.github.com>
 Gaurav Kumar <gauravk.18@gmail.com> <gaurkuma@users.noreply.github.com>
 George Gaydarov <git@gg7.io> <gg7@users.noreply.github.com>
 Georgy Yakovlev <gyakovlev@gentoo.org> <168902+gyakovlev@users.noreply.github.com>
 Gerardwx <gerardw@alum.mit.edu> <Gerardwx@users.noreply.github.com>
-Germano Massullo <germano.massullo@gmail.com> <Germano0@users.noreply.github.com>
 Gian-Carlo DeFazio <defazio1@llnl.gov> <defaziogiancarlo@users.noreply.github.com>
 Giuseppe Di Natale <dinatale2@llnl.gov> <dinatale2@users.noreply.github.com>
 Hajo Möller <dasjoe@gmail.com> <dasjoe@users.noreply.github.com>
@@ -167,7 +156,6 @@ John Ramsden <johnramsden@riseup.net> <johnramsden@users.noreply.github.com>
 Jonathon Fernyhough <jonathon@m2x.dev> <559369+jonathonf@users.noreply.github.com>
 Jose Luis Duran <jlduran@gmail.com> <jlduran@users.noreply.github.com>
 Justin Hibbits <chmeeedalf@gmail.com> <chmeeedalf@users.noreply.github.com>
-Kaitlin Hoang <kthoang@amazon.com> <khoang98@users.noreply.github.com>
 Kevin Greene <kevin.greene@delphix.com> <104801862+kxgreene@users.noreply.github.com>
 Kevin Jin <lostking2008@hotmail.com> <33590050+jxdking@users.noreply.github.com>
 Kevin P. Fleming <kevin@km6g.us> <kpfleming@users.noreply.github.com>
@@ -219,7 +207,6 @@ Torsten Wörtwein <twoertwein@gmail.com> <twoertwein@users.noreply.github.com>
 Tulsi Jain <tulsi.jain@delphix.com> <TulsiJain@users.noreply.github.com>
 Václav Skála <skala@vshosting.cz> <33496485+vaclavskala@users.noreply.github.com>
 Vaibhav Bhanawat <vaibhav.bhanawat@delphix.com> <88050553+vaibhav-delphix@users.noreply.github.com>
-Vandana Rungta <vrungta@amazon.com> <46906819+vandanarungta@users.noreply.github.com>
 Violet Purcell <vimproved@inventati.org> <66446404+vimproved@users.noreply.github.com>
 Vipin Kumar Verma <vipin.verma@hpe.com> <75025470+vermavipinkumar@users.noreply.github.com>
 Wolfgang Bumiller <w.bumiller@proxmox.com> <Blub@users.noreply.github.com>

AUTHORS

@@ -10,7 +10,6 @@ PAST MAINTAINERS:
 CONTRIBUTORS:
 
     Aaron Fineman <abyxcos@gmail.com>
-    Achill Gilgenast <achill@achill.org>
     Adam D. Moss <c@yotes.com>
     Adam Leventhal <ahl@delphix.com>
     Adam Stevko <adam.stevko@gmail.com>
@@ -30,7 +29,6 @@ CONTRIBUTORS:
     Alejandro Colomar <Colomar.6.4.3@GMail.com>
     Alejandro R. Sedeño <asedeno@mit.edu>
     Alek Pinchuk <alek@nexenta.com>
-    Aleksandr Liber <aleksandr.liber@perforce.com>
     Aleksa Sarai <cyphar@cyphar.com>
     Alexander Eremin <a.eremin@nexenta.com>
     Alexander Lobakin <alobakin@pm.me>
@@ -38,7 +36,6 @@ CONTRIBUTORS:
     Alexander Pyhalov <apyhalov@gmail.com>
     Alexander Richardson <Alexander.Richardson@cl.cam.ac.uk>
     Alexander Stetsenko <ams@nexenta.com>
-    Alexander Ziaee <ziaee@FreeBSD.org>
     Alex Braunegg <alex.braunegg@gmail.com>
     Alexey Shvetsov <alexxy@gentoo.org>
     Alexey Smirnoff <fling@member.fsf.org>
@@ -60,7 +57,6 @@ CONTRIBUTORS:
     Andreas Buschmann <andreas.buschmann@tech.net.de>
     Andreas Dilger <adilger@intel.com>
     Andreas Vögele <andreas@andreasvoegele.com>
-    Andres <a-d-j-i@users.noreply.github.com>
     Andrew Barnes <barnes333@gmail.com>
     Andrew Hamilton <ahamilto@tjhsst.edu>
     Andrew Innes <andrew.c12@gmail.com>
@@ -74,7 +70,6 @@ CONTRIBUTORS:
     Andrey Prokopenko <job@terem.fr>
     Andrey Vesnovaty <andrey.vesnovaty@gmail.com>
     Andriy Gapon <avg@freebsd.org>
-    Andriy Tkachuk <andriy.tkachuk@seagate.com>
     Andy Bakun <github@thwartedefforts.org>
     Andy Fiddaman <omnios@citrus-it.co.uk>
     Aniruddha Shankar <k@191a.net>
@@ -85,7 +80,6 @@ CONTRIBUTORS:
     Arne Jansen <arne@die-jansens.de>
     Aron Xu <happyaron.xu@gmail.com>
     Arshad Hussain <arshad.hussain@aeoncomputing.com>
-    Artem <artem.vlasenko@ossrevival.org>
     Arun KV <arun.kv@datacore.com>
     Arvind Sankar <nivedita@alum.mit.edu>
     Attila Fülöp <attila@fueloep.org>
@@ -123,7 +117,6 @@ CONTRIBUTORS:
     Caleb James DeLisle <calebdelisle@lavabit.com>
     Cameron Harr <harr1@llnl.gov>
     Cao Xuewen <cao.xuewen@zte.com.cn>
-    Carl George <carlwgeorge@gmail.com>
     Carlo Landmeter <clandmeter@gmail.com>
     Carlos Alberto Lopez Perez <clopez@igalia.com>
     Cedric Maunoury <cedric.maunoury@gmail.com>
@@ -204,7 +197,6 @@ CONTRIBUTORS:
     Dimitri John Ledkov <xnox@ubuntu.com>
     Dimitry Andric <dimitry@andric.com>
     Dirkjan Bussink <d.bussink@gmail.com>
-    Diwakar Kristappagari <diwakar-k@hpe.com>
     Dmitry Khasanov <pik4ez@gmail.com>
     Dominic Pearson <dsp@technoanimal.net>
     Dominik Hassler <hadfl@omniosce.org>
@@ -234,12 +226,10 @@ CONTRIBUTORS:
     Fedor Uporov <fuporov.vstack@gmail.com>
     Felix Dörre <felix@dogcraft.de>
     Felix Neumärker <xdch47@posteo.de>
-    Felix Schmidt <felixschmidt20@aol.com>
     Feng Sun <loyou85@gmail.com>
     Finix Yan <yancw@info2soft.com>
     Francesco Mazzoli <f@mazzo.li>
     Frederik Wessels <wessels147@gmail.com>
-    Friedrich Weber <f.weber@proxmox.com>
     Frédéric Vanniere <f.vanniere@planet-work.com>
     Gabriel A. Devenyi <gdevenyi@gmail.com>
     Garrett D'Amore <garrett@nexenta.com>
@@ -255,7 +245,6 @@ CONTRIBUTORS:
     George Wilson <gwilson@delphix.com>
     Georgy Yakovlev <ya@sysdump.net>
     Gerardwx <gerardw@alum.mit.edu>
-    Germano Massullo <germano.massullo@gmail.com>
     Gian-Carlo DeFazio <defazio1@llnl.gov>
     Gionatan Danti <g.danti@assyoma.it>
     Giuseppe Di Natale <guss80@gmail.com>
@@ -293,14 +282,12 @@ CONTRIBUTORS:
     Igor K <igor@dilos.org>
     Igor Kozhukhov <ikozhukhov@gmail.com>
     Igor Lvovsky <ilvovsky@gmail.com>
-    Igor Ostapenko <pm@igoro.pro>
     ilbsmart <wgqimut@gmail.com>
     Ilkka Sovanto <github@ilkka.kapsi.fi>
     illiliti <illiliti@protonmail.com>
     ilovezfs <ilovezfs@icloud.com>
     InsanePrawn <Insane.Prawny@gmail.com>
     Isaac Huang <he.huang@intel.com>
-    Ivan Volosyuk <Ivan.Volosyuk@gmail.com>
     Jacek Fefliński <feflik@gmail.com>
     Jacob Adams <tookmund@gmail.com>
     Jake Howard <git@theorangeone.net>
@@ -308,7 +295,6 @@ CONTRIBUTORS:
     James H <james@kagisoft.co.uk>
     James Lee <jlee@thestaticvoid.com>
     James Pan <jiaming.pan@yahoo.com>
-    James Reilly <jreilly1821@gmail.com>
     James Wah <james@laird-wah.net>
     Jan Engelhardt <jengelh@inai.de>
     Jan Kryl <jan.kryl@nexenta.com>
@@ -320,7 +306,6 @@ CONTRIBUTORS:
     Jason Lee <jasonlee@lanl.gov>
     Jason Zaman <jasonzaman@gmail.com>
     Javen Wu <wu.javen@gmail.com>
-    Jaydeep Kshirsagar <jkshirsagar@maxlinear.com>
     Jean-Baptiste Lallement <jean-baptiste@ubuntu.com>
     Jeff Dike <jdike@akamai.com>
     Jeremy Faulkner <gldisater@gmail.com>
@@ -328,12 +313,10 @@ CONTRIBUTORS:
     Jeremy Jones <jeremy@delphix.com>
     Jeremy Visser <jeremy.visser@gmail.com>
     Jerry Jelinek <jerry.jelinek@joyent.com>
-    Jerzy Kołosowski <jerzy@kolosowscy.pl>
     Jessica Clarke <jrtc27@jrtc27.com>
     Jinshan Xiong <jinshan.xiong@intel.com>
     Jitendra Patidar <jitendra.patidar@nutanix.com>
     JK Dingwall <james@dingwall.me.uk>
-    Joel Low <joel@joelsplace.sg>
     Joe Stein <joe.stein@delphix.com>
     John-Mark Gurney <jmg@funkthat.com>
     John Albietz <inthecloud247@gmail.com>
@@ -382,7 +365,6 @@ CONTRIBUTORS:
     Kevin Jin <lostking2008@hotmail.com>
     Kevin P. Fleming <kevin@km6g.us>
     Kevin Tanguy <kevin.tanguy@ovh.net>
-    khoang98 <khoang98@users.noreply.github.com>
     KireinaHoro <i@jsteward.moe>
     Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
     Kleber Tarcísio <klebertarcisio@yahoo.com.br>
@@ -390,7 +372,6 @@ CONTRIBUTORS:
     Kohsuke Kawaguchi <kk@kohsuke.org>
     Konstantin Khorenko <khorenko@virtuozzo.com>
     KORN Andras <korn@elan.rulez.org>
-    kotauskas <v.toncharov@gmail.com>
     Kristof Provost <github@sigsegv.be>
     Krzysztof Piecuch <piecuch@kpiecuch.pl>
     Kyle Blatter <kyleblatter@llnl.gov>
@@ -456,7 +437,6 @@ CONTRIBUTORS:
     Max Zettlmeißl <max@zettlmeissl.de>
     Md Islam <mdnahian@outlook.com>
     megari <megari@iki.fi>
-    Meriel Luna Mittelbach <lunarlambda@gmail.com>
     Michael D Labriola <michael.d.labriola@gmail.com>
     Michael Franzl <michael@franzl.name>
     Michael Gebetsroither <michael@mgeb.org>
@@ -472,7 +452,6 @@ CONTRIBUTORS:
     Mike Swanson <mikeonthecomputer@gmail.com>
     Milan Jurik <milan.jurik@xylab.cz>
     Minsoo Choo <minsoochoo0122@proton.me>
-    mnrx <mnrx@users.noreply.github.com>
     Mohamed Tawfik <m_tawfik@aucegypt.edu>
     Morgan Jones <mjones@rice.edu>
     Moritz Maxeiner <moritz@ucworks.org>
@@ -498,13 +477,12 @@ CONTRIBUTORS:
     Olaf Faaland <faaland1@llnl.gov>
     Oleg Drokin <green@linuxhacker.ru>
     Oleg Stepura <oleg@stepura.com>
-    Olivier Certner <olce@FreeBSD.org>
+    Olivier Certner <olce.freebsd@certner.fr>
     Olivier Mazouffre <olivier.mazouffre@ims-bordeaux.fr>
     omni <omni+vagant@hack.org>
     Orivej Desh <orivej@gmx.fr>
     Pablo Correa Gómez <ablocorrea@hotmail.com>
     Palash Gandhi <pbg4930@rit.edu>
-    Patrick Fasano <patrick@patrickfasano.com>
     Patrick Mooney <pmooney@pfmooney.com>
     Patrik Greco <sikevux@sikevux.se>
     Paul B. Henson <henson@acm.org>
@@ -516,7 +494,6 @@ CONTRIBUTORS:
     Pawel Jakub Dawidek <pjd@FreeBSD.org>
     Pedro Giffuni <pfg@freebsd.org>
     Peng <peng.hse@xtaotech.com>
-    Peng Liu <littlenewton6@gmail.com>
     Peter Ashford <ashford@accs.com>
     Peter Dave Hello <hsu@peterdavehello.org>
     Peter Doherty <peterd@acranox.org>
@@ -526,18 +503,15 @@ CONTRIBUTORS:
     Philip Pokorny <ppokorny@penguincomputing.com>
     Philipp Riederer <pt@philipptoelke.de>
     Phil Kauffman <philip@kauffman.me>
-    Phil Sutter <phil@nwl.cc>
     Ping Huang <huangping@smartx.com>
     Piotr Kubaj <pkubaj@anongoth.pl>
     Piotr P. Stefaniak <pstef@freebsd.org>
-    poscat <poscat@poscat.moe>
     Prakash Surya <prakash.surya@delphix.com>
     Prasad Joshi <prasadjoshi124@gmail.com>
     privb0x23 <privb0x23@users.noreply.github.com>
     P.SCH <p88@yahoo.com>
     Qiuhao Chen <chenqiuhao1997@gmail.com>
     Quartz <yyhran@163.com>
-    Quentin Thébault <quentin.thebault@defenso.fr>
     Quentin Zdanis <zdanisq@gmail.com>
     Rafael Kitover <rkitover@gmail.com>
     RageLtMan <sempervictus@users.noreply.github.com>
@@ -546,7 +520,6 @@ CONTRIBUTORS:
     Remy Blank <remy.blank@pobox.com>
     renelson <bnelson@nelsonbe.com>
     Reno Reckling <e-github@wthack.de>
-    René Wirnata <rene.wirnata@pandascience.net>
     Ricardo M. Correia <ricardo.correia@oracle.com>
     Riccardo Schirone <rschirone91@gmail.com>
     Richard Allen <belperite@gmail.com>
@@ -590,7 +563,6 @@ CONTRIBUTORS:
     Scot W. Stevenson <scot.stevenson@gmail.com>
     Sean Eric Fagan <sef@ixsystems.com>
     Sebastian Gottschall <s.gottschall@dd-wrt.com>
-    Sebastian Pauka <me@spauka.se>
     Sebastian Wuerl <s.wuerl@mailbox.org>
     Sebastien Roy <seb@delphix.com>
     Sen Haerens <sen@senhaerens.be>
@@ -603,11 +575,9 @@ CONTRIBUTORS:
     Shaun Tancheff <shaun@aeonazure.com>
     Shawn Bayern <sbayern@law.fsu.edu>
     Shengqi Chen <harry-chen@outlook.com>
-    SHENGYI HONG <aokblast@FreeBSD.org>
     Shen Yan <shenyanxxxy@qq.com>
     Sietse <sietse@wizdom.nu>
     Simon Guest <simon.guest@tesujimath.org>
-    Simon Howard <fraggle@soulsphere.org>
     Simon Klinkert <simon.klinkert@gmail.com>
     Sowrabha Gopal <sowrabha.gopal@delphix.com>
     Spencer Kinny <spencerkinny1995@gmail.com>
@@ -629,7 +599,6 @@ CONTRIBUTORS:
     Stéphane Lesimple <speed47_github@speed47.net>
     Suman Chakravartula <schakrava@gmail.com>
     Sydney Vanda <sydney.m.vanda@intel.com>
-    Syed Shahrukh Hussain <syed.shahrukh@ossrevival.org>
     Sören Tempel <soeren+git@soeren-tempel.net>
     Tamas TEVESZ <ice@extreme.hu>
     Teodor Spæren <teodor_spaeren@riseup.net>
@@ -647,12 +616,9 @@ CONTRIBUTORS:
     timor <timor.dd@googlemail.com>
     Timothy Day <tday141@gmail.com>
     Tim Schumacher <timschumi@gmx.de>
-    Tim Smith <tim@mondoo.com>
     Tino Reichardt <milky-zfs@mcmilk.de>
-    tleydxdy <shironeko.github@tesaguri.club>
     Tobin Harding <me@tobin.cc>
     Todd Seidelmann <seidelma@users.noreply.github.com>
-    Todd Zullinger <tmz@pobox.com>
     Tom Caputi <tcaputi@datto.com>
     Tom Matthews <tom@axiom-partners.com>
     Tomohiro Kusumi <kusumi.tomohiro@gmail.com>
@@ -674,7 +640,6 @@ CONTRIBUTORS:
     Vaibhav Bhanawat <vaibhav.bhanawat@delphix.com>
     Valmiky Arquissandas <kayvlim@gmail.com>
     Val Packett <val@packett.cool>
-    Vandana Rungta <vrungta@amazon.com>
     Vince van Oosten <techhazard@codeforyouand.me>
     Violet Purcell <vimproved@inventati.org>
     Vipin Kumar Verma <vipin.verma@hpe.com>

META

@@ -1,10 +1,10 @@
 Meta:          1
 Name:          zfs
 Branch:        1.0
-Version:       2.4.99
+Version:       2.3.1
 Release:       1
 Release-Tags:  relext
 License:       CDDL
 Author:        OpenZFS
-Linux-Maximum: 6.17
+Linux-Maximum: 6.13
 Linux-Minimum: 4.18

Makefile.am

@@ -1,7 +1,6 @@
 CLEANFILES =
 dist_noinst_DATA =
 INSTALL_DATA_HOOKS =
-INSTALL_EXEC_HOOKS =
 ALL_LOCAL =
 CLEAN_LOCAL =
 CHECKS = shellcheck checkbashisms
@@ -72,9 +71,6 @@ all: gitrev
 PHONY += install-data-hook $(INSTALL_DATA_HOOKS)
 install-data-hook: $(INSTALL_DATA_HOOKS)
 
-PHONY += install-exec-hook $(INSTALL_EXEC_HOOKS)
-install-exec-hook: $(INSTALL_EXEC_HOOKS)
-
 PHONY += maintainer-clean-local
 maintainer-clean-local:
 	-$(RM) $(GITREV)
@@ -116,10 +112,6 @@ commitcheck:
 		${top_srcdir}/scripts/commitcheck.sh; \
 	fi
 
-CHECKS += spdxcheck
-spdxcheck:
-	$(AM_V_at)$(top_srcdir)/scripts/spdxcheck.pl
-
 if HAVE_PARALLEL
 cstyle_line = -print0 | parallel -X0 ${top_srcdir}/scripts/cstyle.pl -cpP {}
 else

cmd/Makefile.am

@@ -98,16 +98,17 @@ endif
 
 
 if USING_PYTHON
-bin_SCRIPTS      += zarcsummary     zarcstat        dbufstat        zilstat
+bin_SCRIPTS      += arc_summary     arcstat        dbufstat        zilstat
-CLEANFILES       += zarcsummary     zarcstat        dbufstat        zilstat
+CLEANFILES       += arc_summary     arcstat        dbufstat        zilstat
-dist_noinst_DATA += %D%/zarcsummary %D%/zarcstat.in %D%/dbufstat.in %D%/zilstat.in
+dist_noinst_DATA += %D%/arc_summary %D%/arcstat.in %D%/dbufstat.in %D%/zilstat.in
 
-$(call SUBST,zarcstat,%D%/)
+$(call SUBST,arcstat,%D%/)
 $(call SUBST,dbufstat,%D%/)
 $(call SUBST,zilstat,%D%/)
-zarcsummary: %D%/zarcsummary
+arc_summary: %D%/arc_summary
 	$(AM_V_at)cp $< $@
 endif
 
+
 PHONY += cmd
 cmd: $(bin_SCRIPTS) $(bin_PROGRAMS) $(sbin_SCRIPTS) $(sbin_PROGRAMS) $(dist_bin_SCRIPTS) $(zfsexec_PROGRAMS) $(mounthelper_PROGRAMS)

cmd/arc_summary

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# SPDX-License-Identifier: BSD-2-Clause
 #
 # Copyright (c) 2008 Ben Rockwood <benr@cuddletech.com>,
 # Copyright (c) 2010 Martin Matuska <mm@FreeBSD.org>,
@@ -34,7 +33,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/openzfs/zfs/blob/master/module/zfs/arc.c for details.
-The original introduction to zarcsummary can be found at
+The original introduction to arc_summary can be found at
 http://cuddletech.com/?p=454
 """
 
@@ -161,7 +160,7 @@ elif sys.platform.startswith('linux'):
         return get_params(TUNABLES_PATH)
 
     def get_version_impl(request):
-        # The original zarcsummary called /sbin/modinfo/{spl,zfs} to get
+        # The original arc_summary called /sbin/modinfo/{spl,zfs} to get
         # the version information. We switch to /sys/module/{spl,zfs}/version
         # to make sure we get what is really loaded in the kernel
         try:
@@ -439,7 +438,7 @@ def print_header():
     """
 
     # datetime is now recommended over time but we keep the exact formatting
-    # from the older version of zarcsummary in case there are scripts
+    # from the older version of arc_summary in case there are scripts
     # that expect it in this way
     daydate = time.strftime(DATE_FORMAT)
     spc_date = LINE_LENGTH-len(daydate)
@@ -559,7 +558,6 @@ def section_arc(kstats_dict):
     print()
 
     compressed_size = arc_stats['compressed_size']
-    uncompressed_size = arc_stats['uncompressed_size']
     overhead_size = arc_stats['overhead_size']
     bonus_size = arc_stats['bonus_size']
     dnode_size = arc_stats['dnode_size']
@@ -672,8 +670,6 @@ def section_arc(kstats_dict):
     print()
 
     print('ARC misc:')
-    prt_i2('Uncompressed size:', f_perc(uncompressed_size, compressed_size),
-           f_bytes(uncompressed_size))
     prt_i1('Memory throttles:', arc_stats['memory_throttle_count'])
     prt_i1('Memory direct reclaims:', arc_stats['memory_direct_count'])
     prt_i1('Memory indirect reclaims:', arc_stats['memory_indirect_count'])

cmd/arcstat.in

@@ -1,8 +1,7 @@
 #!/usr/bin/env @PYTHON_SHEBANG@
-# SPDX-License-Identifier: CDDL-1.0
 #
 # Print out ZFS ARC Statistics exported via kstat(1)
-# For a definition of fields, or usage, use zarcstat -v
+# For a definition of fields, or usage, use arcstat -v
 #
 # This script was originally a fork of the original arcstat.pl (0.1)
 # by Neelakanth Nadgir, originally published on his Sun blog on
@@ -56,7 +55,6 @@ import time
 import getopt
 import re
 import copy
-import os
 
 from signal import signal, SIGINT, SIGWINCH, SIG_DFL
 
@@ -172,7 +170,7 @@ cols = {
     "zactive":    [7, 1000, "zfetch prefetches active per second"],
 }
 
-# ARC structural breakdown from zarcsummary
+# ARC structural breakdown from arc_summary
 structfields = {
     "cmp":      ["compressed", "Compressed"],
     "ovh":      ["overhead", "Overhead"],
@@ -188,7 +186,7 @@ structstats = {                             # size stats
     "sz":       ["_size", "size"],
 }
 
-# ARC types breakdown from zarcsummary
+# ARC types breakdown from arc_summary
 typefields = {
     "data":     ["data", "ARC data"],
     "meta":     ["metadata", "ARC metadata"],
@@ -199,7 +197,7 @@ typestats = {                               # size stats
     "sz":       ["_size", "size"],
 }
 
-# ARC states breakdown from zarcsummary
+# ARC states breakdown from arc_summary
 statefields = {
     "ano":      ["anon", "Anonymous"],
     "mfu":      ["mfu", "MFU"],
@@ -262,7 +260,7 @@ hdr_intr = 20          # Print header every 20 lines of output
 opfile = None
 sep = "  "              # Default separator is 2 spaces
 l2exist = False
-cmd = ("Usage: zarcstat [-havxp] [-f fields] [-o file] [-s string] [interval "
+cmd = ("Usage: arcstat [-havxp] [-f fields] [-o file] [-s string] [interval "
        "[count]]\n")
 cur = {}
 d = {}
@@ -349,10 +347,10 @@ def usage():
                      "character or string\n")
     sys.stderr.write("\t -p : Disable auto-scaling of numerical fields\n")
     sys.stderr.write("\nExamples:\n")
-    sys.stderr.write("\tzarcstat -o /tmp/a.log 2 10\n")
+    sys.stderr.write("\tarcstat -o /tmp/a.log 2 10\n")
-    sys.stderr.write("\tzarcstat -s \",\" -o /tmp/a.log 2 10\n")
+    sys.stderr.write("\tarcstat -s \",\" -o /tmp/a.log 2 10\n")
-    sys.stderr.write("\tzarcstat -v\n")
+    sys.stderr.write("\tarcstat -v\n")
-    sys.stderr.write("\tzarcstat -f time,hit%,dh%,ph%,mh% 1\n")
+    sys.stderr.write("\tarcstat -f time,hit%,dh%,ph%,mh% 1\n")
     sys.stderr.write("\n")
 
     sys.exit(1)
@@ -367,7 +365,7 @@ def snap_stats():
 
     cur = kstat
 
-    # fill in additional values from zarcsummary
+    # fill in additional values from arc_summary
     cur["caches_size"] = caches_size = cur["anon_data"]+cur["anon_metadata"]+\
         cur["mfu_data"]+cur["mfu_metadata"]+cur["mru_data"]+cur["mru_metadata"]+\
         cur["uncached_data"]+cur["uncached_metadata"]
@@ -736,14 +734,13 @@ def calculate():
                             v[group["percent"]] if v[group["percent"]] > 0 else 0
 
     if l2exist:
-        l2asize = cur["l2_asize"]
         v["l2hits"] = d["l2_hits"] / sint
         v["l2miss"] = d["l2_misses"] / sint
         v["l2read"] = v["l2hits"] + v["l2miss"]
         v["l2hit%"] = 100 * v["l2hits"] / v["l2read"] if v["l2read"] > 0 else 0
 
         v["l2miss%"] = 100 - v["l2hit%"] if v["l2read"] > 0 else 0
-        v["l2asize"] = l2asize
+        v["l2asize"] = cur["l2_asize"]
         v["l2size"] = cur["l2_size"]
         v["l2bytes"] = d["l2_read_bytes"] / sint
         v["l2wbytes"] = d["l2_write_bytes"] / sint
@@ -753,11 +750,11 @@ def calculate():
         v["l2mru"] = cur["l2_mru_asize"]
         v["l2data"] = cur["l2_bufc_data_asize"]
         v["l2meta"] = cur["l2_bufc_metadata_asize"]
-        v["l2pref%"] = 100 * v["l2pref"] / l2asize if l2asize > 0 else 0
+        v["l2pref%"] = 100 * v["l2pref"] / v["l2asize"]
-        v["l2mfu%"] = 100 * v["l2mfu"] / l2asize if l2asize > 0 else 0
+        v["l2mfu%"] = 100 * v["l2mfu"] / v["l2asize"]
-        v["l2mru%"] = 100 * v["l2mru"] / l2asize if l2asize > 0 else 0
+        v["l2mru%"] = 100 * v["l2mru"] / v["l2asize"]
-        v["l2data%"] = 100 * v["l2data"] / l2asize if l2asize > 0 else 0
+        v["l2data%"] = 100 * v["l2data"] / v["l2asize"]
-        v["l2meta%"] = 100 * v["l2meta"] / l2asize if l2asize > 0 else 0
+        v["l2meta%"] = 100 * v["l2meta"] / v["l2asize"]
 
     v["grow"] = 0 if cur["arc_no_grow"] else 1
     v["need"] = cur["arc_need_free"]
@@ -767,7 +764,6 @@ def calculate():
 
 
 def main():
-
     global sint
     global count
     global hdr_intr

cmd/dbufstat.in

@@ -1,5 +1,4 @@
 #!/usr/bin/env @PYTHON_SHEBANG@
-# SPDX-License-Identifier: CDDL-1.0
 #
 # Print out statistics for all cached dmu buffers.  This information
 # is available through the dbufs kstat and may be post-processed as

cmd/mount_zfs.c

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *

cmd/raidz_test/raidz_bench.c

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *

cmd/raidz_test/raidz_test.c

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *

cmd/raidz_test/raidz_test.h

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *

cmd/zdb/zdb.c

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *
@@ -107,9 +106,7 @@ extern uint_t zfs_reconstruct_indirect_combinations_max;
 extern uint_t zfs_btree_verify_intensity;
 
 static const char cmdname[] = "zdb";
-uint8_t dump_opt[512];
+uint8_t dump_opt[256];
-
-#define	ALLOCATED_OPT	256
 
 typedef void object_viewer_t(objset_t *, uint64_t, void *data, size_t size);
 
@@ -129,7 +126,6 @@ static zfs_range_tree_t *mos_refd_objs;
 static spa_t *spa;
 static objset_t *os;
 static boolean_t kernel_init_done;
-static boolean_t corruption_found = B_FALSE;
 
 static void snprintf_blkptr_compact(char *, size_t, const blkptr_t *,
     boolean_t);
@@ -179,7 +175,7 @@ static int
 sublivelist_verify_blkptr(void *arg, const blkptr_t *bp, boolean_t free,
     dmu_tx_t *tx)
 {
-	ASSERT0P(tx);
+	ASSERT3P(tx, ==, NULL);
 	struct sublivelist_verify *sv = arg;
 	sublivelist_verify_block_refcnt_t current = {
 			.svbr_blk = *bp,
@@ -211,7 +207,7 @@ sublivelist_verify_blkptr(void *arg, const blkptr_t *bp, boolean_t free,
 				sublivelist_verify_block_t svb = {
 				    .svb_dva = bp->blk_dva[i],
 				    .svb_allocated_txg =
-				    BP_GET_BIRTH(bp)
+				    BP_GET_LOGICAL_BIRTH(bp)
 				};
 
 				if (zfs_btree_find(&sv->sv_leftover, &svb,
@@ -253,7 +249,6 @@ sublivelist_verify_func(void *args, dsl_deadlist_entry_t *dle)
 		    &e->svbr_blk, B_TRUE);
 		(void) printf("\tERROR: %d unmatched FREE(s): %s\n",
 		    e->svbr_refcnt, blkbuf);
-		corruption_found = B_TRUE;
 	}
 	zfs_btree_destroy(&sv->sv_pair);
 
@@ -385,7 +380,7 @@ verify_livelist_allocs(metaslab_verify_t *mv, uint64_t txg,
 	sublivelist_verify_block_t svb = {{{0}}};
 	DVA_SET_VDEV(&svb.svb_dva, mv->mv_vdid);
 	DVA_SET_OFFSET(&svb.svb_dva, offset);
-	DVA_SET_ASIZE(&svb.svb_dva, 0);
+	DVA_SET_ASIZE(&svb.svb_dva, size);
 	zfs_btree_index_t where;
 	uint64_t end_offset = offset + size;
 
@@ -409,7 +404,6 @@ verify_livelist_allocs(metaslab_verify_t *mv, uint64_t txg,
 			    (u_longlong_t)DVA_GET_ASIZE(&found->svb_dva),
 			    (u_longlong_t)found->svb_allocated_txg,
 			    (u_longlong_t)txg);
-			corruption_found = B_TRUE;
 		}
 	}
 }
@@ -431,7 +425,6 @@ metaslab_spacemap_validation_cb(space_map_entry_t *sme, void *arg)
 			    (u_longlong_t)txg, (u_longlong_t)offset,
 			    (u_longlong_t)size, (u_longlong_t)mv->mv_vdid,
 			    (u_longlong_t)mv->mv_msid);
-			corruption_found = B_TRUE;
 		} else {
 			zfs_range_tree_add(mv->mv_allocated,
 			    offset, size);
@@ -445,7 +438,6 @@ metaslab_spacemap_validation_cb(space_map_entry_t *sme, void *arg)
 			    (u_longlong_t)txg, (u_longlong_t)offset,
 			    (u_longlong_t)size, (u_longlong_t)mv->mv_vdid,
 			    (u_longlong_t)mv->mv_msid);
-			corruption_found = B_TRUE;
 		} else {
 			zfs_range_tree_remove(mv->mv_allocated,
 			    offset, size);
@@ -533,7 +525,6 @@ mv_populate_livelist_allocs(metaslab_verify_t *mv, sublivelist_verify_t *sv)
 			    (u_longlong_t)DVA_GET_VDEV(&svb->svb_dva),
 			    (u_longlong_t)DVA_GET_OFFSET(&svb->svb_dva),
 			    (u_longlong_t)DVA_GET_ASIZE(&svb->svb_dva));
-			corruption_found = B_TRUE;
 			continue;
 		}
 
@@ -550,7 +541,6 @@ mv_populate_livelist_allocs(metaslab_verify_t *mv, sublivelist_verify_t *sv)
 			    (u_longlong_t)DVA_GET_VDEV(&svb->svb_dva),
 			    (u_longlong_t)DVA_GET_OFFSET(&svb->svb_dva),
 			    (u_longlong_t)DVA_GET_ASIZE(&svb->svb_dva));
-			corruption_found = B_TRUE;
 			continue;
 		}
 
@@ -628,9 +618,8 @@ livelist_metaslab_validate(spa_t *spa)
 			    metaslab_calculate_range_tree_type(vd, m,
 			    &start, &shift);
 			metaslab_verify_t mv;
-			mv.mv_allocated = zfs_range_tree_create_flags(
+			mv.mv_allocated = zfs_range_tree_create(NULL,
-			    NULL, type, NULL, start, shift,
+			    type, NULL, start, shift);
-			    0, "livelist_metaslab_validate:mv_allocated");
 			mv.mv_vdid = vd->vdev_id;
 			mv.mv_msid = m->ms_id;
 			mv.mv_start = m->ms_start;
@@ -664,7 +653,6 @@ livelist_metaslab_validate(spa_t *spa)
 	}
 	(void) printf("ERROR: Found livelist blocks marked as allocated "
 	    "for indirect vdevs:\n");
-	corruption_found = B_TRUE;
 
 	zfs_btree_index_t *where = NULL;
 	sublivelist_verify_block_t *svb;
@@ -808,8 +796,8 @@ usage(void)
 	    "[default is 200]\n");
 	(void) fprintf(stderr, "        -K --key=KEY                 "
 	    "decryption key for encrypted dataset\n");
-	(void) fprintf(stderr, "        -o --option=\"NAME=VALUE\" "
+	(void) fprintf(stderr, "        -o --option=\"OPTION=INTEGER\" "
-	    "set the named tunable to the given value\n");
+	    "set global variable to an unsigned 32-bit integer\n");
 	(void) fprintf(stderr, "        -p --path==PATH              "
 	    "use one or more with -e to specify path to vdev dir\n");
 	(void) fprintf(stderr, "        -P --parseable               "
@@ -837,7 +825,7 @@ usage(void)
 	(void) fprintf(stderr, "Specify an option more than once (e.g. -bb) "
 	    "to make only that option verbose\n");
 	(void) fprintf(stderr, "Default is to dump everything non-verbosely\n");
-	zdb_exit(2);
+	zdb_exit(1);
 }
 
 static void
@@ -902,9 +890,9 @@ dump_packed_nvlist(objset_t *os, uint64_t object, void *data, size_t size)
 	size_t nvsize = *(uint64_t *)data;
 	char *packed = umem_alloc(nvsize, UMEM_NOFAIL);
 
-	VERIFY0(dmu_read(os, object, 0, nvsize, packed, DMU_READ_PREFETCH));
+	VERIFY(0 == dmu_read(os, object, 0, nvsize, packed, DMU_READ_PREFETCH));
 
-	VERIFY0(nvlist_unpack(packed, nvsize, &nv, 0));
+	VERIFY(nvlist_unpack(packed, nvsize, &nv, 0) == 0);
 
 	umem_free(packed, nvsize);
 
@@ -1465,8 +1453,8 @@ get_obsolete_refcount(vdev_t *vd)
 			refcount++;
 		}
 	} else {
-		ASSERT0P(vd->vdev_obsolete_sm);
+		ASSERT3P(vd->vdev_obsolete_sm, ==, NULL);
-		ASSERT0(obsolete_sm_object);
+		ASSERT3U(obsolete_sm_object, ==, 0);
 	}
 	for (unsigned c = 0; c < vd->vdev_children; c++) {
 		refcount += get_obsolete_refcount(vd->vdev_child[c]);
@@ -1588,8 +1576,9 @@ dump_spacemap(objset_t *os, space_map_t *sm)
 			continue;
 		}
 
+		uint8_t words;
 		char entry_type;
-		uint64_t entry_off, entry_run, entry_vdev;
+		uint64_t entry_off, entry_run, entry_vdev = SM_NO_VDEVID;
 
 		if (sm_entry_is_single_word(word)) {
 			entry_type = (SM_TYPE_DECODE(word) == SM_ALLOC) ?
@@ -1597,44 +1586,36 @@ dump_spacemap(objset_t *os, space_map_t *sm)
 			entry_off = (SM_OFFSET_DECODE(word) << mapshift) +
 			    sm->sm_start;
 			entry_run = SM_RUN_DECODE(word) << mapshift;
-
+			words = 1;
-			(void) printf("\t    [%6llu] %c "
-			    "range: %012llx-%012llx size: %08llx\n",
-			    (u_longlong_t)entry_id, entry_type,
-			    (u_longlong_t)entry_off,
-			    (u_longlong_t)(entry_off + entry_run - 1),
-			    (u_longlong_t)entry_run);
 		} else {
 			/* it is a two-word entry so we read another word */
 			ASSERT(sm_entry_is_double_word(word));
 
 			uint64_t extra_word;
 			offset += sizeof (extra_word);
-			ASSERT3U(offset, <, space_map_length(sm));
 			VERIFY0(dmu_read(os, space_map_object(sm), offset,
 			    sizeof (extra_word), &extra_word,
 			    DMU_READ_PREFETCH));
 
+			ASSERT3U(offset, <=, space_map_length(sm));
+
 			entry_run = SM2_RUN_DECODE(word) << mapshift;
 			entry_vdev = SM2_VDEV_DECODE(word);
 			entry_type = (SM2_TYPE_DECODE(extra_word) == SM_ALLOC) ?
 			    'A' : 'F';
 			entry_off = (SM2_OFFSET_DECODE(extra_word) <<
 			    mapshift) + sm->sm_start;
-
+			words = 2;
-			if (zopt_metaslab_args == 0 ||
-			    zopt_metaslab[0] == entry_vdev) {
-				(void) printf("\t    [%6llu] %c "
-				    "range: %012llx-%012llx size: %08llx "
-				    "vdev: %llu\n",
-				    (u_longlong_t)entry_id, entry_type,
-				    (u_longlong_t)entry_off,
-				    (u_longlong_t)(entry_off + entry_run - 1),
-				    (u_longlong_t)entry_run,
-				    (u_longlong_t)entry_vdev);
-			}
 		}
 
+		(void) printf("\t    [%6llu]    %c  range:"
+		    " %010llx-%010llx  size: %06llx vdev: %06llu words: %u\n",
+		    (u_longlong_t)entry_id,
+		    entry_type, (u_longlong_t)entry_off,
+		    (u_longlong_t)(entry_off + entry_run),
+		    (u_longlong_t)entry_run,
+		    (u_longlong_t)entry_vdev, words);
+
 		if (entry_type == 'A')
 			alloc += entry_run;
 		else
@@ -1668,16 +1649,6 @@ dump_metaslab_stats(metaslab_t *msp)
 	dump_histogram(rt->rt_histogram, ZFS_RANGE_TREE_HISTOGRAM_SIZE, 0);
 }
 
-static void
-dump_allocated(void *arg, uint64_t start, uint64_t size)
-{
-	uint64_t *off = arg;
-	if (*off != start)
-		(void) printf("ALLOC: %"PRIu64" %"PRIu64"\n", *off,
-		    start - *off);
-	*off = start + size;
-}
-
 static void
 dump_metaslab(metaslab_t *msp)
 {
@@ -1694,24 +1665,13 @@ dump_metaslab(metaslab_t *msp)
 	    (u_longlong_t)msp->ms_id, (u_longlong_t)msp->ms_start,
 	    (u_longlong_t)space_map_object(sm), freebuf);
 
-	if (dump_opt[ALLOCATED_OPT] ||
+	if (dump_opt['m'] > 2 && !dump_opt['L']) {
-	    (dump_opt['m'] > 2 && !dump_opt['L'])) {
 		mutex_enter(&msp->ms_lock);
 		VERIFY0(metaslab_load(msp));
-	}
-
-	if (dump_opt['m'] > 2 && !dump_opt['L']) {
 		zfs_range_tree_stat_verify(msp->ms_allocatable);
 		dump_metaslab_stats(msp);
-	}
+		metaslab_unload(msp);
-
+		mutex_exit(&msp->ms_lock);
-	if (dump_opt[ALLOCATED_OPT]) {
-		uint64_t off = msp->ms_start;
-		zfs_range_tree_walk(msp->ms_allocatable, dump_allocated,
-		    &off);
-		if (off != msp->ms_start + msp->ms_size)
-			(void) printf("ALLOC: %"PRIu64" %"PRIu64"\n", off,
-			    msp->ms_size - off);
 	}
 
 	if (dump_opt['m'] > 1 && sm != NULL &&
@@ -1726,12 +1686,6 @@ dump_metaslab(metaslab_t *msp)
 		    SPACE_MAP_HISTOGRAM_SIZE, sm->sm_shift);
 	}
 
-	if (dump_opt[ALLOCATED_OPT] ||
-	    (dump_opt['m'] > 2 && !dump_opt['L'])) {
-		metaslab_unload(msp);
-		mutex_exit(&msp->ms_lock);
-	}
-
 	if (vd->vdev_ops == &vdev_draid_ops)
 		ASSERT3U(msp->ms_size, <=, 1ULL << vd->vdev_ms_shift);
 	else
@@ -1768,9 +1722,8 @@ print_vdev_metaslab_header(vdev_t *vd)
 		}
 	}
 
-	(void) printf("\tvdev %10llu\t%s  metaslab shift %4llu",
+	(void) printf("\tvdev %10llu   %s",
-	    (u_longlong_t)vd->vdev_id, bias_str,
+	    (u_longlong_t)vd->vdev_id, bias_str);
-	    (u_longlong_t)vd->vdev_ms_shift);
 
 	if (ms_flush_data_obj != 0) {
 		(void) printf("   ms_unflushed_phys object %llu",
@@ -1837,7 +1790,7 @@ print_vdev_indirect(vdev_t *vd)
 	vdev_indirect_births_t *vib = vd->vdev_indirect_births;
 
 	if (vim == NULL) {
-		ASSERT0P(vib);
+		ASSERT3P(vib, ==, NULL);
 		return;
 	}
 
@@ -1910,7 +1863,7 @@ dump_metaslabs(spa_t *spa)
 
 	(void) printf("\nMetaslabs:\n");
 
-	if (zopt_metaslab_args > 0) {
+	if (!dump_opt['d'] && zopt_metaslab_args > 0) {
 		c = zopt_metaslab[0];
 
 		if (c >= children)
@@ -2037,7 +1990,7 @@ dump_ddt_log(ddt_t *ddt)
 				c += strlcpy(&flagstr[c], " UNKNOWN",
 				    sizeof (flagstr) - c);
 			flagstr[1] = '[';
-			flagstr[c] = ']';
+			flagstr[c++] = ']';
 		}
 
 		uint64_t count = avl_numnodes(&ddl->ddl_tree);
@@ -2088,10 +2041,10 @@ dump_ddt_object(ddt_t *ddt, ddt_type_t type, ddt_class_t class)
 
 	if (error == ENOENT)
 		return;
-	ASSERT0(error);
+	ASSERT(error == 0);
 
 	error = ddt_object_count(ddt, type, class, &count);
-	ASSERT0(error);
+	ASSERT(error == 0);
 	if (count == 0)
 		return;
 
@@ -2106,8 +2059,6 @@ dump_ddt_object(ddt_t *ddt, ddt_type_t type, ddt_class_t class)
 	if (dump_opt['D'] < 3)
 		return;
 
-	(void) printf("%s: object=%llu\n", name,
-	    (u_longlong_t)ddt->ddt_object[type][class]);
 	zpool_dump_ddt(NULL, &ddt->ddt_histogram[type][class]);
 
 	if (dump_opt['D'] < 4)
@@ -2591,14 +2542,12 @@ snprintf_blkptr_compact(char *blkbuf, size_t buflen, const blkptr_t *bp,
 
 	blkbuf[0] = '\0';
 
-	for (i = 0; i < ndvas; i++) {
+	for (i = 0; i < ndvas; i++)
 		(void) snprintf(blkbuf + strlen(blkbuf),
-		    buflen - strlen(blkbuf), "%llu:%llx:%llx%s ",
+		    buflen - strlen(blkbuf), "%llu:%llx:%llx ",
 		    (u_longlong_t)DVA_GET_VDEV(&dva[i]),
 		    (u_longlong_t)DVA_GET_OFFSET(&dva[i]),
-		    (u_longlong_t)DVA_GET_ASIZE(&dva[i]),
+		    (u_longlong_t)DVA_GET_ASIZE(&dva[i]));
-		    (DVA_GET_GANG(&dva[i]) ? "G" : ""));
-	}
 
 	if (BP_IS_HOLE(bp)) {
 		(void) snprintf(blkbuf + strlen(blkbuf),
@@ -2614,7 +2563,7 @@ snprintf_blkptr_compact(char *blkbuf, size_t buflen, const blkptr_t *bp,
 		    (u_longlong_t)BP_GET_PSIZE(bp),
 		    (u_longlong_t)BP_GET_FILL(bp),
 		    (u_longlong_t)BP_GET_LOGICAL_BIRTH(bp),
-		    (u_longlong_t)BP_GET_PHYSICAL_BIRTH(bp));
+		    (u_longlong_t)BP_GET_BIRTH(bp));
 		if (bp_freed)
 			(void) snprintf(blkbuf + strlen(blkbuf),
 			    buflen - strlen(blkbuf), " %s", "FREE");
@@ -2628,17 +2577,19 @@ snprintf_blkptr_compact(char *blkbuf, size_t buflen, const blkptr_t *bp,
 	}
 }
 
-static u_longlong_t
+static void
 print_indirect(spa_t *spa, blkptr_t *bp, const zbookmark_phys_t *zb,
     const dnode_phys_t *dnp)
 {
 	char blkbuf[BP_SPRINTF_LEN];
-	u_longlong_t offset;
 	int l;
 
-	offset = (u_longlong_t)blkid2offset(dnp, bp, zb);
+	if (!BP_IS_EMBEDDED(bp)) {
+		ASSERT3U(BP_GET_TYPE(bp), ==, dnp->dn_type);
+		ASSERT3U(BP_GET_LEVEL(bp), ==, zb->zb_level);
+	}
 
-	(void) printf("%16llx ", offset);
+	(void) printf("%16llx ", (u_longlong_t)blkid2offset(dnp, bp, zb));
 
 	ASSERT(zb->zb_level >= 0);
 
@@ -2653,38 +2604,19 @@ print_indirect(spa_t *spa, blkptr_t *bp, const zbookmark_phys_t *zb,
 	snprintf_blkptr_compact(blkbuf, sizeof (blkbuf), bp, B_FALSE);
 	if (dump_opt['Z'] && BP_GET_COMPRESS(bp) == ZIO_COMPRESS_ZSTD)
 		snprintf_zstd_header(spa, blkbuf, sizeof (blkbuf), bp);
-	(void) printf("%s", blkbuf);
+	(void) printf("%s\n", blkbuf);
-
-	if (!BP_IS_EMBEDDED(bp)) {
-		if (BP_GET_TYPE(bp) != dnp->dn_type) {
-			(void) printf(" (ERROR: Block pointer type "
-			    "(%llu) does not match dnode type (%hhu))",
-			    BP_GET_TYPE(bp), dnp->dn_type);
-			corruption_found = B_TRUE;
-		}
-		if (BP_GET_LEVEL(bp) != zb->zb_level) {
-			(void) printf(" (ERROR: Block pointer level "
-			    "(%llu) does not match bookmark level (%lld))",
-			    BP_GET_LEVEL(bp), (longlong_t)zb->zb_level);
-			corruption_found = B_TRUE;
-		}
-	}
-	(void) printf("\n");
-
-	return (offset);
 }
 
 static int
 visit_indirect(spa_t *spa, const dnode_phys_t *dnp,
     blkptr_t *bp, const zbookmark_phys_t *zb)
 {
-	u_longlong_t offset;
 	int err = 0;
 
-	if (BP_GET_BIRTH(bp) == 0)
+	if (BP_GET_LOGICAL_BIRTH(bp) == 0)
 		return (0);
 
-	offset = print_indirect(spa, bp, zb, dnp);
+	print_indirect(spa, bp, zb, dnp);
 
 	if (BP_GET_LEVEL(bp) > 0 && !BP_IS_HOLE(bp)) {
 		arc_flags_t flags = ARC_FLAG_WAIT;
@@ -2714,15 +2646,8 @@ visit_indirect(spa_t *spa, const dnode_phys_t *dnp,
 				break;
 			fill += BP_GET_FILL(cbp);
 		}
-		if (!err) {
+		if (!err)
-			if (fill != BP_GET_FILL(bp)) {
+			ASSERT3U(fill, ==, BP_GET_FILL(bp));
-				(void) printf("%16llx: Block pointer "
-				    "fill (%llu) does not match calculated "
-				    "value (%llu)\n", offset, BP_GET_FILL(bp),
-				    (u_longlong_t)fill);
-				corruption_found = B_TRUE;
-			}
-		}
 		arc_buf_destroy(buf, &buf);
 	}
 
@@ -2876,7 +2801,7 @@ dump_bptree_cb(void *arg, const blkptr_t *bp, dmu_tx_t *tx)
 	(void) arg, (void) tx;
 	char blkbuf[BP_SPRINTF_LEN];
 
-	if (BP_GET_BIRTH(bp) != 0) {
+	if (BP_GET_LOGICAL_BIRTH(bp) != 0) {
 		snprintf_blkptr(blkbuf, sizeof (blkbuf), bp);
 		(void) printf("\t%s\n", blkbuf);
 	}
@@ -2917,7 +2842,7 @@ dump_bpobj_cb(void *arg, const blkptr_t *bp, boolean_t bp_freed, dmu_tx_t *tx)
 	(void) arg, (void) tx;
 	char blkbuf[BP_SPRINTF_LEN];
 
-	ASSERT(BP_GET_BIRTH(bp) != 0);
+	ASSERT(BP_GET_LOGICAL_BIRTH(bp) != 0);
 	snprintf_blkptr_compact(blkbuf, sizeof (blkbuf), bp, bp_freed);
 	(void) printf("\t%s\n", blkbuf);
 	return (0);
@@ -2978,7 +2903,6 @@ dump_full_bpobj(bpobj_t *bpo, const char *name, int indent)
 				(void) printf("ERROR %u while trying to open "
 				    "subobj id %llu\n",
 				    error, (u_longlong_t)subobj);
-				corruption_found = B_TRUE;
 				continue;
 			}
 			dump_full_bpobj(&subbpo, "subobj", indent + 1);
@@ -3158,7 +3082,6 @@ bpobj_count_refd(bpobj_t *bpo)
 				(void) printf("ERROR %u while trying to open "
 				    "subobj id %llu\n",
 				    error, (u_longlong_t)subobj);
-				corruption_found = B_TRUE;
 				continue;
 			}
 			bpobj_count_refd(&subbpo);
@@ -3180,7 +3103,7 @@ dsl_deadlist_entry_count_refd(void *arg, dsl_deadlist_entry_t *dle)
 static int
 dsl_deadlist_entry_dump(void *arg, dsl_deadlist_entry_t *dle)
 {
-	ASSERT0P(arg);
+	ASSERT(arg == NULL);
 	if (dump_opt['d'] >= 5) {
 		char buf[128];
 		(void) snprintf(buf, sizeof (buf),
@@ -3301,7 +3224,6 @@ zdb_derive_key(dsl_dir_t *dd, uint8_t *key_out)
 	uint64_t keyformat, salt, iters;
 	int i;
 	unsigned char c;
-	FILE *f;
 
 	VERIFY0(zap_lookup(dd->dd_pool->dp_meta_objset, dd->dd_crypto_obj,
 	    zfs_prop_to_name(ZFS_PROP_KEYFORMAT), sizeof (uint64_t),
@@ -3334,25 +3256,6 @@ zdb_derive_key(dsl_dir_t *dd, uint8_t *key_out)
 
 		break;
 
-	case ZFS_KEYFORMAT_RAW:
-		if ((f = fopen(key_material, "r")) == NULL)
-			return (B_FALSE);
-
-		if (fread(key_out, 1, WRAPPING_KEY_LEN, f) !=
-		    WRAPPING_KEY_LEN) {
-			(void) fclose(f);
-			return (B_FALSE);
-		}
-
-		/* Check the key length */
-		if (fgetc(f) != EOF) {
-			(void) fclose(f);
-			return (B_FALSE);
-		}
-
-		(void) fclose(f);
-		break;
-
 	default:
 		fatal("no support for key format %u\n",
 		    (unsigned int) keyformat);
@@ -3438,7 +3341,7 @@ open_objset(const char *path, const void *tag, objset_t **osp)
 	uint64_t sa_attrs = 0;
 	uint64_t version = 0;
 
-	VERIFY0P(sa_os);
+	VERIFY3P(sa_os, ==, NULL);
 
 	/*
 	 * We can't own an objset if it's redacted.  Therefore, we do this
@@ -3611,8 +3514,8 @@ dump_uidgid(objset_t *os, uint64_t uid, uint64_t gid)
 		uint64_t fuid_obj;
 
 		/* first find the fuid object.  It lives in the master node */
-		VERIFY0(zap_lookup(os, MASTER_NODE_OBJ, ZFS_FUID_TABLES,
+		VERIFY(zap_lookup(os, MASTER_NODE_OBJ, ZFS_FUID_TABLES,
-		    8, 1, &fuid_obj));
+		    8, 1, &fuid_obj) == 0);
 		zfs_fuid_avl_tree_create(&idx_tree, &domain_tree);
 		(void) zfs_fuid_table_load(os, fuid_obj,
 		    &idx_tree, &domain_tree);
@@ -5959,7 +5862,7 @@ zdb_count_block(zdb_cb_t *zcb, zilog_t *zilog, const blkptr_t *bp,
 		 * Find the block. This will create the entry in memory, but
 		 * we'll know if that happened by its refcount.
 		 */
-		ddt_entry_t *dde = ddt_lookup(ddt, bp, B_TRUE);
+		ddt_entry_t *dde = ddt_lookup(ddt, bp);
 
 		/*
 		 * ddt_lookup() can return NULL if this block didn't exist
@@ -6013,11 +5916,11 @@ zdb_count_block(zdb_cb_t *zcb, zilog_t *zilog, const blkptr_t *bp,
 		 * entry back to the block pointer before we claim it.
 		 */
 		if (v == DDT_PHYS_FLAT) {
-			ASSERT3U(BP_GET_PHYSICAL_BIRTH(bp), ==,
+			ASSERT3U(BP_GET_BIRTH(bp), ==,
 			    ddt_phys_birth(dde->dde_phys, v));
 			tempbp = *bp;
 			ddt_bp_fill(dde->dde_phys, v, &tempbp,
-			    BP_GET_PHYSICAL_BIRTH(bp));
+			    BP_GET_BIRTH(bp));
 			bp = &tempbp;
 		}
 
@@ -6243,7 +6146,7 @@ zdb_blkptr_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
 	if (zb->zb_level == ZB_DNODE_LEVEL)
 		return (0);
 
-	if (dump_opt['b'] >= 5 && BP_GET_BIRTH(bp) > 0) {
+	if (dump_opt['b'] >= 5 && BP_GET_LOGICAL_BIRTH(bp) > 0) {
 		char blkbuf[BP_SPRINTF_LEN];
 		snprintf_blkptr(blkbuf, sizeof (blkbuf), bp);
 		(void) printf("objset %llu object %llu "
@@ -6414,9 +6317,8 @@ zdb_claim_removing(spa_t *spa, zdb_cb_t *zcb)
 
 	ASSERT0(zfs_range_tree_space(svr->svr_allocd_segs));
 
-	zfs_range_tree_t *allocs = zfs_range_tree_create_flags(
+	zfs_range_tree_t *allocs = zfs_range_tree_create(NULL, ZFS_RANGE_SEG64,
-	    NULL, ZFS_RANGE_SEG64, NULL, 0, 0,
+	    NULL, 0, 0);
-	    0, "zdb_claim_removing:allocs");
 	for (uint64_t msi = 0; msi < vd->vdev_ms_count; msi++) {
 		metaslab_t *msp = vd->vdev_ms[msi];
 
@@ -6843,7 +6745,6 @@ zdb_leak_init(spa_t *spa, zdb_cb_t *zcb)
 	spa->spa_normal_class->mc_ops = &zdb_metaslab_ops;
 	spa->spa_log_class->mc_ops = &zdb_metaslab_ops;
 	spa->spa_embedded_log_class->mc_ops = &zdb_metaslab_ops;
-	spa->spa_special_embedded_log_class->mc_ops = &zdb_metaslab_ops;
 
 	zcb->zcb_vd_obsolete_counts =
 	    umem_zalloc(rvd->vdev_children * sizeof (uint32_t *),
@@ -6981,9 +6882,7 @@ zdb_leak_fini(spa_t *spa, zdb_cb_t *zcb)
 		for (uint64_t m = 0; m < vd->vdev_ms_count; m++) {
 			metaslab_t *msp = vd->vdev_ms[m];
 			ASSERT3P(msp->ms_group, ==, (msp->ms_group->mg_class ==
-			    spa_embedded_log_class(spa) ||
+			    spa_embedded_log_class(spa)) ?
-			    msp->ms_group->mg_class ==
-			    spa_special_embedded_log_class(spa)) ?
 			    vd->vdev_log_mg : vd->vdev_mg);
 
 			/*
@@ -7107,7 +7006,7 @@ deleted_livelists_count_blocks(spa_t *spa, zdb_cb_t *zbc)
 static void
 dump_livelist_cb(dsl_deadlist_t *ll, void *arg)
 {
-	ASSERT0P(arg);
+	ASSERT3P(arg, ==, NULL);
 	global_feature_count[SPA_FEATURE_LIVELIST]++;
 	dump_blkptr_list(ll, "Deleted Livelist");
 	dsl_deadlist_iterate(ll, sublivelist_verify_lightweight, NULL);
@@ -7217,8 +7116,6 @@ dump_block_stats(spa_t *spa)
 	zcb->zcb_totalasize += metaslab_class_get_alloc(spa_dedup_class(spa));
 	zcb->zcb_totalasize +=
 	    metaslab_class_get_alloc(spa_embedded_log_class(spa));
-	zcb->zcb_totalasize +=
-	    metaslab_class_get_alloc(spa_special_embedded_log_class(spa));
 	zcb->zcb_start = zcb->zcb_lastprint = gethrtime();
 	err = traverse_pool(spa, 0, flags, zdb_blkptr_cb, zcb);
 
@@ -7267,7 +7164,6 @@ dump_block_stats(spa_t *spa)
 	total_alloc = norm_alloc +
 	    metaslab_class_get_alloc(spa_log_class(spa)) +
 	    metaslab_class_get_alloc(spa_embedded_log_class(spa)) +
-	    metaslab_class_get_alloc(spa_special_embedded_log_class(spa)) +
 	    metaslab_class_get_alloc(spa_special_class(spa)) +
 	    metaslab_class_get_alloc(spa_dedup_class(spa)) +
 	    get_unflushed_alloc_space(spa);
@@ -7351,18 +7247,6 @@ dump_block_stats(spa_t *spa)
 		    100.0 * alloc / space);
 	}
 
-	if (spa_special_embedded_log_class(spa)->mc_allocator[0].mca_rotor
-	    != NULL) {
-		uint64_t alloc = metaslab_class_get_alloc(
-		    spa_special_embedded_log_class(spa));
-		uint64_t space = metaslab_class_get_space(
-		    spa_special_embedded_log_class(spa));
-
-		(void) printf("\t%-16s %14llu     used: %5.2f%%\n",
-		    "Special embedded log", (u_longlong_t)alloc,
-		    100.0 * alloc / space);
-	}
-
 	for (i = 0; i < NUM_BP_EMBEDDED_TYPES; i++) {
 		if (zcb->zcb_embedded_blocks[i] == 0)
 			continue;
@@ -7817,8 +7701,7 @@ zdb_set_skip_mmp(char *target)
  * applies to the new_path parameter if allocated.
  */
 static char *
-import_checkpointed_state(char *target, nvlist_t *cfg, boolean_t target_is_spa,
+import_checkpointed_state(char *target, nvlist_t *cfg, char **new_path)
-    char **new_path)
 {
 	int error = 0;
 	char *poolname, *bogus_name = NULL;
@@ -7826,11 +7709,11 @@ import_checkpointed_state(char *target, nvlist_t *cfg, boolean_t target_is_spa,
 
 	/* If the target is not a pool, the extract the pool name */
 	char *path_start = strchr(target, '/');
-	if (target_is_spa || path_start == NULL) {
+	if (path_start != NULL) {
-		poolname = target;
-	} else {
 		size_t poolname_len = path_start - target;
 		poolname = strndup(target, poolname_len);
+	} else {
+		poolname = target;
 	}
 
 	if (cfg == NULL) {
@@ -7861,11 +7744,10 @@ import_checkpointed_state(char *target, nvlist_t *cfg, boolean_t target_is_spa,
 		    "with error %d\n", bogus_name, error);
 	}
 
-	if (new_path != NULL && !target_is_spa) {
+	if (new_path != NULL && path_start != NULL) {
-		if (asprintf(new_path, "%s%s", bogus_name,
+		if (asprintf(new_path, "%s%s", bogus_name, path_start) == -1) {
-		    path_start != NULL ? path_start : "") == -1) {
 			free(bogus_name);
-			if (!target_is_spa && path_start != NULL)
+			if (path_start != NULL)
 				free(poolname);
 			return (NULL);
 		}
@@ -8004,7 +7886,7 @@ verify_checkpoint_vdev_spacemaps(spa_t *checkpoint, spa_t *current)
 		for (uint64_t c = ckpoint_rvd->vdev_children;
 		    c < current_rvd->vdev_children; c++) {
 			vdev_t *current_vd = current_rvd->vdev_child[c];
-			VERIFY0P(current_vd->vdev_checkpoint_sm);
+			VERIFY3P(current_vd->vdev_checkpoint_sm, ==, NULL);
 		}
 	}
 
@@ -8094,7 +7976,7 @@ verify_checkpoint_blocks(spa_t *spa)
 	 * name) so we can do verification on it against the current state
 	 * of the pool.
 	 */
-	checkpoint_pool = import_checkpointed_state(spa->spa_name, NULL, B_TRUE,
+	checkpoint_pool = import_checkpointed_state(spa->spa_name, NULL,
 	    NULL);
 	ASSERT(strcmp(spa->spa_name, checkpoint_pool) != 0);
 
@@ -8564,9 +8446,8 @@ dump_zpool(spa_t *spa)
 
 	if (dump_opt['d'] || dump_opt['i']) {
 		spa_feature_t f;
-		mos_refd_objs = zfs_range_tree_create_flags(
+		mos_refd_objs = zfs_range_tree_create(NULL, ZFS_RANGE_SEG64,
-		    NULL, ZFS_RANGE_SEG64, NULL, 0, 0,
+		    NULL, 0, 0);
-		    0, "dump_zpool:mos_refd_objs");
 		dump_objset(dp->dp_meta_objset);
 
 		if (dump_opt['d'] >= 3) {
@@ -8702,9 +8583,9 @@ zdb_dump_indirect(blkptr_t *bp, int nbps, int flags)
 }
 
 static void
-zdb_dump_gbh(void *buf, uint64_t size, int flags)
+zdb_dump_gbh(void *buf, int flags)
 {
-	zdb_dump_indirect((blkptr_t *)buf, gbh_nblkptrs(size), flags);
+	zdb_dump_indirect((blkptr_t *)buf, SPA_GBH_NBLKPTRS, flags);
 }
 
 static void
@@ -8894,6 +8775,7 @@ zdb_decompress_block(abd_t *pabd, void *buf, void *lbuf, uint64_t lsize,
 	(void) buf;
 	uint64_t orig_lsize = lsize;
 	boolean_t tryzle = ((getenv("ZDB_NO_ZLE") == NULL));
+	boolean_t found = B_FALSE;
 	/*
 	 * We don't know how the data was compressed, so just try
 	 * every decompress function at every inflated blocksize.
@@ -8936,19 +8818,20 @@ zdb_decompress_block(abd_t *pabd, void *buf, void *lbuf, uint64_t lsize,
 		for (cfuncp = cfuncs; *cfuncp; cfuncp++) {
 			if (try_decompress_block(pabd, lsize, psize, flags,
 			    *cfuncp, lbuf, lbuf2)) {
-				tryzle = B_FALSE;
+				found = B_TRUE;
 				break;
 			}
 		}
 		if (*cfuncp != 0)
 			break;
 	}
-	if (tryzle) {
+	if (!found && tryzle) {
 		for (lsize = orig_lsize; lsize <= maxlsize;
 		    lsize += SPA_MINBLOCKSIZE) {
 			if (try_decompress_block(pabd, lsize, psize, flags,
 			    ZIO_COMPRESS_ZLE, lbuf, lbuf2)) {
 				*cfuncp = ZIO_COMPRESS_ZLE;
+				found = B_TRUE;
 				break;
 			}
 		}
@@ -9095,7 +8978,7 @@ zdb_read_block(char *thing, spa_t *spa)
 
 	DVA_SET_VDEV(&dva[0], vd->vdev_id);
 	DVA_SET_OFFSET(&dva[0], offset);
-	DVA_SET_GANG(&dva[0], 0);
+	DVA_SET_GANG(&dva[0], !!(flags & ZDB_FLAG_GBH));
 	DVA_SET_ASIZE(&dva[0], vdev_psize_to_asize(vd, psize));
 
 	BP_SET_BIRTH(bp, TXG_INITIAL, TXG_INITIAL);
@@ -9110,7 +8993,7 @@ zdb_read_block(char *thing, spa_t *spa)
 	BP_SET_BYTEORDER(bp, ZFS_HOST_BYTEORDER);
 
 	spa_config_enter(spa, SCL_STATE, FTAG, RW_READER);
-	zio = zio_root(spa, NULL, NULL, ZIO_FLAG_CANFAIL);
+	zio = zio_root(spa, NULL, NULL, 0);
 
 	if (vd == vd->vdev_top) {
 		/*
@@ -9185,7 +9068,7 @@ zdb_read_block(char *thing, spa_t *spa)
 		zdb_dump_indirect((blkptr_t *)buf,
 		    orig_lsize / sizeof (blkptr_t), flags);
 	else if (flags & ZDB_FLAG_GBH)
-		zdb_dump_gbh(buf, lsize, flags);
+		zdb_dump_gbh(buf, flags);
 	else
 		zdb_dump_block(thing, buf, lsize, flags);
 
@@ -9232,7 +9115,7 @@ zdb_read_block(char *thing, spa_t *spa)
 				ck_zio->io_offset =
 				    DVA_GET_OFFSET(&bp->blk_dva[0]);
 				ck_zio->io_bp = bp;
-				zio_checksum_compute(ck_zio, ck, pabd, psize);
+				zio_checksum_compute(ck_zio, ck, pabd, lsize);
 				printf(
 				    "%12s\t"
 				    "cksum=%016llx:%016llx:%016llx:%016llx\n",
@@ -9425,8 +9308,6 @@ main(int argc, char **argv)
 		{"all-reconstruction",	no_argument,		NULL, 'Y'},
 		{"livelist",		no_argument,		NULL, 'y'},
 		{"zstd-headers",	no_argument,		NULL, 'Z'},
-		{"allocated-map",	no_argument,		NULL,
-		    ALLOCATED_OPT},
 		{0, 0, 0, 0}
 	};
 
@@ -9457,7 +9338,6 @@ main(int argc, char **argv)
 		case 'u':
 		case 'y':
 		case 'Z':
-		case ALLOCATED_OPT:
 			dump_opt[c]++;
 			dump_all = 0;
 			break;
@@ -9492,11 +9372,9 @@ main(int argc, char **argv)
 			while (*optarg != '\0') { *optarg++ = '*'; }
 			break;
 		case 'o':
-			dump_opt[c]++;
+			error = set_global_var(optarg);
-			dump_all = 0;
-			error = handle_tunable_option(optarg, B_FALSE);
 			if (error != 0)
-				zdb_exit(1);
+				usage();
 			break;
 		case 'p':
 			if (searchdirs == NULL) {
@@ -9662,12 +9540,6 @@ main(int argc, char **argv)
 			error = 0;
 			goto fini;
 		}
-		if (dump_opt['o'])
-			/*
-			 * Avoid blasting tunable options off the top of the
-			 * screen.
-			 */
-			zdb_exit(1);
 		usage();
 	}
 
@@ -9728,7 +9600,7 @@ main(int argc, char **argv)
 		} else if (objset_str && !zdb_numeric(objset_str + 1) &&
 		    dump_opt['N']) {
 			printf("Supply a numeric objset ID with -N\n");
-			error = 2;
+			error = 1;
 			goto fini;
 		}
 	} else {
@@ -9820,7 +9692,7 @@ main(int argc, char **argv)
 	char *checkpoint_target = NULL;
 	if (dump_opt['k']) {
 		checkpoint_pool = import_checkpointed_state(target, cfg,
-		    target_is_spa, &checkpoint_target);
+		    &checkpoint_target);
 
 		if (checkpoint_target != NULL)
 			target = checkpoint_target;
@@ -9837,7 +9709,7 @@ main(int argc, char **argv)
 	if (error == 0) {
 		if (dump_opt['k'] && (target_is_spa || dump_opt['R'])) {
 			ASSERT(checkpoint_pool != NULL);
-			ASSERT0P(checkpoint_target);
+			ASSERT(checkpoint_target == NULL);
 
 			error = spa_open(checkpoint_pool, &spa, FTAG);
 			if (error != 0) {
@@ -10030,8 +9902,5 @@ fini:
 	if (kernel_init_done)
 		kernel_fini();
 
-	if (corruption_found && error == 0)
-		error = 3;
-
 	return (error);
 }

cmd/zdb/zdb.h

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *
@@ -29,6 +28,6 @@
 #define	_ZDB_H
 
 void dump_intent_log(zilog_t *);
-extern uint8_t dump_opt[512];
+extern uint8_t dump_opt[256];
 
 #endif	/* _ZDB_H */

cmd/zdb/zdb_il.c

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *
@@ -48,6 +47,8 @@
 
 #include "zdb.h"
 
+extern uint8_t dump_opt[256];
+
 static char tab_prefix[4] = "\t\t\t";
 
 static void
@@ -174,7 +175,7 @@ zil_prt_rec_write(zilog_t *zilog, int txtype, const void *arg)
 
 	if (lr->lr_common.lrc_reclen == sizeof (lr_write_t)) {
 		(void) printf("%shas blkptr, %s\n", tab_prefix,
-		    !BP_IS_HOLE(bp) && BP_GET_BIRTH(bp) >=
+		    !BP_IS_HOLE(bp) && BP_GET_LOGICAL_BIRTH(bp) >=
 		    spa_min_claim_txg(zilog->zl_spa) ?
 		    "will claim" : "won't claim");
 		print_log_bp(bp, tab_prefix);
@@ -187,7 +188,7 @@ zil_prt_rec_write(zilog_t *zilog, int txtype, const void *arg)
 			(void) printf("%s<hole>\n", tab_prefix);
 			return;
 		}
-		if (BP_GET_BIRTH(bp) < zilog->zl_header->zh_claim_txg) {
+		if (BP_GET_LOGICAL_BIRTH(bp) < zilog->zl_header->zh_claim_txg) {
 			(void) printf("%s<block already committed>\n",
 			    tab_prefix);
 			return;
@@ -238,7 +239,7 @@ zil_prt_rec_write_enc(zilog_t *zilog, int txtype, const void *arg)
 
 	if (lr->lr_common.lrc_reclen == sizeof (lr_write_t)) {
 		(void) printf("%shas blkptr, %s\n", tab_prefix,
-		    !BP_IS_HOLE(bp) && BP_GET_BIRTH(bp) >=
+		    !BP_IS_HOLE(bp) && BP_GET_LOGICAL_BIRTH(bp) >=
 		    spa_min_claim_txg(zilog->zl_spa) ?
 		    "will claim" : "won't claim");
 		print_log_bp(bp, tab_prefix);
@@ -474,7 +475,7 @@ print_log_block(zilog_t *zilog, const blkptr_t *bp, void *arg,
 
 	if (claim_txg != 0)
 		claim = "already claimed";
-	else if (BP_GET_BIRTH(bp) >= spa_min_claim_txg(zilog->zl_spa))
+	else if (BP_GET_LOGICAL_BIRTH(bp) >= spa_min_claim_txg(zilog->zl_spa))
 		claim = "will claim";
 	else
 		claim = "won't claim";

cmd/zed/agents/fmd_api.c

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *

cmd/zed/agents/fmd_api.h

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *

cmd/zed/agents/fmd_serd.c

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *

cmd/zed/agents/fmd_serd.h

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *

cmd/zed/agents/zfs_agents.c

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *
@@ -134,13 +133,11 @@ zfs_agent_iter_vdev(zpool_handle_t *zhp, nvlist_t *nvl, void *arg)
 	 * of blkid cache and L2ARC VDEV does not contain pool guid in its
 	 * blkid, so this is a special case for L2ARC VDEV.
 	 */
-	else if (gsp->gs_vdev_guid != 0 &&
+	else if (gsp->gs_vdev_guid != 0 && gsp->gs_devid == NULL &&
 	    nvlist_lookup_uint64(nvl, ZPOOL_CONFIG_GUID, &vdev_guid) == 0 &&
 	    gsp->gs_vdev_guid == vdev_guid) {
-		if (gsp->gs_devid == NULL) {
+		(void) nvlist_lookup_string(nvl, ZPOOL_CONFIG_DEVID,
-			(void) nvlist_lookup_string(nvl, ZPOOL_CONFIG_DEVID,
+		    &gsp->gs_devid);
-			    &gsp->gs_devid);
-		}
 		(void) nvlist_lookup_uint64(nvl, ZPOOL_CONFIG_EXPANSION_TIME,
 		    &gsp->gs_vdev_expandtime);
 		return (B_TRUE);
@@ -158,28 +155,22 @@ zfs_agent_iter_pool(zpool_handle_t *zhp, void *arg)
 	/*
 	 * For each vdev in this pool, look for a match by devid
 	 */
-	boolean_t found = B_FALSE;
+	if ((config = zpool_get_config(zhp, NULL)) != NULL) {
-	uint64_t pool_guid;
+		if (nvlist_lookup_nvlist(config, ZPOOL_CONFIG_VDEV_TREE,
+		    &nvl) == 0) {
+			(void) zfs_agent_iter_vdev(zhp, nvl, gsp);
+		}
+	}
+	/*
+	 * if a match was found then grab the pool guid
+	 */
+	if (gsp->gs_vdev_guid && gsp->gs_devid) {
+		(void) nvlist_lookup_uint64(config, ZPOOL_CONFIG_POOL_GUID,
+		    &gsp->gs_pool_guid);
+	}
 
-	/* Get pool configuration and extract pool GUID */
-	if ((config = zpool_get_config(zhp, NULL)) == NULL ||
-	    nvlist_lookup_uint64(config, ZPOOL_CONFIG_POOL_GUID,
-	    &pool_guid) != 0)
-		goto out;
-
-	/* Skip this pool if we're looking for a specific pool */
-	if (gsp->gs_pool_guid != 0 && pool_guid != gsp->gs_pool_guid)
-		goto out;
-
-	if (nvlist_lookup_nvlist(config, ZPOOL_CONFIG_VDEV_TREE, &nvl) == 0)
-		found = zfs_agent_iter_vdev(zhp, nvl, gsp);
-
-	if (found && gsp->gs_pool_guid == 0)
-		gsp->gs_pool_guid = pool_guid;
-
-out:
 	zpool_close(zhp);
-	return (found);
+	return (gsp->gs_devid != NULL && gsp->gs_vdev_guid != 0);
 }
 
 void
@@ -241,17 +232,20 @@ zfs_agent_post_event(const char *class, const char *subclass, nvlist_t *nvl)
 		 * For multipath, spare and l2arc devices ZFS_EV_VDEV_GUID or
 		 * ZFS_EV_POOL_GUID may be missing so find them.
 		 */
-		search.gs_devid = devid;
+		if (devid == NULL || pool_guid == 0 || vdev_guid == 0) {
-		search.gs_vdev_guid = vdev_guid;
+			if (devid == NULL)
-		search.gs_pool_guid = pool_guid;
+				search.gs_vdev_guid = vdev_guid;
-		zpool_iter(g_zfs_hdl, zfs_agent_iter_pool, &search);
+			else
-		if (devid == NULL)
+				search.gs_devid = devid;
-			devid = search.gs_devid;
+			zpool_iter(g_zfs_hdl, zfs_agent_iter_pool, &search);
-		if (pool_guid == 0)
+			if (devid == NULL)
-			pool_guid = search.gs_pool_guid;
+				devid = search.gs_devid;
-		if (vdev_guid == 0)
+			if (pool_guid == 0)
-			vdev_guid = search.gs_vdev_guid;
+				pool_guid = search.gs_pool_guid;
-		devtype = search.gs_vdev_type;
+			if (vdev_guid == 0)
+				vdev_guid = search.gs_vdev_guid;
+			devtype = search.gs_vdev_type;
+		}
 
 		/*
 		 * We want to avoid reporting "remove" events coming from

cmd/zed/agents/zfs_agents.h

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *

cmd/zed/agents/zfs_diagnosis.c

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *

cmd/zed/agents/zfs_mod.c

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *
@@ -215,7 +214,6 @@ zfs_process_add(zpool_handle_t *zhp, nvlist_t *vdev, boolean_t labeled)
 	vdev_stat_t *vs;
 	char **lines = NULL;
 	int lines_cnt = 0;
-	int rc;
 
 	/*
 	 * Get the persistent path, typically under the '/dev/disk/by-id' or
@@ -407,17 +405,17 @@ zfs_process_add(zpool_handle_t *zhp, nvlist_t *vdev, boolean_t labeled)
 	}
 
 	nvlist_lookup_string(vdev, "new_devid", &new_devid);
+
 	if (is_mpath_wholedisk) {
 		/* Don't label device mapper or multipath disks. */
 		zed_log_msg(LOG_INFO,
 		    "  it's a multipath wholedisk, don't label");
-		rc = zpool_prepare_disk(zhp, vdev, "autoreplace", &lines,
+		if (zpool_prepare_disk(zhp, vdev, "autoreplace", &lines,
-		    &lines_cnt);
+		    &lines_cnt) != 0) {
-		if (rc != 0) {
 			zed_log_msg(LOG_INFO,
 			    "  zpool_prepare_disk: could not "
-			    "prepare '%s' (%s), path '%s', rc = %d", fullpath,
+			    "prepare '%s' (%s)", fullpath,
-			    libzfs_error_description(g_zfshdl), path, rc);
+			    libzfs_error_description(g_zfshdl));
 			if (lines_cnt > 0) {
 				zed_log_msg(LOG_INFO,
 				    "  zfs_prepare_disk output:");
@@ -448,13 +446,12 @@ zfs_process_add(zpool_handle_t *zhp, nvlist_t *vdev, boolean_t labeled)
 		 * If this is a request to label a whole disk, then attempt to
 		 * write out the label.
 		 */
-		rc = zpool_prepare_and_label_disk(g_zfshdl, zhp, leafname,
+		if (zpool_prepare_and_label_disk(g_zfshdl, zhp, leafname,
-		    vdev, "autoreplace", &lines, &lines_cnt);
+		    vdev, "autoreplace", &lines, &lines_cnt) != 0) {
-		if (rc != 0) {
 			zed_log_msg(LOG_WARNING,
 			    "  zpool_prepare_and_label_disk: could not "
-			    "label '%s' (%s), rc = %d", leafname,
+			    "label '%s' (%s)", leafname,
-			    libzfs_error_description(g_zfshdl), rc);
+			    libzfs_error_description(g_zfshdl));
 			if (lines_cnt > 0) {
 				zed_log_msg(LOG_INFO,
 				"  zfs_prepare_disk output:");

cmd/zed/agents/zfs_retire.c

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *
@@ -404,7 +403,6 @@ zfs_retire_recv(fmd_hdl_t *hdl, fmd_event_t *ep, nvlist_t *nvl,
 	    (state == VDEV_STATE_REMOVED || state == VDEV_STATE_FAULTED))) {
 		const char *devtype;
 		char *devname;
-		boolean_t skip_removal = B_FALSE;
 
 		if (nvlist_lookup_string(nvl, FM_EREPORT_PAYLOAD_ZFS_VDEV_TYPE,
 		    &devtype) == 0) {
@@ -442,28 +440,18 @@ zfs_retire_recv(fmd_hdl_t *hdl, fmd_event_t *ep, nvlist_t *nvl,
 		nvlist_lookup_uint64_array(vdev, ZPOOL_CONFIG_VDEV_STATS,
 		    (uint64_t **)&vs, &c);
 
-		if (vs->vs_state == VDEV_STATE_OFFLINE)
-			return;
-
 		/*
 		 * If state removed is requested for already removed vdev,
 		 * its a loopback event from spa_async_remove(). Just
 		 * ignore it.
 		 */
-		if ((vs->vs_state == VDEV_STATE_REMOVED &&
+		if ((vs->vs_state == VDEV_STATE_REMOVED && state ==
-		    state == VDEV_STATE_REMOVED)) {
+		    VDEV_STATE_REMOVED) || vs->vs_state == VDEV_STATE_OFFLINE)
-			if (strcmp(class, "resource.fs.zfs.removed") == 0 &&
+			return;
-			    nvlist_exists(nvl, "by_kernel")) {
-				skip_removal = B_TRUE;
-			} else {
-				return;
-			}
-		}
 
 		/* Remove the vdev since device is unplugged */
 		int remove_status = 0;
-		if (!skip_removal && (l2arc ||
+		if (l2arc || (strcmp(class, "resource.fs.zfs.removed") == 0)) {
-		    (strcmp(class, "resource.fs.zfs.removed") == 0))) {
 			remove_status = zpool_vdev_remove_wanted(zhp, devname);
 			fmd_hdl_debug(hdl, "zpool_vdev_remove_wanted '%s'"
 			    ", err:%d", devname, libzfs_errno(zhdl));

cmd/zed/zed.c

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * This file is part of the ZFS Event Daemon (ZED).
  *

cmd/zed/zed.d/Makefile.am

@@ -9,18 +9,18 @@ dist_zedexec_SCRIPTS = \
 	%D%/all-debug.sh \
 	%D%/all-syslog.sh \
 	%D%/data-notify.sh \
-	%D%/deadman-sync-slot_off.sh \
+	%D%/deadman-slot_off.sh \
 	%D%/generic-notify.sh \
-	%D%/pool_import-sync-led.sh \
+	%D%/pool_import-led.sh \
 	%D%/resilver_finish-notify.sh \
 	%D%/resilver_finish-start-scrub.sh \
 	%D%/scrub_finish-notify.sh \
-	%D%/statechange-sync-led.sh \
+	%D%/statechange-led.sh \
 	%D%/statechange-notify.sh \
-	%D%/statechange-sync-slot_off.sh \
+	%D%/statechange-slot_off.sh \
 	%D%/trim_finish-notify.sh \
-	%D%/vdev_attach-sync-led.sh \
+	%D%/vdev_attach-led.sh \
-	%D%/vdev_clear-sync-led.sh
+	%D%/vdev_clear-led.sh
 
 nodist_zedexec_SCRIPTS = \
 	%D%/history_event-zfs-list-cacher.sh
@@ -30,17 +30,17 @@ SUBSTFILES += $(nodist_zedexec_SCRIPTS)
 zedconfdefaults = \
 	all-syslog.sh \
 	data-notify.sh \
-	deadman-sync-slot_off.sh \
+	deadman-slot_off.sh \
 	history_event-zfs-list-cacher.sh \
-	pool_import-sync-led.sh \
+	pool_import-led.sh \
 	resilver_finish-notify.sh \
 	resilver_finish-start-scrub.sh \
 	scrub_finish-notify.sh \
-	statechange-sync-led.sh \
+	statechange-led.sh \
 	statechange-notify.sh \
-	statechange-sync-slot_off.sh \
+	statechange-slot_off.sh \
-	vdev_attach-sync-led.sh \
+	vdev_attach-led.sh \
-	vdev_clear-sync-led.sh
+	vdev_clear-led.sh
 
 dist_noinst_DATA += %D%/README
 

cmd/zed/zed.d/pool_import-led.sh

@@ -0,0 +1 @@
+statechange-led.sh

cmd/zed/zed.d/pool_import-sync-led.sh

@@ -1 +0,0 @@
-statechange-sync-led.sh

cmd/zed/zed.d/statechange-notify.sh

@@ -1,5 +1,4 @@
 #!/bin/sh
-# SPDX-License-Identifier: CDDL-1.0
 # shellcheck disable=SC2154
 #
 # CDDL HEADER START

cmd/zed/zed.d/vdev_attach-led.sh

@@ -0,0 +1 @@
+statechange-led.sh

cmd/zed/zed.d/vdev_attach-sync-led.sh

@@ -1 +0,0 @@
-statechange-sync-led.sh

cmd/zed/zed.d/vdev_clear-led.sh

@@ -0,0 +1 @@
+statechange-led.sh

cmd/zed/zed.d/vdev_clear-sync-led.sh

@@ -1 +0,0 @@
-statechange-sync-led.sh

cmd/zed/zed.d/zed-functions.sh

@@ -283,11 +283,6 @@ zed_notify_email()
         if [ "${ZED_EMAIL_OPTS%@SUBJECT@*}" = "${ZED_EMAIL_OPTS}" ] ; then
             # inject subject header
             printf "Subject: %s\n" "${subject}"
-            # The following empty line is needed to separate the header from the
-            # body of the message. Otherwise programs like sendmail will skip
-            # everything up to the first empty line (or wont send an email at
-            # all) and will still exit with exit code 0
-            printf "\n"
         fi
         # output message
         cat "${pathname}"
@@ -441,9 +436,8 @@ zed_notify_slack_webhook()
         "${pathname}")"
 
     # Construct the JSON message for posting.
-    # shellcheck disable=SC2016
     #
-    msg_json="$(printf '{"text": "*%s*\\n```%s```"}' "${subject}" "${msg_body}" )"
+    msg_json="$(printf '{"text": "*%s*\\n%s"}' "${subject}" "${msg_body}" )"
 
     # Send the POST request and check for errors.
     #

cmd/zed/zed.h

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * This file is part of the ZFS Event Daemon (ZED).
  *

cmd/zed/zed_conf.c

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * This file is part of the ZFS Event Daemon (ZED).
  *

cmd/zed/zed_conf.h

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * This file is part of the ZFS Event Daemon (ZED).
  *

cmd/zed/zed_disk_event.c

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *

cmd/zed/zed_disk_event.h

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *

cmd/zed/zed_event.c

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * This file is part of the ZFS Event Daemon (ZED).
  *
@@ -110,7 +109,7 @@ zed_event_fini(struct zed_conf *zcp)
 static void
 _bump_event_queue_length(void)
 {
-	int zzlm, wr;
+	int zzlm = -1, wr;
 	char qlen_buf[12] = {0}; /* parameter is int => max "-2147483647\n" */
 	long int qlen, orig_qlen;
 

cmd/zed/zed_event.h

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * This file is part of the ZFS Event Daemon (ZED).
  *

cmd/zed/zed_exec.c

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * This file is part of the ZFS Event Daemon (ZED).
  *
@@ -196,29 +195,37 @@ _nop(int sig)
 	(void) sig;
 }
 
-static void
+static void *
-wait_for_children(boolean_t do_pause, boolean_t wait)
+_reap_children(void *arg)
 {
-	pid_t pid;
+	(void) arg;
-	struct rusage usage;
-	int status;
 	struct launched_process_node node, *pnode;
+	pid_t pid;
+	int status;
+	struct rusage usage;
+	struct sigaction sa = {};
+
+	(void) sigfillset(&sa.sa_mask);
+	(void) sigdelset(&sa.sa_mask, SIGCHLD);
+	(void) pthread_sigmask(SIG_SETMASK, &sa.sa_mask, NULL);
+
+	(void) sigemptyset(&sa.sa_mask);
+	sa.sa_handler = _nop;
+	sa.sa_flags = SA_NOCLDSTOP;
+	(void) sigaction(SIGCHLD, &sa, NULL);
 
 	for (_reap_children_stop = B_FALSE; !_reap_children_stop; ) {
 		(void) pthread_mutex_lock(&_launched_processes_lock);
-		pid = wait4(0, &status, wait ? 0 : WNOHANG, &usage);
+		pid = wait4(0, &status, WNOHANG, &usage);
+
 		if (pid == 0 || pid == (pid_t)-1) {
 			(void) pthread_mutex_unlock(&_launched_processes_lock);
-			if ((pid == 0) || (errno == ECHILD)) {
+			if (pid == 0 || errno == ECHILD)
-				if (do_pause)
+				pause();
-					pause();
+			else if (errno != EINTR)
-			} else if (errno != EINTR)
 				zed_log_msg(LOG_WARNING,
 				    "Failed to wait for children: %s",
 				    strerror(errno));
-			if (!do_pause)
-				return;
-
 		} else {
 			memset(&node, 0, sizeof (node));
 			node.pid = pid;
@@ -270,25 +277,6 @@ wait_for_children(boolean_t do_pause, boolean_t wait)
 		}
 	}
 
-}
-
-static void *
-_reap_children(void *arg)
-{
-	(void) arg;
-	struct sigaction sa = {};
-
-	(void) sigfillset(&sa.sa_mask);
-	(void) sigdelset(&sa.sa_mask, SIGCHLD);
-	(void) pthread_sigmask(SIG_SETMASK, &sa.sa_mask, NULL);
-
-	(void) sigemptyset(&sa.sa_mask);
-	sa.sa_handler = _nop;
-	sa.sa_flags = SA_NOCLDSTOP;
-	(void) sigaction(SIGCHLD, &sa, NULL);
-
-	wait_for_children(B_TRUE, B_FALSE);
-
 	return (NULL);
 }
 
@@ -317,45 +305,6 @@ zed_exec_fini(void)
 	_reap_children_tid = (pthread_t)-1;
 }
 
-/*
- * Check if the zedlet name indicates if it is a synchronous zedlet
- *
- * Synchronous zedlets have a "-sync-" immediately following the event name in
- * their zedlet filename, like:
- *
- * EVENT_NAME-sync-ZEDLETNAME.sh
- *
- * For example, if you wanted a synchronous statechange script:
- *
- * statechange-sync-myzedlet.sh
- *
- * Synchronous zedlets are guaranteed to be the only zedlet running.  No other
- * zedlets may run in parallel with a synchronous zedlet.  A synchronous
- * zedlet will wait for all previously spawned zedlets to finish before running.
- * Users should be careful to only use synchronous zedlets when needed, since
- * they decrease parallelism.
- */
-static boolean_t
-zedlet_is_sync(const char *zedlet, const char *event)
-{
-	const char *sync_str = "-sync-";
-	size_t sync_str_len;
-	size_t zedlet_len;
-	size_t event_len;
-
-	sync_str_len = strlen(sync_str);
-	zedlet_len = strlen(zedlet);
-	event_len = strlen(event);
-
-	if (event_len + sync_str_len >= zedlet_len)
-		return (B_FALSE);
-
-	if (strncmp(&zedlet[event_len], sync_str, sync_str_len) == 0)
-		return (B_TRUE);
-
-	return (B_FALSE);
-}
-
 /*
  * Process the event [eid] by synchronously invoking all zedlets with a
  * matching class prefix.
@@ -418,28 +367,9 @@ zed_exec_process(uint64_t eid, const char *class, const char *subclass,
 	    z = zed_strings_next(zcp->zedlets)) {
 		for (csp = class_strings; *csp; csp++) {
 			n = strlen(*csp);
-			if ((strncmp(z, *csp, n) == 0) && !isalpha(z[n])) {
+			if ((strncmp(z, *csp, n) == 0) && !isalpha(z[n]))
-				boolean_t is_sync = zedlet_is_sync(z, *csp);
-
-				if (is_sync) {
-					/*
-					 * Wait for previous zedlets to
-					 * finish
-					 */
-					wait_for_children(B_FALSE, B_TRUE);
-				}
-
 				_zed_exec_fork_child(eid, zcp->zedlet_dir,
 				    z, e, zcp->zevent_fd, zcp->do_foreground);
-
-				if (is_sync) {
-					/*
-					 * Wait for sync zedlet we just launched
-					 * to finish.
-					 */
-					wait_for_children(B_FALSE, B_TRUE);
-				}
-			}
 		}
 	}
 	free(e);

cmd/zed/zed_exec.h

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * This file is part of the ZFS Event Daemon (ZED).
  *

cmd/zed/zed_file.c

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * This file is part of the ZFS Event Daemon (ZED).
  *

cmd/zed/zed_file.h

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * This file is part of the ZFS Event Daemon (ZED).
  *

cmd/zed/zed_log.c

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * This file is part of the ZFS Event Daemon (ZED).
  *

cmd/zed/zed_log.h

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * This file is part of the ZFS Event Daemon (ZED).
  *

cmd/zed/zed_strings.c

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * This file is part of the ZFS Event Daemon (ZED).
  *

cmd/zed/zed_strings.h

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * This file is part of the ZFS Event Daemon (ZED).
  *

cmd/zfs/zfs_iter.c

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *

cmd/zfs/zfs_iter.h

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *

cmd/zfs/zfs_main.c

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *
@@ -37,7 +36,6 @@
 #include <assert.h>
 #include <ctype.h>
 #include <sys/debug.h>
-#include <dirent.h>
 #include <errno.h>
 #include <getopt.h>
 #include <libgen.h>
@@ -122,7 +120,6 @@ static int zfs_do_change_key(int argc, char **argv);
 static int zfs_do_project(int argc, char **argv);
 static int zfs_do_version(int argc, char **argv);
 static int zfs_do_redact(int argc, char **argv);
-static int zfs_do_rewrite(int argc, char **argv);
 static int zfs_do_wait(int argc, char **argv);
 
 #ifdef __FreeBSD__
@@ -195,7 +192,6 @@ typedef enum {
 	HELP_CHANGE_KEY,
 	HELP_VERSION,
 	HELP_REDACT,
-	HELP_REWRITE,
 	HELP_JAIL,
 	HELP_UNJAIL,
 	HELP_WAIT,
@@ -230,7 +226,7 @@ static zfs_command_t command_table[] = {
 	{ "promote",	zfs_do_promote,		HELP_PROMOTE		},
 	{ "rename",	zfs_do_rename,		HELP_RENAME		},
 	{ "bookmark",	zfs_do_bookmark,	HELP_BOOKMARK		},
-	{ "diff",	zfs_do_diff,		HELP_DIFF		},
+	{ "program",    zfs_do_channel_program, HELP_CHANNEL_PROGRAM    },
 	{ NULL },
 	{ "list",	zfs_do_list,		HELP_LIST		},
 	{ NULL },
@@ -252,31 +248,27 @@ static zfs_command_t command_table[] = {
 	{ NULL },
 	{ "send",	zfs_do_send,		HELP_SEND		},
 	{ "receive",	zfs_do_receive,		HELP_RECEIVE		},
-	{ "redact",	zfs_do_redact,		HELP_REDACT		},
 	{ NULL },
 	{ "allow",	zfs_do_allow,		HELP_ALLOW		},
+	{ NULL },
 	{ "unallow",	zfs_do_unallow,		HELP_UNALLOW		},
 	{ NULL },
 	{ "hold",	zfs_do_hold,		HELP_HOLD		},
 	{ "holds",	zfs_do_holds,		HELP_HOLDS		},
 	{ "release",	zfs_do_release,		HELP_RELEASE		},
-	{ NULL },
+	{ "diff",	zfs_do_diff,		HELP_DIFF		},
 	{ "load-key",	zfs_do_load_key,	HELP_LOAD_KEY		},
 	{ "unload-key",	zfs_do_unload_key,	HELP_UNLOAD_KEY		},
 	{ "change-key",	zfs_do_change_key,	HELP_CHANGE_KEY		},
-	{ NULL },
+	{ "redact",	zfs_do_redact,		HELP_REDACT		},
-	{ "program",	zfs_do_channel_program,	HELP_CHANNEL_PROGRAM	},
-	{ "rewrite",	zfs_do_rewrite,		HELP_REWRITE		},
 	{ "wait",	zfs_do_wait,		HELP_WAIT		},
 
 #ifdef __FreeBSD__
-	{ NULL },
 	{ "jail",	zfs_do_jail,		HELP_JAIL		},
 	{ "unjail",	zfs_do_unjail,		HELP_UNJAIL		},
 #endif
 
 #ifdef __linux__
-	{ NULL },
 	{ "zone",	zfs_do_zone,		HELP_ZONE		},
 	{ "unzone",	zfs_do_unzone,		HELP_UNZONE		},
 #endif
@@ -439,9 +431,6 @@ get_usage(zfs_help_t idx)
 	case HELP_REDACT:
 		return (gettext("\tredact <snapshot> <bookmark> "
 		    "<redaction_snapshot> ...\n"));
-	case HELP_REWRITE:
-		return (gettext("\trewrite [-Prvx] [-o <offset>] [-l <length>] "
-		    "<directory|file ...>\n"));
 	case HELP_JAIL:
 		return (gettext("\tjail <jailid|jailname> <filesystem>\n"));
 	case HELP_UNJAIL:
@@ -923,22 +912,26 @@ zfs_do_clone(int argc, char **argv)
 	return (!!ret);
 
 usage:
-	ASSERT0P(zhp);
+	ASSERT3P(zhp, ==, NULL);
 	nvlist_free(props);
 	usage(B_FALSE);
 	return (-1);
 }
 
 /*
- * Calculate the minimum allocation size based on the top-level vdevs.
+ * Return a default volblocksize for the pool which always uses more than
+ * half of the data sectors.  This primarily applies to dRAID which always
+ * writes full stripe widths.
  */
 static uint64_t
-calculate_volblocksize(nvlist_t *config)
+default_volblocksize(zpool_handle_t *zhp, nvlist_t *props)
 {
-	uint64_t asize = SPA_MINBLOCKSIZE;
+	uint64_t volblocksize, asize = SPA_MINBLOCKSIZE;
 	nvlist_t *tree, **vdevs;
 	uint_t nvdevs;
 
+	nvlist_t *config = zpool_get_config(zhp, NULL);
+
 	if (nvlist_lookup_nvlist(config, ZPOOL_CONFIG_VDEV_TREE, &tree) != 0 ||
 	    nvlist_lookup_nvlist_array(tree, ZPOOL_CONFIG_CHILDREN,
 	    &vdevs, &nvdevs) != 0) {
@@ -969,24 +962,6 @@ calculate_volblocksize(nvlist_t *config)
 		}
 	}
 
-	return (asize);
-}
-
-/*
- * Return a default volblocksize for the pool which always uses more than
- * half of the data sectors.  This primarily applies to dRAID which always
- * writes full stripe widths.
- */
-static uint64_t
-default_volblocksize(zpool_handle_t *zhp, nvlist_t *props)
-{
-	uint64_t volblocksize, asize = SPA_MINBLOCKSIZE;
-
-	nvlist_t *config = zpool_get_config(zhp, NULL);
-
-	if (nvlist_lookup_uint64(config, ZPOOL_CONFIG_MAX_ALLOC, &asize) != 0)
-		asize = calculate_volblocksize(config);
-
 	/*
 	 * Calculate the target volblocksize such that more than half
 	 * of the asize is used. The following table is for 4k sectors.
@@ -1988,8 +1963,9 @@ fill_dataset_info(nvlist_t *list, zfs_handle_t *zhp, boolean_t as_int)
 	}
 
 	if (type == ZFS_TYPE_SNAPSHOT) {
-		char *snap = strdup(zfs_get_name(zhp));
+		char *ds, *snap;
-		char *ds = strsep(&snap, "@");
+		ds = snap = strdup(zfs_get_name(zhp));
+		ds = strsep(&snap, "@");
 		fnvlist_add_string(list, "dataset", ds);
 		fnvlist_add_string(list, "snapshot_name", snap);
 		free(ds);
@@ -2032,7 +2008,8 @@ get_callback(zfs_handle_t *zhp, void *data)
 	nvlist_t *user_props = zfs_get_user_props(zhp);
 	zprop_list_t *pl = cbp->cb_proplist;
 	nvlist_t *propval;
-	nvlist_t *item, *d = NULL, *props = NULL;
+	nvlist_t *item, *d, *props;
+	item = d = props = NULL;
 	const char *strval;
 	const char *sourceval;
 	boolean_t received = is_recvd_column(cbp);
@@ -3008,8 +2985,7 @@ us_type2str(unsigned field_type)
 }
 
 static int
-userspace_cb(void *arg, const char *domain, uid_t rid, uint64_t space,
+userspace_cb(void *arg, const char *domain, uid_t rid, uint64_t space)
-    uint64_t default_quota)
 {
 	us_cbdata_t *cb = (us_cbdata_t *)arg;
 	zfs_userquota_prop_t prop = cb->cb_prop;
@@ -3165,7 +3141,7 @@ userspace_cb(void *arg, const char *domain, uid_t rid, uint64_t space,
 	    prop == ZFS_PROP_PROJECTUSED) {
 		propname = "used";
 		if (!nvlist_exists(props, "quota"))
-			(void) nvlist_add_uint64(props, "quota", default_quota);
+			(void) nvlist_add_uint64(props, "quota", 0);
 	} else if (prop == ZFS_PROP_USERQUOTA || prop == ZFS_PROP_GROUPQUOTA ||
 	    prop == ZFS_PROP_PROJECTQUOTA) {
 		propname = "quota";
@@ -3174,10 +3150,8 @@ userspace_cb(void *arg, const char *domain, uid_t rid, uint64_t space,
 	} else if (prop == ZFS_PROP_USEROBJUSED ||
 	    prop == ZFS_PROP_GROUPOBJUSED || prop == ZFS_PROP_PROJECTOBJUSED) {
 		propname = "objused";
-		if (!nvlist_exists(props, "objquota")) {
+		if (!nvlist_exists(props, "objquota"))
-			(void) nvlist_add_uint64(props, "objquota",
+			(void) nvlist_add_uint64(props, "objquota", 0);
-			    default_quota);
-		}
 	} else if (prop == ZFS_PROP_USEROBJQUOTA ||
 	    prop == ZFS_PROP_GROUPOBJQUOTA ||
 	    prop == ZFS_PROP_PROJECTOBJQUOTA) {
@@ -4465,7 +4439,7 @@ zfs_do_rollback(int argc, char **argv)
 	if (cb.cb_create > 0)
 		min_txg = cb.cb_create;
 
-	if ((ret = zfs_iter_snapshots_sorted_v2(zhp, 0, rollback_check, &cb,
+	if ((ret = zfs_iter_snapshots_v2(zhp, 0, rollback_check, &cb,
 	    min_txg, 0)) != 0)
 		goto out;
 	if ((ret = zfs_iter_bookmarks_v2(zhp, 0, rollback_check, &cb)) != 0)
@@ -5317,9 +5291,7 @@ zfs_do_receive(int argc, char **argv)
 #define	ZFS_DELEG_PERM_MOUNT		"mount"
 #define	ZFS_DELEG_PERM_SHARE		"share"
 #define	ZFS_DELEG_PERM_SEND		"send"
-#define	ZFS_DELEG_PERM_SEND_RAW		"send:raw"
 #define	ZFS_DELEG_PERM_RECEIVE		"receive"
-#define	ZFS_DELEG_PERM_RECEIVE_APPEND	"receive:append"
 #define	ZFS_DELEG_PERM_ALLOW		"allow"
 #define	ZFS_DELEG_PERM_USERPROP		"userprop"
 #define	ZFS_DELEG_PERM_VSCAN		"vscan" /* ??? */
@@ -5360,7 +5332,6 @@ static zfs_deleg_perm_tab_t zfs_deleg_perm_tbl[] = {
 	{ ZFS_DELEG_PERM_RENAME, ZFS_DELEG_NOTE_RENAME },
 	{ ZFS_DELEG_PERM_ROLLBACK, ZFS_DELEG_NOTE_ROLLBACK },
 	{ ZFS_DELEG_PERM_SEND, ZFS_DELEG_NOTE_SEND },
-	{ ZFS_DELEG_PERM_SEND_RAW, ZFS_DELEG_NOTE_SEND_RAW },
 	{ ZFS_DELEG_PERM_SHARE, ZFS_DELEG_NOTE_SHARE },
 	{ ZFS_DELEG_PERM_SNAPSHOT, ZFS_DELEG_NOTE_SNAPSHOT },
 	{ ZFS_DELEG_PERM_BOOKMARK, ZFS_DELEG_NOTE_BOOKMARK },
@@ -5893,7 +5864,7 @@ parse_fs_perm_set(fs_perm_set_t *fspset, nvlist_t *nvl)
 static inline const char *
 deleg_perm_comment(zfs_deleg_note_t note)
 {
-	const char *str;
+	const char *str = "";
 
 	/* subcommands */
 	switch (note) {
@@ -5945,10 +5916,6 @@ deleg_perm_comment(zfs_deleg_note_t note)
 	case ZFS_DELEG_NOTE_SEND:
 		str = gettext("");
 		break;
-	case ZFS_DELEG_NOTE_SEND_RAW:
-		str = gettext("Allow sending ONLY encrypted (raw) replication"
-		    "\n\t\t\t\tstreams");
-		break;
 	case ZFS_DELEG_NOTE_SHARE:
 		str = gettext("Allows sharing file systems over NFS or SMB"
 		    "\n\t\t\t\tprotocols");
@@ -6878,17 +6845,17 @@ print_holds(boolean_t scripted, int nwidth, int tagwidth, nvlist_t *nvl,
 
 			if (scripted) {
 				if (parsable) {
-					(void) printf("%s\t%s\t%lld\n", zname,
+					(void) printf("%s\t%s\t%ld\n", zname,
-					    tagname, (long long)time);
+					    tagname, time);
 				} else {
 					(void) printf("%s\t%s\t%s\n", zname,
 					    tagname, tsbuf);
 				}
 			} else {
 				if (parsable) {
-					(void) printf("%-*s  %-*s  %lld\n",
+					(void) printf("%-*s  %-*s  %ld\n",
 					    nwidth, zname, tagwidth,
-					    tagname, (long long)time);
+					    tagname, time);
 				} else {
 					(void) printf("%-*s  %-*s  %s\n",
 					    nwidth, zname, tagwidth,
@@ -7747,7 +7714,6 @@ unshare_unmount_path(int op, char *path, int flags, boolean_t is_manual)
 	struct extmnttab entry;
 	const char *cmdname = (op == OP_SHARE) ? "unshare" : "unmount";
 	ino_t path_inode;
-	char *zfs_mntpnt, *entry_mntpnt;
 
 	/*
 	 * Search for the given (major,minor) pair in the mount table.
@@ -7789,24 +7755,6 @@ unshare_unmount_path(int op, char *path, int flags, boolean_t is_manual)
 		goto out;
 	}
 
-	/*
-	 * If the filesystem is mounted, check that the mountpoint matches
-	 * the one in the mnttab entry w.r.t. provided path. If it doesn't,
-	 * then we should not proceed further.
-	 */
-	entry_mntpnt = strdup(entry.mnt_mountp);
-	if (zfs_is_mounted(zhp, &zfs_mntpnt)) {
-		if (strcmp(zfs_mntpnt, entry_mntpnt) != 0) {
-			(void) fprintf(stderr, gettext("cannot %s '%s': "
-			    "not an original mountpoint\n"), cmdname, path);
-			free(zfs_mntpnt);
-			free(entry_mntpnt);
-			goto out;
-		}
-		free(zfs_mntpnt);
-	}
-	free(entry_mntpnt);
-
 	if (op == OP_SHARE) {
 		char nfs_mnt_prop[ZFS_MAXPROPLEN];
 		char smbshare_prop[ZFS_MAXPROPLEN];
@@ -9063,195 +9011,6 @@ zfs_do_project(int argc, char **argv)
 	return (ret);
 }
 
-static int
-zfs_rewrite_file(const char *path, boolean_t verbose, zfs_rewrite_args_t *args)
-{
-	int fd, ret = 0;
-
-	fd = open(path, O_WRONLY);
-	if (fd < 0) {
-		ret = errno;
-		(void) fprintf(stderr, gettext("failed to open %s: %s\n"),
-		    path, strerror(errno));
-		return (ret);
-	}
-
-	if (ioctl(fd, ZFS_IOC_REWRITE, args) < 0) {
-		ret = errno;
-		(void) fprintf(stderr, gettext("failed to rewrite %s: %s\n"),
-		    path, strerror(errno));
-	} else if (verbose) {
-		printf("%s\n", path);
-	}
-
-	close(fd);
-	return (ret);
-}
-
-static int
-zfs_rewrite_dir(const char *path, boolean_t verbose, boolean_t xdev, dev_t dev,
-    zfs_rewrite_args_t *args, nvlist_t *dirs)
-{
-	struct dirent *ent;
-	DIR *dir;
-	int ret = 0, err;
-
-	dir = opendir(path);
-	if (dir == NULL) {
-		if (errno == ENOENT)
-			return (0);
-		ret = errno;
-		(void) fprintf(stderr, gettext("failed to opendir %s: %s\n"),
-		    path, strerror(errno));
-		return (ret);
-	}
-
-	size_t plen = strlen(path) + 1;
-	while ((ent = readdir(dir)) != NULL) {
-		char *fullname;
-		struct stat st;
-
-		if (ent->d_type != DT_REG && ent->d_type != DT_DIR)
-			continue;
-
-		if (strcmp(ent->d_name, ".") == 0 ||
-		    strcmp(ent->d_name, "..") == 0)
-			continue;
-
-		if (plen + strlen(ent->d_name) >= PATH_MAX) {
-			(void) fprintf(stderr, gettext("path too long %s/%s\n"),
-			    path, ent->d_name);
-			ret = ENAMETOOLONG;
-			continue;
-		}
-
-		if (asprintf(&fullname, "%s/%s", path, ent->d_name) == -1) {
-			(void) fprintf(stderr,
-			    gettext("failed to allocate memory\n"));
-			ret = ENOMEM;
-			continue;
-		}
-
-		if (xdev) {
-			if (lstat(fullname, &st) < 0) {
-				ret = errno;
-				(void) fprintf(stderr,
-				    gettext("failed to stat %s: %s\n"),
-				    fullname, strerror(errno));
-				free(fullname);
-				continue;
-			}
-			if (st.st_dev != dev) {
-				free(fullname);
-				continue;
-			}
-		}
-
-		if (ent->d_type == DT_REG) {
-			err = zfs_rewrite_file(fullname, verbose, args);
-			if (err)
-				ret = err;
-		} else { /* DT_DIR */
-			fnvlist_add_uint64(dirs, fullname, dev);
-		}
-
-		free(fullname);
-	}
-
-	closedir(dir);
-	return (ret);
-}
-
-static int
-zfs_rewrite_path(const char *path, boolean_t verbose, boolean_t recurse,
-    boolean_t xdev, zfs_rewrite_args_t *args, nvlist_t *dirs)
-{
-	struct stat st;
-	int ret = 0;
-
-	if (lstat(path, &st) < 0) {
-		ret = errno;
-		(void) fprintf(stderr, gettext("failed to stat %s: %s\n"),
-		    path, strerror(errno));
-		return (ret);
-	}
-
-	if (S_ISREG(st.st_mode)) {
-		ret = zfs_rewrite_file(path, verbose, args);
-	} else if (S_ISDIR(st.st_mode) && recurse) {
-		ret = zfs_rewrite_dir(path, verbose, xdev, st.st_dev, args,
-		    dirs);
-	}
-	return (ret);
-}
-
-static int
-zfs_do_rewrite(int argc, char **argv)
-{
-	int ret = 0, err, c;
-	boolean_t recurse = B_FALSE, verbose = B_FALSE, xdev = B_FALSE;
-
-	if (argc < 2)
-		usage(B_FALSE);
-
-	zfs_rewrite_args_t args;
-	memset(&args, 0, sizeof (args));
-
-	while ((c = getopt(argc, argv, "Pl:o:rvx")) != -1) {
-		switch (c) {
-		case 'P':
-			args.flags |= ZFS_REWRITE_PHYSICAL;
-			break;
-		case 'l':
-			args.len = strtoll(optarg, NULL, 0);
-			break;
-		case 'o':
-			args.off = strtoll(optarg, NULL, 0);
-			break;
-		case 'r':
-			recurse = B_TRUE;
-			break;
-		case 'v':
-			verbose = B_TRUE;
-			break;
-		case 'x':
-			xdev = B_TRUE;
-			break;
-		default:
-			(void) fprintf(stderr, gettext("invalid option '%c'\n"),
-			    optopt);
-			usage(B_FALSE);
-		}
-	}
-
-	argv += optind;
-	argc -= optind;
-	if (argc == 0) {
-		(void) fprintf(stderr,
-		    gettext("missing file or directory target(s)\n"));
-		usage(B_FALSE);
-	}
-
-	nvlist_t *dirs = fnvlist_alloc();
-	for (int i = 0; i < argc; i++) {
-		err = zfs_rewrite_path(argv[i], verbose, recurse, xdev, &args,
-		    dirs);
-		if (err)
-			ret = err;
-	}
-	nvpair_t *dir;
-	while ((dir = nvlist_next_nvpair(dirs, NULL)) != NULL) {
-		err = zfs_rewrite_dir(nvpair_name(dir), verbose, xdev,
-		    fnvpair_value_uint64(dir), &args, dirs);
-		if (err)
-			ret = err;
-		fnvlist_remove_nvpair(dirs, dir);
-	}
-	fnvlist_free(dirs);
-
-	return (ret);
-}
-
 static int
 zfs_do_wait(int argc, char **argv)
 {

cmd/zfs/zfs_project.c

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *

cmd/zfs/zfs_projectutil.h

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *

cmd/zfs/zfs_util.h

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *

cmd/zfs_ids_to_path.c

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *

cmd/zgenhostid.c

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *

cmd/zhack.c

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *
@@ -54,7 +53,6 @@
 #include <sys/dmu_tx.h>
 #include <zfeature_common.h>
 #include <libzutil.h>
-#include <sys/metaslab_impl.h>
 
 static importargs_t g_importargs;
 static char *g_pool;
@@ -70,8 +68,7 @@ static __attribute__((noreturn)) void
 usage(void)
 {
 	(void) fprintf(stderr,
-	    "Usage: zhack [-o tunable] [-c cachefile] [-d dir] <subcommand> "
+	    "Usage: zhack [-c cachefile] [-d dir] <subcommand> <args> ...\n"
-	    "<args> ...\n"
 	    "where <subcommand> <args> is one of the following:\n"
 	    "\n");
 
@@ -95,10 +92,7 @@ usage(void)
 	    "        -c repair corrupted label checksums\n"
 	    "        -u restore the label on a detached device\n"
 	    "\n"
-	    "    <device> : path to vdev\n"
+	    "    <device> : path to vdev\n");
-	    "\n"
-	    "    metaslab leak <pool>\n"
-	    "        apply allocation map from zdb to specified pool\n");
 	exit(1);
 }
 
@@ -167,9 +161,9 @@ zhack_import(char *target, boolean_t readonly)
 
 	props = NULL;
 	if (readonly) {
-		VERIFY0(nvlist_alloc(&props, NV_UNIQUE_NAME, 0));
+		VERIFY(nvlist_alloc(&props, NV_UNIQUE_NAME, 0) == 0);
-		VERIFY0(nvlist_add_uint64(props,
+		VERIFY(nvlist_add_uint64(props,
-		    zpool_prop_to_name(ZPOOL_PROP_READONLY), 1));
+		    zpool_prop_to_name(ZPOOL_PROP_READONLY), 1) == 0);
 	}
 
 	zfeature_checks_disable = B_TRUE;
@@ -223,8 +217,8 @@ dump_obj(objset_t *os, uint64_t obj, const char *name)
 		} else {
 			ASSERT(za->za_integer_length == 1);
 			char val[1024];
-			VERIFY0(zap_lookup(os, obj, za->za_name,
+			VERIFY(zap_lookup(os, obj, za->za_name,
-			    1, sizeof (val), val));
+			    1, sizeof (val), val) == 0);
 			(void) printf("\t%s = %s\n", za->za_name, val);
 		}
 	}
@@ -368,12 +362,10 @@ feature_incr_sync(void *arg, dmu_tx_t *tx)
 	zfeature_info_t *feature = arg;
 	uint64_t refcount;
 
-	mutex_enter(&spa->spa_feat_stats_lock);
 	VERIFY0(feature_get_refcount_from_disk(spa, feature, &refcount));
 	feature_sync(spa, feature, refcount + 1, tx);
 	spa_history_log_internal(spa, "zhack feature incr", tx,
 	    "name=%s", feature->fi_guid);
-	mutex_exit(&spa->spa_feat_stats_lock);
 }
 
 static void
@@ -383,12 +375,10 @@ feature_decr_sync(void *arg, dmu_tx_t *tx)
 	zfeature_info_t *feature = arg;
 	uint64_t refcount;
 
-	mutex_enter(&spa->spa_feat_stats_lock);
 	VERIFY0(feature_get_refcount_from_disk(spa, feature, &refcount));
 	feature_sync(spa, feature, refcount - 1, tx);
 	spa_history_log_internal(spa, "zhack feature decr", tx,
 	    "name=%s", feature->fi_guid);
-	mutex_exit(&spa->spa_feat_stats_lock);
 }
 
 static void
@@ -505,186 +495,6 @@ zhack_do_feature(int argc, char **argv)
 	return (0);
 }
 
-static boolean_t
-strstarts(const char *a, const char *b)
-{
-	return (strncmp(a, b, strlen(b)) == 0);
-}
-
-static void
-metaslab_force_alloc(metaslab_t *msp, uint64_t start, uint64_t size,
-    dmu_tx_t *tx)
-{
-	ASSERT(msp->ms_disabled);
-	ASSERT(MUTEX_HELD(&msp->ms_lock));
-	uint64_t txg = dmu_tx_get_txg(tx);
-
-	uint64_t off = start;
-	while (off < start + size) {
-		uint64_t ostart, osize;
-		boolean_t found = zfs_range_tree_find_in(msp->ms_allocatable,
-		    off, start + size - off, &ostart, &osize);
-		if (!found)
-			break;
-		zfs_range_tree_remove(msp->ms_allocatable, ostart, osize);
-
-		if (zfs_range_tree_is_empty(msp->ms_allocating[txg & TXG_MASK]))
-			vdev_dirty(msp->ms_group->mg_vd, VDD_METASLAB, msp,
-			    txg);
-
-		zfs_range_tree_add(msp->ms_allocating[txg & TXG_MASK], ostart,
-		    osize);
-		msp->ms_allocating_total += osize;
-		off = ostart + osize;
-	}
-}
-
-static void
-zhack_do_metaslab_leak(int argc, char **argv)
-{
-	int c;
-	char *target;
-	spa_t *spa;
-
-	optind = 1;
-	boolean_t force = B_FALSE;
-	while ((c = getopt(argc, argv, "f")) != -1) {
-		switch (c) {
-		case 'f':
-			force = B_TRUE;
-			break;
-		default:
-			usage();
-			break;
-		}
-	}
-
-	argc -= optind;
-	argv += optind;
-
-	if (argc < 1) {
-		(void) fprintf(stderr, "error: missing pool name\n");
-		usage();
-	}
-	target = argv[0];
-
-	zhack_spa_open(target, B_FALSE, FTAG, &spa);
-	spa_config_enter(spa, SCL_VDEV | SCL_ALLOC, FTAG, RW_READER);
-
-	char *line = NULL;
-	size_t cap = 0;
-
-	vdev_t *vd = NULL;
-	metaslab_t *prev = NULL;
-	dmu_tx_t *tx = NULL;
-	while (getline(&line, &cap, stdin) > 0) {
-		if (strstarts(line, "\tvdev ")) {
-			uint64_t vdev_id, ms_shift;
-			if (sscanf(line,
-			    "\tvdev %10"PRIu64"\t%*s  metaslab shift %4"PRIu64,
-			    &vdev_id, &ms_shift) == 1) {
-				VERIFY3U(sscanf(line, "\tvdev %"PRIu64
-				    "\t  metaslab shift %4"PRIu64,
-				    &vdev_id, &ms_shift), ==, 2);
-			}
-			vd = vdev_lookup_top(spa, vdev_id);
-			if (vd == NULL) {
-				fprintf(stderr, "error: no such vdev with "
-				    "id %"PRIu64"\n", vdev_id);
-				break;
-			}
-			if (tx) {
-				dmu_tx_commit(tx);
-				mutex_exit(&prev->ms_lock);
-				metaslab_enable(prev, B_FALSE, B_FALSE);
-				tx = NULL;
-				prev = NULL;
-			}
-			if (vd->vdev_ms_shift != ms_shift) {
-				fprintf(stderr, "error: ms_shift mismatch: %"
-				    PRIu64" != %"PRIu64"\n", vd->vdev_ms_shift,
-				    ms_shift);
-				break;
-			}
-		} else if (strstarts(line, "\tmetaslabs ")) {
-			uint64_t ms_count;
-			VERIFY3U(sscanf(line, "\tmetaslabs %"PRIu64, &ms_count),
-			    ==, 1);
-			ASSERT(vd);
-			if (!force && vd->vdev_ms_count != ms_count) {
-				fprintf(stderr, "error: ms_count mismatch: %"
-				    PRIu64" != %"PRIu64"\n", vd->vdev_ms_count,
-				    ms_count);
-				break;
-			}
-		} else if (strstarts(line, "ALLOC:")) {
-			uint64_t start, size;
-			VERIFY3U(sscanf(line, "ALLOC: %"PRIu64" %"PRIu64"\n",
-			    &start, &size), ==, 2);
-
-			ASSERT(vd);
-			metaslab_t *cur =
-			    vd->vdev_ms[start >> vd->vdev_ms_shift];
-			if (prev != cur) {
-				if (prev) {
-					dmu_tx_commit(tx);
-					mutex_exit(&prev->ms_lock);
-					metaslab_enable(prev, B_FALSE, B_FALSE);
-				}
-				ASSERT(cur);
-				metaslab_disable(cur);
-				mutex_enter(&cur->ms_lock);
-				metaslab_load(cur);
-				prev = cur;
-				tx = dmu_tx_create_dd(
-				    spa_get_dsl(vd->vdev_spa)->dp_root_dir);
-				dmu_tx_assign(tx, DMU_TX_WAIT);
-			}
-
-			metaslab_force_alloc(cur, start, size, tx);
-		} else {
-			continue;
-		}
-	}
-	if (tx) {
-		dmu_tx_commit(tx);
-		mutex_exit(&prev->ms_lock);
-		metaslab_enable(prev, B_FALSE, B_FALSE);
-		tx = NULL;
-		prev = NULL;
-	}
-	if (line)
-		free(line);
-
-	spa_config_exit(spa, SCL_VDEV | SCL_ALLOC, FTAG);
-	spa_close(spa, FTAG);
-}
-
-static int
-zhack_do_metaslab(int argc, char **argv)
-{
-	char *subcommand;
-
-	argc--;
-	argv++;
-	if (argc == 0) {
-		(void) fprintf(stderr,
-		    "error: no metaslab operation specified\n");
-		usage();
-	}
-
-	subcommand = argv[0];
-	if (strcmp(subcommand, "leak") == 0) {
-		zhack_do_metaslab_leak(argc, argv);
-	} else {
-		(void) fprintf(stderr, "error: unknown subcommand: %s\n",
-		    subcommand);
-		usage();
-	}
-
-	return (0);
-}
-
 #define	ASHIFT_UBERBLOCK_SHIFT(ashift)	\
 	MIN(MAX(ashift, UBERBLOCK_SHIFT), \
 	MAX_UBERBLOCK_SHIFT)
@@ -714,23 +524,6 @@ zhack_repair_read_label(const int fd, vdev_label_t *vl,
 	return (0);
 }
 
-static int
-zhack_repair_get_byteswap(const zio_eck_t *vdev_eck, const int l, int *byteswap)
-{
-	if (vdev_eck->zec_magic == ZEC_MAGIC) {
-		*byteswap = B_FALSE;
-	} else if (vdev_eck->zec_magic == BSWAP_64((uint64_t)ZEC_MAGIC)) {
-		*byteswap = B_TRUE;
-	} else {
-		(void) fprintf(stderr, "error: label %d: "
-		    "Expected the nvlist checksum magic number but instead got "
-		    "0x%" PRIx64 "\n",
-		    l, vdev_eck->zec_magic);
-		return (1);
-	}
-	return (0);
-}
-
 static void
 zhack_repair_calc_cksum(const int byteswap, void *data, const uint64_t offset,
     const uint64_t abdsize, zio_eck_t *eck, zio_cksum_t *cksum)
@@ -757,10 +550,33 @@ zhack_repair_calc_cksum(const int byteswap, void *data, const uint64_t offset,
 }
 
 static int
-zhack_repair_get_ashift(nvlist_t *cfg, const int l, uint64_t *ashift)
+zhack_repair_check_label(uberblock_t *ub, const int l, const char **cfg_keys,
+    const size_t cfg_keys_len, nvlist_t *cfg, nvlist_t *vdev_tree_cfg,
+    uint64_t *ashift)
 {
 	int err;
-	nvlist_t *vdev_tree_cfg;
+
+	if (ub->ub_txg != 0) {
+		(void) fprintf(stderr,
+		    "error: label %d: UB TXG of 0 expected, but got %"
+		    PRIu64 "\n",
+		    l, ub->ub_txg);
+		(void) fprintf(stderr, "It would appear the device was not "
+		    "properly removed.\n");
+		return (1);
+	}
+
+	for (int i = 0; i < cfg_keys_len; i++) {
+		uint64_t val;
+		err = nvlist_lookup_uint64(cfg, cfg_keys[i], &val);
+		if (err) {
+			(void) fprintf(stderr,
+			    "error: label %d, %d: "
+			    "cannot find nvlist key %s\n",
+			    l, i, cfg_keys[i]);
+			return (err);
+		}
+	}
 
 	err = nvlist_lookup_nvlist(cfg,
 	    ZPOOL_CONFIG_VDEV_TREE, &vdev_tree_cfg);
@@ -784,7 +600,7 @@ zhack_repair_get_ashift(nvlist_t *cfg, const int l, uint64_t *ashift)
 		(void) fprintf(stderr,
 		    "error: label %d: nvlist key %s is zero\n",
 		    l, ZPOOL_CONFIG_ASHIFT);
-		return (1);
+		return (err);
 	}
 
 	return (0);
@@ -799,35 +615,30 @@ zhack_repair_undetach(uberblock_t *ub, nvlist_t *cfg, const int l)
 	 */
 	if (BP_GET_LOGICAL_BIRTH(&ub->ub_rootbp) != 0) {
 		const uint64_t txg = BP_GET_LOGICAL_BIRTH(&ub->ub_rootbp);
-		int err;
-
 		ub->ub_txg = txg;
 
-		err = nvlist_remove_all(cfg, ZPOOL_CONFIG_CREATE_TXG);
+		if (nvlist_remove_all(cfg, ZPOOL_CONFIG_CREATE_TXG) != 0) {
-		if (err) {
 			(void) fprintf(stderr,
 			    "error: label %d: "
 			    "Failed to remove pool creation TXG\n",
 			    l);
-			return (err);
+			return (1);
 		}
 
-		err = nvlist_remove_all(cfg, ZPOOL_CONFIG_POOL_TXG);
+		if (nvlist_remove_all(cfg, ZPOOL_CONFIG_POOL_TXG) != 0) {
-		if (err) {
 			(void) fprintf(stderr,
 			    "error: label %d: Failed to remove pool TXG to "
 			    "be replaced.\n",
 			    l);
-			return (err);
+			return (1);
 		}
 
-		err = nvlist_add_uint64(cfg, ZPOOL_CONFIG_POOL_TXG, txg);
+		if (nvlist_add_uint64(cfg, ZPOOL_CONFIG_POOL_TXG, txg) != 0) {
-		if (err) {
 			(void) fprintf(stderr,
 			    "error: label %d: "
 			    "Failed to add pool TXG of %" PRIu64 "\n",
 			    l, txg);
-			return (err);
+			return (1);
 		}
 	}
 
@@ -921,7 +732,6 @@ zhack_repair_test_cksum(const int byteswap, void *vdev_data,
 	    BSWAP_64(ZEC_MAGIC) : ZEC_MAGIC;
 	const uint64_t actual_magic = vdev_eck->zec_magic;
 	int err = 0;
-
 	if (actual_magic != expected_magic) {
 		(void) fprintf(stderr, "error: label %d: "
 		    "Expected "
@@ -943,36 +753,6 @@ zhack_repair_test_cksum(const int byteswap, void *vdev_data,
 	return (err);
 }
 
-static int
-zhack_repair_unpack_cfg(vdev_label_t *vl, const int l, nvlist_t **cfg)
-{
-	const char *cfg_keys[] = { ZPOOL_CONFIG_VERSION,
-	    ZPOOL_CONFIG_POOL_STATE, ZPOOL_CONFIG_GUID };
-	int err;
-
-	err = nvlist_unpack(vl->vl_vdev_phys.vp_nvlist,
-	    VDEV_PHYS_SIZE - sizeof (zio_eck_t), cfg, 0);
-	if (err) {
-		(void) fprintf(stderr,
-		    "error: cannot unpack nvlist label %d\n", l);
-		return (err);
-	}
-
-	for (int i = 0; i < ARRAY_SIZE(cfg_keys); i++) {
-		uint64_t val;
-		err = nvlist_lookup_uint64(*cfg, cfg_keys[i], &val);
-		if (err) {
-			(void) fprintf(stderr,
-			    "error: label %d, %d: "
-			    "cannot find nvlist key %s\n",
-			    l, i, cfg_keys[i]);
-			return (err);
-		}
-	}
-
-	return (0);
-}
-
 static void
 zhack_repair_one_label(const zhack_repair_op_t op, const int fd,
     vdev_label_t *vl, const uint64_t label_offset, const int l,
@@ -986,7 +766,10 @@ zhack_repair_one_label(const zhack_repair_op_t op, const int fd,
 	    (zio_eck_t *)((char *)(vdev_data) + VDEV_PHYS_SIZE) - 1;
 	const uint64_t vdev_phys_offset =
 	    label_offset + offsetof(vdev_label_t, vl_vdev_phys);
+	const char *cfg_keys[] = { ZPOOL_CONFIG_VERSION,
+	    ZPOOL_CONFIG_POOL_STATE, ZPOOL_CONFIG_GUID };
 	nvlist_t *cfg;
+	nvlist_t *vdev_tree_cfg = NULL;
 	uint64_t ashift;
 	int byteswap;
 
@@ -994,9 +777,18 @@ zhack_repair_one_label(const zhack_repair_op_t op, const int fd,
 	if (err)
 		return;
 
-	err = zhack_repair_get_byteswap(vdev_eck, l, &byteswap);
+	if (vdev_eck->zec_magic == 0) {
-	if (err)
+		(void) fprintf(stderr, "error: label %d: "
+		    "Expected the nvlist checksum magic number to not be zero"
+		    "\n",
+		    l);
+		(void) fprintf(stderr, "There should already be a checksum "
+		    "for the label.\n");
 		return;
+	}
+
+	byteswap =
+	    (vdev_eck->zec_magic == BSWAP_64((uint64_t)ZEC_MAGIC));
 
 	if (byteswap) {
 		byteswap_uint64_array(&vdev_eck->zec_cksum,
@@ -1012,7 +804,16 @@ zhack_repair_one_label(const zhack_repair_op_t op, const int fd,
 		return;
 	}
 
-	err = zhack_repair_unpack_cfg(vl, l, &cfg);
+	err = nvlist_unpack(vl->vl_vdev_phys.vp_nvlist,
+	    VDEV_PHYS_SIZE - sizeof (zio_eck_t), &cfg, 0);
+	if (err) {
+		(void) fprintf(stderr,
+		    "error: cannot unpack nvlist label %d\n", l);
+		return;
+	}
+
+	err = zhack_repair_check_label(ub,
+	    l, cfg_keys, ARRAY_SIZE(cfg_keys), cfg, vdev_tree_cfg, &ashift);
 	if (err)
 		return;
 
@@ -1020,19 +821,6 @@ zhack_repair_one_label(const zhack_repair_op_t op, const int fd,
 		char *buf;
 		size_t buflen;
 
-		if (ub->ub_txg != 0) {
-			(void) fprintf(stderr,
-			    "error: label %d: UB TXG of 0 expected, but got %"
-			    PRIu64 "\n", l, ub->ub_txg);
-			(void) fprintf(stderr, "It would appear the device was "
-			    "not properly detached.\n");
-			return;
-		}
-
-		err = zhack_repair_get_ashift(cfg, l, &ashift);
-		if (err)
-			return;
-
 		err = zhack_repair_undetach(ub, cfg, l);
 		if (err)
 			return;
@@ -1192,7 +980,7 @@ main(int argc, char **argv)
 	dprintf_setup(&argc, argv);
 	zfs_prop_init();
 
-	while ((c = getopt(argc, argv, "+c:d:o:")) != -1) {
+	while ((c = getopt(argc, argv, "+c:d:")) != -1) {
 		switch (c) {
 		case 'c':
 			g_importargs.cachefile = optarg;
@@ -1201,10 +989,6 @@ main(int argc, char **argv)
 			assert(g_importargs.paths < MAX_NUM_PATHS);
 			g_importargs.path[g_importargs.paths++] = optarg;
 			break;
-		case 'o':
-			if (handle_tunable_option(optarg, B_FALSE) != 0)
-				exit(1);
-			break;
 		default:
 			usage();
 			break;
@@ -1226,8 +1010,6 @@ main(int argc, char **argv)
 		rv = zhack_do_feature(argc, argv);
 	} else if (strcmp(subcommand, "label") == 0) {
 		return (zhack_do_label(argc, argv));
-	} else if (strcmp(subcommand, "metaslab") == 0) {
-		rv = zhack_do_metaslab(argc, argv);
 	} else {
 		(void) fprintf(stderr, "error: unknown subcommand: %s\n",
 		    subcommand);

cmd/zilstat.in

@@ -1,5 +1,4 @@
 #!/usr/bin/env @PYTHON_SHEBANG@
-# SPDX-License-Identifier: CDDL-1.0
 #
 # Print out statistics for all zil stats. This information is
 # available through the zil kstat.
@@ -47,7 +46,6 @@ cols = {
 	"cec":       [5,         1000,       "zil_commit_error_count"],
 	"csc":       [5,         1000,       "zil_commit_stall_count"],
 	"cSc":       [5,         1000,       "zil_commit_suspend_count"],
-	"cCc":       [5,         1000,       "zil_commit_crash_count"],
 	"ic":        [5,         1000,       "zil_itx_count"],
 	"iic":       [5,         1000,       "zil_itx_indirect_count"],
 	"iib":       [5,         1024,       "zil_itx_indirect_bytes"],

cmd/zinject/translate.c

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *

cmd/zinject/zinject.c

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *
@@ -107,8 +106,6 @@
  * 	zinject
  * 	zinject <-a | -u pool>
  * 	zinject -c <id|all>
- * 	zinject -E <delay> [-a] [-m] [-f freq] [-l level] [-r range]
- *	    [-T iotype] [-t type object | -b bookmark pool]
  * 	zinject [-q] <-t type> [-f freq] [-u] [-a] [-m] [-e errno] [-l level]
  *	    [-r range] <object>
  * 	zinject [-f freq] [-a] [-m] [-u] -b objset:object:level:start:end pool
@@ -134,18 +131,14 @@
  * The '-f' flag controls the frequency of errors injected, expressed as a
  * real number percentage between 0.0001 and 100.  The default is 100.
  *
- * The <object> form is responsible for actually injecting the handler into the
+ * The this form is responsible for actually injecting the handler into the
  * framework.  It takes the arguments described above, translates them to the
  * internal tuple using libzpool, and then issues an ioctl() to register the
  * handler.
  *
- * The '-b' option can target a specific bookmark, regardless of whether a
+ * The final form can target a specific bookmark, regardless of whether a
  * human-readable interface has been designed.  It allows developers to specify
  * a particular block by number.
- *
- * The '-E' option injects pipeline ready stage delays for the given object or
- * bookmark. The delay is specified in milliseconds, and it supports I/O type
- * and range filters.
  */
 
 #include <errno.h>
@@ -352,13 +345,6 @@ usage(void)
 	    "\t\tsuch that the operation takes a minimum of supplied seconds\n"
 	    "\t\tto complete.\n"
 	    "\n"
-	    "\tzinject -E <delay> [-a] [-m] [-f freq] [-l level] [-r range]\n"
-	    "\t\t[-T iotype] [-t type object | -b bookmark pool]\n"
-	    "\n"
-	    "\t\tInject pipeline ready stage delays for the given object path\n"
-	    "\t\t(data or dnode) or raw bookmark. The delay is specified in\n"
-	    "\t\tmilliseconds.\n"
-	    "\n"
 	    "\tzinject -I [-s <seconds> | -g <txgs>] pool\n"
 	    "\t\tCause the pool to stop writing blocks yet not\n"
 	    "\t\treport errors for a duration.  Simulates buggy hardware\n"
@@ -467,8 +453,7 @@ print_data_handler(int id, const char *pool, zinject_record_t *record,
 
 
 	(void) printf("%3d  %-15s  %-6llu  %-6llu  %-8s  %-3d  0x%02x  %-15s  "
-	    "%6" PRIu64 "  %6" PRIu64 "\n", id, pool,
+	    "%6lu  %6lu\n", id, pool, (u_longlong_t)record->zi_objset,
-	    (u_longlong_t)record->zi_objset,
 	    (u_longlong_t)record->zi_object, type_to_name(record->zi_type),
 	    record->zi_level, record->zi_dvas, rangebuf,
 	    record->zi_match_count, record->zi_inject_count);
@@ -505,8 +490,7 @@ print_device_handler(int id, const char *pool, zinject_record_t *record,
 	    (((double)record->zi_freq) / ZI_PERCENTAGE_MAX) * 100.0f;
 
 	(void) printf("%3d  %-15s  %llx  %-5s  %-10s  %8.4f%%  "
-	    "%6" PRIu64 "  %6" PRIu64 "\n", id, pool,
+	    "%6lu  %6lu\n", id, pool, (u_longlong_t)record->zi_guid,
-	    (u_longlong_t)record->zi_guid,
 	    iotype_to_str(record->zi_iotype), err_to_str(record->zi_error),
 	    freq, record->zi_match_count, record->zi_inject_count);
 
@@ -541,8 +525,7 @@ print_delay_handler(int id, const char *pool, zinject_record_t *record,
 	    (((double)record->zi_freq) / ZI_PERCENTAGE_MAX) * 100.0f;
 
 	(void) printf("%3d  %-15s  %llx  %10llu  %5llu  %8.4f%%  "
-	    "%6" PRIu64 "  %6" PRIu64 "\n", id, pool,
+	    "%6lu  %6lu\n", id, pool, (u_longlong_t)record->zi_guid,
-	    (u_longlong_t)record->zi_guid,
 	    (u_longlong_t)NSEC2MSEC(record->zi_timer),
 	    (u_longlong_t)record->zi_nlanes,
 	    freq, record->zi_match_count, record->zi_inject_count);
@@ -737,15 +720,12 @@ register_handler(const char *pool, int flags, zinject_record_t *record,
 	if (quiet) {
 		(void) printf("%llu\n", (u_longlong_t)zc.zc_guid);
 	} else {
-		boolean_t show_object = B_FALSE;
-		boolean_t show_iotype = B_FALSE;
 		(void) printf("Added handler %llu with the following "
 		    "properties:\n", (u_longlong_t)zc.zc_guid);
 		(void) printf("  pool: %s\n", pool);
 		if (record->zi_guid) {
 			(void) printf("  vdev: %llx\n",
 			    (u_longlong_t)record->zi_guid);
-			show_iotype = B_TRUE;
 		} else if (record->zi_func[0] != '\0') {
 			(void) printf("  panic function: %s\n",
 			    record->zi_func);
@@ -758,18 +738,7 @@ register_handler(const char *pool, int flags, zinject_record_t *record,
 		} else if (record->zi_timer > 0) {
 			(void) printf(" timer: %lld ms\n",
 			    (u_longlong_t)NSEC2MSEC(record->zi_timer));
-			if (record->zi_cmd == ZINJECT_DELAY_READY) {
-				show_object = B_TRUE;
-				show_iotype = B_TRUE;
-			}
 		} else {
-			show_object = B_TRUE;
-		}
-		if (show_iotype) {
-			(void) printf("iotype: %s\n",
-			    iotype_to_str(record->zi_iotype));
-		}
-		if (show_object) {
 			(void) printf("objset: %llu\n",
 			    (u_longlong_t)record->zi_objset);
 			(void) printf("object: %llu\n",
@@ -937,7 +906,6 @@ main(int argc, char **argv)
 	int ret;
 	int flags = 0;
 	uint32_t dvas = 0;
-	hrtime_t ready_delay = -1;
 
 	if ((g_zfs = libzfs_init()) == NULL) {
 		(void) fprintf(stderr, "%s\n", libzfs_error_init(errno));
@@ -968,7 +936,7 @@ main(int argc, char **argv)
 	}
 
 	while ((c = getopt(argc, argv,
-	    ":aA:b:C:d:D:E:f:Fg:qhIc:t:T:l:mr:s:e:uL:p:P:")) != -1) {
+	    ":aA:b:C:d:D:f:Fg:qhIc:t:T:l:mr:s:e:uL:p:P:")) != -1) {
 		switch (c) {
 		case 'a':
 			flags |= ZINJECT_FLUSH_ARC;
@@ -1141,18 +1109,6 @@ main(int argc, char **argv)
 		case 'u':
 			flags |= ZINJECT_UNLOAD_SPA;
 			break;
-		case 'E':
-			ready_delay = MSEC2NSEC(strtol(optarg, &end, 10));
-			if (ready_delay <= 0 || *end != '\0') {
-				(void) fprintf(stderr, "invalid delay '%s': "
-				    "must be a positive duration\n", optarg);
-				usage();
-				libzfs_fini(g_zfs);
-				return (1);
-			}
-			record.zi_cmd = ZINJECT_DELAY_READY;
-			record.zi_timer = ready_delay;
-			break;
 		case 'L':
 			if ((label = name_to_type(optarg)) == TYPE_INVAL &&
 			    !LABEL_TYPE(type)) {
@@ -1190,7 +1146,7 @@ main(int argc, char **argv)
 		 */
 		if (raw != NULL || range != NULL || type != TYPE_INVAL ||
 		    level != 0 || record.zi_cmd != ZINJECT_UNINITIALIZED ||
-		    record.zi_freq > 0 || dvas != 0 || ready_delay >= 0) {
+		    record.zi_freq > 0 || dvas != 0) {
 			(void) fprintf(stderr, "cancel (-c) incompatible with "
 			    "any other options\n");
 			usage();
@@ -1226,7 +1182,7 @@ main(int argc, char **argv)
 		 */
 		if (raw != NULL || range != NULL || type != TYPE_INVAL ||
 		    level != 0 || record.zi_cmd != ZINJECT_UNINITIALIZED ||
-		    dvas != 0 || ready_delay >= 0) {
+		    dvas != 0) {
 			(void) fprintf(stderr, "device (-d) incompatible with "
 			    "data error injection\n");
 			usage();
@@ -1316,23 +1272,13 @@ main(int argc, char **argv)
 			return (1);
 		}
 
-		if (record.zi_cmd == ZINJECT_UNINITIALIZED) {
+		record.zi_cmd = ZINJECT_DATA_FAULT;
-			record.zi_cmd = ZINJECT_DATA_FAULT;
-			if (!error)
-				error = EIO;
-		} else if (error != 0) {
-			(void) fprintf(stderr, "error type -e incompatible "
-			    "with delay injection\n");
-			libzfs_fini(g_zfs);
-			return (1);
-		} else {
-			record.zi_iotype = io_type;
-		}
-
 		if (translate_raw(raw, &record) != 0) {
 			libzfs_fini(g_zfs);
 			return (1);
 		}
+		if (!error)
+			error = EIO;
 	} else if (record.zi_cmd == ZINJECT_PANIC) {
 		if (raw != NULL || range != NULL || type != TYPE_INVAL ||
 		    level != 0 || device != NULL || record.zi_freq > 0 ||
@@ -1460,13 +1406,6 @@ main(int argc, char **argv)
 			record.zi_dvas = dvas;
 		}
 
-		if (record.zi_cmd != ZINJECT_UNINITIALIZED && error != 0) {
-			(void) fprintf(stderr, "error type -e incompatible "
-			    "with delay injection\n");
-			libzfs_fini(g_zfs);
-			return (1);
-		}
-
 		if (error == EACCES) {
 			if (type != TYPE_DATA) {
 				(void) fprintf(stderr, "decryption errors "
@@ -1482,12 +1421,8 @@ main(int argc, char **argv)
 			 * not found.
 			 */
 			error = ECKSUM;
-		} else if (record.zi_cmd == ZINJECT_UNINITIALIZED) {
-			record.zi_cmd = ZINJECT_DATA_FAULT;
-			if (!error)
-				error = EIO;
 		} else {
-			record.zi_iotype = io_type;
+			record.zi_cmd = ZINJECT_DATA_FAULT;
 		}
 
 		if (translate_record(type, argv[0], range, level, &record, pool,
@@ -1495,6 +1430,8 @@ main(int argc, char **argv)
 			libzfs_fini(g_zfs);
 			return (1);
 		}
+		if (!error)
+			error = EIO;
 	}
 
 	/*

cmd/zinject/zinject.h

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *

cmd/zpool/Makefile.am

@@ -148,7 +148,6 @@ dist_zpoolcompat_DATA = \
 	%D%/compatibility.d/openzfs-2.1-linux \
 	%D%/compatibility.d/openzfs-2.2 \
 	%D%/compatibility.d/openzfs-2.3 \
-	%D%/compatibility.d/openzfs-2.4 \
 	%D%/compatibility.d/openzfsonosx-1.7.0 \
 	%D%/compatibility.d/openzfsonosx-1.8.1 \
 	%D%/compatibility.d/openzfsonosx-1.9.3 \
@@ -188,9 +187,7 @@ zpoolcompatlinks = \
 	"openzfs-2.2		openzfs-2.2-linux" \
 	"openzfs-2.2		openzfs-2.2-freebsd" \
 	"openzfs-2.3		openzfs-2.3-linux" \
-	"openzfs-2.3		openzfs-2.3-freebsd" \
+	"openzfs-2.3		openzfs-2.3-freebsd"
-	"openzfs-2.4		openzfs-2.4-linux" \
-	"openzfs-2.4		openzfs-2.4-freebsd"
 
 zpoolconfdir = $(sysconfdir)/zfs/zpool.d
 INSTALL_DATA_HOOKS += zpool-install-data-hook

cmd/zpool/compatibility.d/openzfs-2.4

@@ -1,48 +0,0 @@
-# Features supported by OpenZFS 2.4 on Linux and FreeBSD
-allocation_classes
-async_destroy
-blake3
-block_cloning
-block_cloning_endian
-bookmark_v2
-bookmark_written
-bookmarks
-device_rebuild
-device_removal
-draid
-dynamic_gang_header
-edonr
-embedded_data
-empty_bpobj
-enabled_txg
-encryption
-extensible_dataset
-fast_dedup
-filesystem_limits
-head_errlog
-hole_birth
-large_blocks
-large_dnode
-large_microzap
-livelist
-log_spacemap
-longname
-lz4_compress
-multi_vdev_crash_dump
-obsolete_counts
-physical_rewrite
-project_quota
-raidz_expansion
-redacted_datasets
-redaction_bookmarks
-redaction_list_spill
-resilver_defer
-sha512
-skein
-spacemap_histogram
-spacemap_v2
-userobj_accounting
-vdev_zaps_v2
-zilsaxattr
-zpool_checkpoint
-zstd_compress

cmd/zpool/os/freebsd/zpool_vdev_os.c

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *

cmd/zpool/os/linux/zpool_vdev_os.c

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *
@@ -88,8 +87,7 @@
 
 typedef struct vdev_disk_db_entry
 {
-	/* 24 byte name + 1 byte NULL terminator to make GCC happy */
+	char id[24];
-	char id[25];
 	int sector_size;
 } vdev_disk_db_entry_t;
 

cmd/zpool/zpool_iter.c

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *
@@ -26,7 +25,6 @@
 
 /*
  * Copyright 2016 Igor Kozhukhov <ikozhukhov@gmail.com>.
- * Copyright (c) 2025, Klara, Inc.
  */
 
 #include <libintl.h>
@@ -53,7 +51,7 @@
 typedef struct zpool_node {
 	zpool_handle_t	*zn_handle;
 	uu_avl_node_t	zn_avlnode;
-	hrtime_t	zn_last_refresh;
+	int		zn_mark;
 } zpool_node_t;
 
 struct zpool_list {
@@ -63,7 +61,6 @@ struct zpool_list {
 	uu_avl_pool_t	*zl_pool;
 	zprop_list_t	**zl_proplist;
 	zfs_type_t	zl_type;
-	hrtime_t	zl_last_refresh;
 };
 
 static int
@@ -83,47 +80,32 @@ zpool_compare(const void *larg, const void *rarg, void *unused)
  * of known pools.
  */
 static int
-add_pool(zpool_handle_t *zhp, zpool_list_t *zlp)
+add_pool(zpool_handle_t *zhp, void *data)
 {
-	zpool_node_t *node, *new = safe_malloc(sizeof (zpool_node_t));
+	zpool_list_t *zlp = data;
+	zpool_node_t *node = safe_malloc(sizeof (zpool_node_t));
 	uu_avl_index_t idx;
 
-	new->zn_handle = zhp;
+	node->zn_handle = zhp;
-	uu_avl_node_init(new, &new->zn_avlnode, zlp->zl_pool);
+	uu_avl_node_init(node, &node->zn_avlnode, zlp->zl_pool);
-
+	if (uu_avl_find(zlp->zl_avl, node, NULL, &idx) == NULL) {
-	node = uu_avl_find(zlp->zl_avl, new, NULL, &idx);
-	if (node == NULL) {
 		if (zlp->zl_proplist &&
 		    zpool_expand_proplist(zhp, zlp->zl_proplist,
 		    zlp->zl_type, zlp->zl_literal) != 0) {
 			zpool_close(zhp);
-			free(new);
+			free(node);
 			return (-1);
 		}
-		new->zn_last_refresh = zlp->zl_last_refresh;
+		uu_avl_insert(zlp->zl_avl, node, idx);
-		uu_avl_insert(zlp->zl_avl, new, idx);
 	} else {
-		node->zn_last_refresh = zlp->zl_last_refresh;
 		zpool_close(zhp);
-		free(new);
+		free(node);
 		return (-1);
 	}
 
 	return (0);
 }
 
-/*
- * add_pool(), but always returns 0. This allows zpool_iter() to continue
- * even if a pool exists in the tree, or we fail to get the properties for
- * a new one.
- */
-static int
-add_pool_cb(zpool_handle_t *zhp, void *data)
-{
-	(void) add_pool(zhp, data);
-	return (0);
-}
-
 /*
  * Create a list of pools based on the given arguments.  If we're given no
  * arguments, then iterate over all pools in the system and add them to the AVL
@@ -152,10 +134,9 @@ pool_list_get(int argc, char **argv, zprop_list_t **proplist, zfs_type_t type,
 	zlp->zl_type = type;
 
 	zlp->zl_literal = literal;
-	zlp->zl_last_refresh = gethrtime();
 
 	if (argc == 0) {
-		(void) zpool_iter(g_zfs, add_pool_cb, zlp);
+		(void) zpool_iter(g_zfs, add_pool, zlp);
 		zlp->zl_findall = B_TRUE;
 	} else {
 		int i;
@@ -177,69 +158,15 @@ pool_list_get(int argc, char **argv, zprop_list_t **proplist, zfs_type_t type,
 }
 
 /*
- * Refresh the state of all pools on the list. Additionally, if no options were
+ * Search for any new pools, adding them to the list.  We only add pools when no
- * given on the command line, add any new pools and remove any that are no
+ * options were given on the command line.  Otherwise, we keep the list fixed as
- * longer available.
+ * those that were explicitly specified.
  */
-int
+void
-pool_list_refresh(zpool_list_t *zlp)
+pool_list_update(zpool_list_t *zlp)
 {
-	zlp->zl_last_refresh = gethrtime();
+	if (zlp->zl_findall)
-
+		(void) zpool_iter(g_zfs, add_pool, zlp);
-	if (!zlp->zl_findall) {
-		/*
-		 * This list is a fixed list of pools, so we must not add
-		 * or remove any. Just walk over them and refresh their
-		 * state.
-		 */
-		int navail = 0;
-		for (zpool_node_t *node = uu_avl_first(zlp->zl_avl);
-		    node != NULL; node = uu_avl_next(zlp->zl_avl, node)) {
-			boolean_t missing;
-			zpool_refresh_stats(node->zn_handle, &missing);
-			navail += !missing;
-			node->zn_last_refresh = zlp->zl_last_refresh;
-		}
-		return (navail);
-	}
-
-	/*
-	 * Search for any new pools and add them to the list. zpool_iter()
-	 * will call zpool_refresh_stats() as part of its work, so this has
-	 * the side effect of updating all active handles.
-	 */
-	(void) zpool_iter(g_zfs, add_pool_cb, zlp);
-
-	/*
-	 * Walk the list for any that weren't refreshed, and update and remove
-	 * them. It's not enough to just skip available ones, as zpool_iter()
-	 * won't update them, so they'll still appear active in our list.
-	 */
-	zpool_node_t *node, *next;
-	for (node = uu_avl_first(zlp->zl_avl); node != NULL; node = next) {
-		next = uu_avl_next(zlp->zl_avl, node);
-
-		/*
-		 * Skip any that were refreshed and are online; they're already
-		 * handled.
-		 */
-		if (node->zn_last_refresh == zlp->zl_last_refresh &&
-		    zpool_get_state(node->zn_handle) != POOL_STATE_UNAVAIL)
-			continue;
-
-		/* Do the refresh ourselves, just in case. */
-		boolean_t missing;
-		zpool_refresh_stats(node->zn_handle, &missing);
-		if (missing) {
-			uu_avl_remove(zlp->zl_avl, node);
-			zpool_close(node->zn_handle);
-			free(node);
-		} else {
-			node->zn_last_refresh = zlp->zl_last_refresh;
-		}
-	}
-
-	return (uu_avl_numnodes(zlp->zl_avl));
 }
 
 /*
@@ -262,6 +189,23 @@ pool_list_iter(zpool_list_t *zlp, int unavail, zpool_iter_f func,
 	return (ret);
 }
 
+/*
+ * Remove the given pool from the list.  When running iostat, we want to remove
+ * those pools that no longer exist.
+ */
+void
+pool_list_remove(zpool_list_t *zlp, zpool_handle_t *zhp)
+{
+	zpool_node_t search, *node;
+
+	search.zn_handle = zhp;
+	if ((node = uu_avl_find(zlp->zl_avl, &search, NULL, NULL)) != NULL) {
+		uu_avl_remove(zlp->zl_avl, node);
+		zpool_close(node->zn_handle);
+		free(node);
+	}
+}
+
 /*
  * Free all the handles associated with this list.
  */
@@ -434,8 +378,8 @@ process_unique_cmd_columns(vdev_cmd_data_list_t *vcdl)
 static int
 vdev_process_cmd_output(vdev_cmd_data_t *data, char *line)
 {
-	char *col;
+	char *col = NULL;
-	char *val;
+	char *val = line;
 	char *equals;
 	char **tmp;
 
@@ -452,7 +396,6 @@ vdev_process_cmd_output(vdev_cmd_data_t *data, char *line)
 		col = line;
 		val = equals + 1;
 	} else {
-		col = NULL;
 		val = line;
 	}
 

cmd/zpool/zpool_main.c

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *
@@ -33,8 +32,8 @@
  * Copyright (c) 2017, Intel Corporation.
  * Copyright (c) 2019, loli10K <ezomori.nozomu@gmail.com>
  * Copyright (c) 2021, Colm Buckley <colm@tuatha.org>
- * Copyright (c) 2021, 2023, 2025, Klara, Inc.
+ * Copyright (c) 2021, 2023, Klara Inc.
- * Copyright (c) 2021, 2025 Hewlett Packard Enterprise Development LP.
+ * Copyright [2021] Hewlett Packard Enterprise Development LP
  */
 
 #include <assert.h>
@@ -456,7 +455,7 @@ get_usage(zpool_help_t idx)
 		    "<pool> <vdev> ...\n"));
 	case HELP_ATTACH:
 		return (gettext("\tattach [-fsw] [-o property=value] "
-		    "<pool> <vdev> <new-device>\n"));
+		    "<pool> <device> <new-device>\n"));
 	case HELP_CLEAR:
 		return (gettext("\tclear [[--power]|[-nF]] <pool> [device]\n"));
 	case HELP_CREATE:
@@ -510,22 +509,22 @@ get_usage(zpool_help_t idx)
 	case HELP_REOPEN:
 		return (gettext("\treopen [-n] <pool>\n"));
 	case HELP_INITIALIZE:
-		return (gettext("\tinitialize [-c | -s | -u] [-w] <-a | <pool> "
+		return (gettext("\tinitialize [-c | -s | -u] [-w] <pool> "
-		    "[<device> ...]>\n"));
+		    "[<device> ...]\n"));
 	case HELP_SCRUB:
-		return (gettext("\tscrub [-e | -s | -p | -C | -E | -S] [-w] "
+		return (gettext("\tscrub [-e | -s | -p | -C] [-w] "
-		    "<-a | <pool> [<pool> ...]>\n"));
+		    "<pool> ...\n"));
 	case HELP_RESILVER:
 		return (gettext("\tresilver <pool> ...\n"));
 	case HELP_TRIM:
-		return (gettext("\ttrim [-dw] [-r <rate>] [-c | -s] "
+		return (gettext("\ttrim [-dw] [-r <rate>] [-c | -s] <pool> "
-		    "<-a | <pool> [<device> ...]>\n"));
+		    "[<device> ...]\n"));
 	case HELP_STATUS:
-		return (gettext("\tstatus [-DdegiLPpstvx] "
+		return (gettext("\tstatus [--power] [-j [--json-int, "
-		    "[-c script1[,script2,...]] ...\n"
+		    "--json-flat-vdevs, ...\n"
-		    "\t    [-j|--json [--json-flat-vdevs] [--json-int] "
+		    "\t    --json-pool-key-guid]] [-c [script1,script2,...]] "
-		    "[--json-pool-key-guid]] ...\n"
+		    "[-dDegiLpPstvx] ...\n"
-		    "\t    [-T d|u] [--power] [pool] [interval [count]]\n"));
+		    "\t    [-T d|u] [pool] [interval [count]]\n"));
 	case HELP_UPGRADE:
 		return (gettext("\tupgrade\n"
 		    "\tupgrade -v\n"
@@ -560,6 +559,33 @@ get_usage(zpool_help_t idx)
 	}
 }
 
+static void
+zpool_collect_leaves(zpool_handle_t *zhp, nvlist_t *nvroot, nvlist_t *res)
+{
+	uint_t children = 0;
+	nvlist_t **child;
+	uint_t i;
+
+	(void) nvlist_lookup_nvlist_array(nvroot, ZPOOL_CONFIG_CHILDREN,
+	    &child, &children);
+
+	if (children == 0) {
+		char *path = zpool_vdev_name(g_zfs, zhp, nvroot,
+		    VDEV_NAME_PATH);
+
+		if (strcmp(path, VDEV_TYPE_INDIRECT) != 0 &&
+		    strcmp(path, VDEV_TYPE_HOLE) != 0)
+			fnvlist_add_boolean(res, path);
+
+		free(path);
+		return;
+	}
+
+	for (i = 0; i < children; i++) {
+		zpool_collect_leaves(zhp, child[i], res);
+	}
+}
+
 /*
  * Callback routine that will print out a pool property value.
  */
@@ -752,11 +778,10 @@ usage(boolean_t requested)
 }
 
 /*
- * zpool initialize [-c | -s | -u] [-w] <-a | pool> [<vdev> ...]
+ * zpool initialize [-c | -s | -u] [-w] <pool> [<vdev> ...]
  * Initialize all unused blocks in the specified vdevs, or all vdevs in the pool
  * if none specified.
  *
- *	-a	Use all pools.
  *	-c	Cancel. Ends active initializing.
  *	-s	Suspend. Initializing can then be restarted with no flags.
  *	-u	Uninitialize. Clears initialization state.
@@ -768,26 +793,22 @@ zpool_do_initialize(int argc, char **argv)
 	int c;
 	char *poolname;
 	zpool_handle_t *zhp;
+	nvlist_t *vdevs;
 	int err = 0;
 	boolean_t wait = B_FALSE;
-	boolean_t initialize_all = B_FALSE;
 
 	struct option long_options[] = {
 		{"cancel",	no_argument,		NULL, 'c'},
 		{"suspend",	no_argument,		NULL, 's'},
 		{"uninit",	no_argument,		NULL, 'u'},
 		{"wait",	no_argument,		NULL, 'w'},
-		{"all",		no_argument,		NULL, 'a'},
 		{0, 0, 0, 0}
 	};
 
 	pool_initialize_func_t cmd_type = POOL_INITIALIZE_START;
-	while ((c = getopt_long(argc, argv, "acsuw", long_options,
+	while ((c = getopt_long(argc, argv, "csuw", long_options,
 	    NULL)) != -1) {
 		switch (c) {
-		case 'a':
-			initialize_all = B_TRUE;
-			break;
 		case 'c':
 			if (cmd_type != POOL_INITIALIZE_START &&
 			    cmd_type != POOL_INITIALIZE_CANCEL) {
@@ -834,18 +855,7 @@ zpool_do_initialize(int argc, char **argv)
 	argc -= optind;
 	argv += optind;
 
-	initialize_cbdata_t cbdata = {
+	if (argc < 1) {
-		.wait = wait,
-		.cmd_type = cmd_type
-	};
-
-	if (initialize_all && argc > 0) {
-		(void) fprintf(stderr, gettext("-a cannot be combined with "
-		    "individual pools or vdevs\n"));
-		usage(B_FALSE);
-	}
-
-	if (argc < 1 && !initialize_all) {
 		(void) fprintf(stderr, gettext("missing pool name argument\n"));
 		usage(B_FALSE);
 		return (-1);
@@ -857,35 +867,30 @@ zpool_do_initialize(int argc, char **argv)
 		usage(B_FALSE);
 	}
 
-	if (argc == 0 && initialize_all) {
+	poolname = argv[0];
-		/* Initilize each pool recursively */
+	zhp = zpool_open(g_zfs, poolname);
-		err = for_each_pool(argc, argv, B_TRUE, NULL, ZFS_TYPE_POOL,
+	if (zhp == NULL)
-		    B_FALSE, zpool_initialize_one, &cbdata);
+		return (-1);
-		return (err);
+
-	} else if (argc == 1) {
+	vdevs = fnvlist_alloc();
-		/* no individual leaf vdevs specified, initialize the pool */
+	if (argc == 1) {
-		poolname = argv[0];
+		/* no individual leaf vdevs specified, so add them all */
-		zhp = zpool_open(g_zfs, poolname);
+		nvlist_t *config = zpool_get_config(zhp, NULL);
-		if (zhp == NULL)
+		nvlist_t *nvroot = fnvlist_lookup_nvlist(config,
-			return (-1);
+		    ZPOOL_CONFIG_VDEV_TREE);
-		err = zpool_initialize_one(zhp, &cbdata);
+		zpool_collect_leaves(zhp, nvroot, vdevs);
 	} else {
-		/* individual leaf vdevs specified, initialize them */
-		poolname = argv[0];
-		zhp = zpool_open(g_zfs, poolname);
-		if (zhp == NULL)
-			return (-1);
-		nvlist_t *vdevs = fnvlist_alloc();
 		for (int i = 1; i < argc; i++) {
 			fnvlist_add_boolean(vdevs, argv[i]);
 		}
-		if (wait)
-			err = zpool_initialize_wait(zhp, cmd_type, vdevs);
-		else
-			err = zpool_initialize(zhp, cmd_type, vdevs);
-		fnvlist_free(vdevs);
 	}
 
+	if (wait)
+		err = zpool_initialize_wait(zhp, cmd_type, vdevs);
+	else
+		err = zpool_initialize(zhp, cmd_type, vdevs);
+
+	fnvlist_free(vdevs);
 	zpool_close(zhp);
 
 	return (err);
@@ -1782,7 +1787,7 @@ zpool_do_labelclear(int argc, char **argv)
 {
 	char vdev[MAXPATHLEN];
 	char *name = NULL;
-	int c, fd, ret = 0;
+	int c, fd = -1, ret = 0;
 	nvlist_t *config;
 	pool_state_t state;
 	boolean_t inuse = B_FALSE;
@@ -5761,6 +5766,24 @@ children:
 	return (ret);
 }
 
+static int
+refresh_iostat(zpool_handle_t *zhp, void *data)
+{
+	iostat_cbdata_t *cb = data;
+	boolean_t missing;
+
+	/*
+	 * If the pool has disappeared, remove it from the list and continue.
+	 */
+	if (zpool_refresh_stats(zhp, &missing) != 0)
+		return (-1);
+
+	if (missing)
+		pool_list_remove(cb->cb_list, zhp);
+
+	return (0);
+}
+
 /*
  * Callback to print out the iostats for the given pool.
  */
@@ -6133,6 +6156,7 @@ static void
 get_interval_count_filter_guids(int *argc, char **argv, float *interval,
     unsigned long *count, iostat_cbdata_t *cb)
 {
+	char **tmpargv = argv;
 	int argc_for_interval = 0;
 
 	/* Is the last arg an interval value?  Or a guid? */
@@ -6156,7 +6180,7 @@ get_interval_count_filter_guids(int *argc, char **argv, float *interval,
 	}
 
 	/* Point to our list of possible intervals */
-	char **tmpargv = &argv[*argc - argc_for_interval];
+	tmpargv = &argv[*argc - argc_for_interval];
 
 	*argc = *argc - argc_for_interval;
 	get_interval_count(&argc_for_interval, tmpargv,
@@ -6341,16 +6365,18 @@ get_namewidth_iostat(zpool_handle_t *zhp, void *data)
  * This command can be tricky because we want to be able to deal with pool
  * creation/destruction as well as vdev configuration changes.  The bulk of this
  * processing is handled by the pool_list_* routines in zpool_iter.c.  We rely
- * on pool_list_refresh() to detect the addition and removal of pools.
+ * on pool_list_update() to detect the addition of new pools.  Configuration
- * Configuration changes are all handled within libzfs.
+ * changes are all handled within libzfs.
  */
 int
 zpool_do_iostat(int argc, char **argv)
 {
 	int c;
 	int ret;
+	int npools;
 	float interval = 0;
 	unsigned long count = 0;
+	int winheight = 24;
 	zpool_list_t *list;
 	boolean_t verbose = B_FALSE;
 	boolean_t latency = B_FALSE, l_histo = B_FALSE, rq_histo = B_FALSE;
@@ -6599,24 +6625,10 @@ zpool_do_iostat(int argc, char **argv)
 		return (1);
 	}
 
-	int last_npools = 0;
 	for (;;) {
-		/*
+		if ((npools = pool_list_count(list)) == 0)
-		 * Refresh all pools in list, adding or removing pools as
-		 * necessary.
-		 */
-		int npools = pool_list_refresh(list);
-		if (npools == 0) {
 			(void) fprintf(stderr, gettext("no pools available\n"));
-		} else {
+		else {
-			/*
-			 * If the list of pools has changed since last time
-			 * around, reset the iteration count to force the
-			 * header to be redisplayed.
-			 */
-			if (last_npools != npools)
-				cb.cb_iteration = 0;
-
 			/*
 			 * If this is the first iteration and -y was supplied
 			 * we skip any printing.
@@ -6624,6 +6636,15 @@ zpool_do_iostat(int argc, char **argv)
 			boolean_t skip = (omit_since_boot &&
 			    cb.cb_iteration == 0);
 
+			/*
+			 * Refresh all statistics.  This is done as an
+			 * explicit step before calculating the maximum name
+			 * width, so that any * configuration changes are
+			 * properly accounted for.
+			 */
+			(void) pool_list_iter(list, B_FALSE, refresh_iostat,
+			    &cb);
+
 			/*
 			 * Iterate over all pools to determine the maximum width
 			 * for the pool / device name column across all pools.
@@ -6651,7 +6672,7 @@ zpool_do_iostat(int argc, char **argv)
 			 * even when terminal window has its height
 			 * changed.
 			 */
-			int winheight = terminal_height();
+			winheight = terminal_height();
 			/*
 			 * Are we connected to TTY? If not, headers_once
 			 * should be true, to avoid breaking scripts.
@@ -6714,8 +6735,6 @@ zpool_do_iostat(int argc, char **argv)
 
 		(void) fflush(stdout);
 		(void) fsleep(interval);
-
-		last_npools = npools;
 	}
 
 	pool_list_free(list);
@@ -7632,7 +7651,7 @@ zpool_do_replace(int argc, char **argv)
 }
 
 /*
- * zpool attach [-fsw] [-o property=value] <pool> <vdev> <new_device>
+ * zpool attach [-fsw] [-o property=value] <pool> <device>|<vdev> <new_device>
  *
  *	-f	Force attach, even if <new_device> appears to be in use.
  *	-s	Use sequential instead of healing reconstruction for resilver.
@@ -7640,9 +7659,9 @@ zpool_do_replace(int argc, char **argv)
  *	-w	Wait for resilvering (mirror) or expansion (raidz) to complete
  *		before returning.
  *
- * Attach <new_device> to a <vdev>, where the vdev can be of type
+ * Attach <new_device> to a <device> or <vdev>, where the vdev can be of type
- * device, mirror or raidz. If <vdev> is not part of a mirror, then <vdev> will
+ * mirror or raidz. If <device> is not part of a mirror, then <device> will
- * be transformed into a mirror of <vdev> and <new_device>. When a mirror
+ * be transformed into a mirror of <device> and <new_device>. When a mirror
  * is involved, <new_device> will begin life with a DTL of [0, now], and will
  * immediately begin to resilver itself. For the raidz case, a expansion will
  * commence and reflow the raidz data across all the disks including the
@@ -8348,8 +8367,6 @@ zpool_do_reopen(int argc, char **argv)
 typedef struct scrub_cbdata {
 	int	cb_type;
 	pool_scrub_cmd_t cb_scrub_cmd;
-	time_t	cb_date_start;
-	time_t	cb_date_end;
 } scrub_cbdata_t;
 
 static boolean_t
@@ -8393,8 +8410,8 @@ scrub_callback(zpool_handle_t *zhp, void *data)
 		return (1);
 	}
 
-	err = zpool_scan_range(zhp, cb->cb_type, cb->cb_scrub_cmd,
+	err = zpool_scan(zhp, cb->cb_type, cb->cb_scrub_cmd);
-	    cb->cb_date_start, cb->cb_date_end);
+
 	if (err == 0 && zpool_has_checkpoint(zhp) &&
 	    cb->cb_type == POOL_SCAN_SCRUB) {
 		(void) printf(gettext("warning: will not scrub state that "
@@ -8412,35 +8429,10 @@ wait_callback(zpool_handle_t *zhp, void *data)
 	return (zpool_wait(zhp, *act));
 }
 
-static time_t
-date_string_to_sec(const char *timestr, boolean_t rounding)
-{
-	struct tm tm = {0};
-	int adjustment = rounding ? 1 : 0;
-
-	/* Allow mktime to determine timezone. */
-	tm.tm_isdst = -1;
-
-	if (strptime(timestr, "%Y-%m-%d %H:%M", &tm) == NULL) {
-		if (strptime(timestr, "%Y-%m-%d", &tm) == NULL) {
-			fprintf(stderr, gettext("Failed to parse the date.\n"));
-			usage(B_FALSE);
-		}
-		adjustment *= 24 * 60 * 60;
-	} else {
-		adjustment *= 60;
-	}
-
-	return (mktime(&tm) + adjustment);
-}
-
 /*
- * zpool scrub [-e | -s | -p | -C | -E | -S] [-w] [-a | <pool> ...]
+ * zpool scrub [-e | -s | -p | -C] [-w] <pool> ...
  *
- *	-a	Scrub all pools.
  *	-e	Only scrub blocks in the error log.
- *	-E	End date of scrub.
- *	-S	Start date of scrub.
  *	-s	Stop.  Stops any in-progress scrub.
  *	-p	Pause. Pause in-progress scrub.
  *	-w	Wait.  Blocks until scrub has completed.
@@ -8456,36 +8448,21 @@ zpool_do_scrub(int argc, char **argv)
 
 	cb.cb_type = POOL_SCAN_SCRUB;
 	cb.cb_scrub_cmd = POOL_SCRUB_NORMAL;
-	cb.cb_date_start = cb.cb_date_end = 0;
 
 	boolean_t is_error_scrub = B_FALSE;
 	boolean_t is_pause = B_FALSE;
 	boolean_t is_stop = B_FALSE;
 	boolean_t is_txg_continue = B_FALSE;
-	boolean_t scrub_all = B_FALSE;
 
 	/* check options */
-	while ((c = getopt(argc, argv, "aspweCE:S:")) != -1) {
+	while ((c = getopt(argc, argv, "spweC")) != -1) {
 		switch (c) {
-		case 'a':
-			scrub_all = B_TRUE;
-			break;
 		case 'e':
 			is_error_scrub = B_TRUE;
 			break;
-		case 'E':
-			/*
-			 * Round the date. It's better to scrub more data than
-			 * less. This also makes the date inclusive.
-			 */
-			cb.cb_date_end = date_string_to_sec(optarg, B_TRUE);
-			break;
 		case 's':
 			is_stop = B_TRUE;
 			break;
-		case 'S':
-			cb.cb_date_start = date_string_to_sec(optarg, B_FALSE);
-			break;
 		case 'p':
 			is_pause = B_TRUE;
 			break;
@@ -8533,19 +8510,6 @@ zpool_do_scrub(int argc, char **argv)
 		}
 	}
 
-	if ((cb.cb_date_start != 0 || cb.cb_date_end != 0) &&
-	    cb.cb_scrub_cmd != POOL_SCRUB_NORMAL) {
-		(void) fprintf(stderr, gettext("invalid option combination: "
-		    "start/end date is available only with normal scrub\n"));
-		usage(B_FALSE);
-	}
-	if (cb.cb_date_start != 0 && cb.cb_date_end != 0 &&
-	    cb.cb_date_start > cb.cb_date_end) {
-		(void) fprintf(stderr, gettext("invalid arguments: "
-		    "end date has to be later than start date\n"));
-		usage(B_FALSE);
-	}
-
 	if (wait && (cb.cb_type == POOL_SCAN_NONE ||
 	    cb.cb_scrub_cmd == POOL_SCRUB_PAUSE)) {
 		(void) fprintf(stderr, gettext("invalid option combination: "
@@ -8556,7 +8520,7 @@ zpool_do_scrub(int argc, char **argv)
 	argc -= optind;
 	argv += optind;
 
-	if (argc < 1 && !scrub_all) {
+	if (argc < 1) {
 		(void) fprintf(stderr, gettext("missing pool name argument\n"));
 		usage(B_FALSE);
 	}
@@ -8586,7 +8550,6 @@ zpool_do_resilver(int argc, char **argv)
 
 	cb.cb_type = POOL_SCAN_RESILVER;
 	cb.cb_scrub_cmd = POOL_SCRUB_NORMAL;
-	cb.cb_date_start = cb.cb_date_end = 0;
 
 	/* check options */
 	while ((c = getopt(argc, argv, "")) != -1) {
@@ -8611,9 +8574,8 @@ zpool_do_resilver(int argc, char **argv)
 }
 
 /*
- * zpool trim [-d] [-r <rate>] [-c | -s] <-a | pool> [<device> ...]
+ * zpool trim [-d] [-r <rate>] [-c | -s] <pool> [<device> ...]
  *
- *	-a		Trim all pools.
  *	-c		Cancel. Ends any in-progress trim.
  *	-d		Secure trim.  Requires kernel and device support.
  *	-r <rate>	Sets the TRIM rate in bytes (per second). Supports
@@ -8630,7 +8592,6 @@ zpool_do_trim(int argc, char **argv)
 		{"rate",	required_argument,	NULL,	'r'},
 		{"suspend",	no_argument,		NULL,	's'},
 		{"wait",	no_argument,		NULL,	'w'},
-		{"all",		no_argument,		NULL,	'a'},
 		{0, 0, 0, 0}
 	};
 
@@ -8638,16 +8599,11 @@ zpool_do_trim(int argc, char **argv)
 	uint64_t rate = 0;
 	boolean_t secure = B_FALSE;
 	boolean_t wait = B_FALSE;
-	boolean_t trimall = B_FALSE;
-	int error;
 
 	int c;
-	while ((c = getopt_long(argc, argv, "acdr:sw", long_options, NULL))
+	while ((c = getopt_long(argc, argv, "cdr:sw", long_options, NULL))
 	    != -1) {
 		switch (c) {
-		case 'a':
-			trimall = B_TRUE;
-			break;
 		case 'c':
 			if (cmd_type != POOL_TRIM_START &&
 			    cmd_type != POOL_TRIM_CANCEL) {
@@ -8706,18 +8662,7 @@ zpool_do_trim(int argc, char **argv)
 	argc -= optind;
 	argv += optind;
 
-	trimflags_t trim_flags = {
+	if (argc < 1) {
-		.secure = secure,
-		.rate = rate,
-		.wait = wait,
-	};
-
-	trim_cbdata_t cbdata = {
-		.trim_flags = trim_flags,
-		.cmd_type = cmd_type
-	};
-
-	if (argc < 1 && !trimall) {
 		(void) fprintf(stderr, gettext("missing pool name argument\n"));
 		usage(B_FALSE);
 		return (-1);
@@ -8725,46 +8670,41 @@ zpool_do_trim(int argc, char **argv)
 
 	if (wait && (cmd_type != POOL_TRIM_START)) {
 		(void) fprintf(stderr, gettext("-w cannot be used with -c or "
-		    "-s options\n"));
+		    "-s\n"));
 		usage(B_FALSE);
 	}
 
-	if (trimall && argc > 0) {
+	char *poolname = argv[0];
-		(void) fprintf(stderr, gettext("-a cannot be combined with "
+	zpool_handle_t *zhp = zpool_open(g_zfs, poolname);
-		    "individual zpools or vdevs\n"));
+	if (zhp == NULL)
-		usage(B_FALSE);
+		return (-1);
-	}
 
-	if (argc == 0 && trimall) {
+	trimflags_t trim_flags = {
-		cbdata.trim_flags.fullpool = B_TRUE;
+		.secure = secure,
-		/* Trim each pool recursively */
+		.rate = rate,
-		error = for_each_pool(argc, argv, B_TRUE, NULL, ZFS_TYPE_POOL,
+		.wait = wait,
-		    B_FALSE, zpool_trim_one, &cbdata);
+	};
-	} else if (argc == 1) {
+
-		char *poolname = argv[0];
+	nvlist_t *vdevs = fnvlist_alloc();
-		zpool_handle_t *zhp = zpool_open(g_zfs, poolname);
+	if (argc == 1) {
-		if (zhp == NULL)
-			return (-1);
 		/* no individual leaf vdevs specified, so add them all */
-		error = zpool_trim_one(zhp, &cbdata);
+		nvlist_t *config = zpool_get_config(zhp, NULL);
-		zpool_close(zhp);
+		nvlist_t *nvroot = fnvlist_lookup_nvlist(config,
+		    ZPOOL_CONFIG_VDEV_TREE);
+		zpool_collect_leaves(zhp, nvroot, vdevs);
+		trim_flags.fullpool = B_TRUE;
 	} else {
-		char *poolname = argv[0];
+		trim_flags.fullpool = B_FALSE;
-		zpool_handle_t *zhp = zpool_open(g_zfs, poolname);
-		if (zhp == NULL)
-			return (-1);
-		/* leaf vdevs specified, trim only those */
-		cbdata.trim_flags.fullpool = B_FALSE;
-		nvlist_t *vdevs = fnvlist_alloc();
 		for (int i = 1; i < argc; i++) {
 			fnvlist_add_boolean(vdevs, argv[i]);
 		}
-		error = zpool_trim(zhp, cbdata.cmd_type, vdevs,
-		    &cbdata.trim_flags);
-		fnvlist_free(vdevs);
-		zpool_close(zhp);
 	}
 
+	int error = zpool_trim(zhp, cmd_type, vdevs, &trim_flags);
+
+	fnvlist_free(vdevs);
+	zpool_close(zhp);
+
 	return (error);
 }
 
@@ -10491,9 +10431,10 @@ print_status_reason(zpool_handle_t *zhp, status_cbdata_t *cbp,
 		break;
 
 	case ZPOOL_STATUS_REMOVED_DEV:
-		snprintf(status, ST_SIZE, gettext("One or more devices have "
+		snprintf(status, ST_SIZE, gettext("One or more devices has "
-		    "been removed.\n\tSufficient replicas exist for the pool "
+		    "been removed by the administrator.\n\tSufficient "
-		    "to continue functioning in a\n\tdegraded state.\n"));
+		    "replicas exist for the pool to continue functioning in "
+		    "a\n\tdegraded state.\n"));
 		snprintf(action, AC_SIZE, gettext("Online the device "
 		    "using zpool online' or replace the device with\n\t'zpool "
 		    "replace'.\n"));
@@ -10765,6 +10706,7 @@ status_callback_json(zpool_handle_t *zhp, void *data)
 	uint_t c;
 	vdev_stat_t *vs;
 	nvlist_t *item, *d, *load_info, *vds;
+	item = d = NULL;
 
 	/* If dedup stats were requested, also fetch dedupcached. */
 	if (cbp->cb_dedup_stats > 1)
@@ -11037,30 +10979,28 @@ status_callback(zpool_handle_t *zhp, void *data)
 }
 
 /*
- * zpool status [-dDegiLpPstvx] [-c [script1,script2,...]] ...
+ * zpool status [-c [script1,script2,...]] [-dDegiLpPstvx] [--power] ...
- * 				[-j|--json [--json-flat-vdevs] [--json-int] ...
+ *              [-T d|u] [pool] [interval [count]]
- * 				[--json-pool-key-guid]] [--power] [-T d|u] ...
- * 				[pool] [interval [count]]
  *
  *	-c CMD	For each vdev, run command CMD
- *	-D	Display dedup status (undocumented)
  *	-d	Display Direct I/O write verify errors
+ *	-D	Display dedup status (undocumented)
  *	-e	Display only unhealthy vdevs
  *	-g	Display guid for individual vdev name.
  *	-i	Display vdev initialization status.
- *	-j [...]	Display output in JSON format
- *	   --json-flat-vdevs Display vdevs in flat hierarchy
- *	   --json-int Display numbers in integer format instead of string
- *	   --json-pool-key-guid Use pool GUID as key for pool objects
  *	-L	Follow links when resolving vdev path name.
- *	-P	Display full path for vdev name.
  *	-p	Display values in parsable (exact) format.
- *	--power	Display vdev enclosure slot power status
+ *	-P	Display full path for vdev name.
  *	-s	Display slow IOs column.
- *	-T	Display a timestamp in date(1) or Unix format
  *	-t	Display vdev TRIM status.
+ *	-T	Display a timestamp in date(1) or Unix format
  *	-v	Display complete error logs
  *	-x	Display only pools with potential problems
+ *	-j	Display output in JSON format
+ *	--power	Display vdev enclosure slot power status
+ *	--json-int Display numbers in inteeger format instead of string
+ *	--json-flat-vdevs Display vdevs in flat hierarchy
+ *	--json-pool-key-guid Use pool GUID as key for pool objects
  *
  * Describes the health status of all pools or some subset.
  */
@@ -11388,8 +11328,7 @@ upgrade_enable_all(zpool_handle_t *zhp, int *countp)
 		const char *fname = spa_feature_table[i].fi_uname;
 		const char *fguid = spa_feature_table[i].fi_guid;
 
-		if (!spa_feature_table[i].fi_zfs_mod_supported ||
+		if (!spa_feature_table[i].fi_zfs_mod_supported)
-		    (spa_feature_table[i].fi_flags & ZFEATURE_FLAG_NO_UPGRADE))
 			continue;
 
 		if (!nvlist_exists(enabled, fguid) && requested_features[i]) {
@@ -11544,11 +11483,7 @@ upgrade_list_disabled_cb(zpool_handle_t *zhp, void *arg)
 					    "Note that the pool "
 					    "'compatibility' feature can be "
 					    "used to inhibit\nfeature "
-					    "upgrades.\n\n"
+					    "upgrades.\n\n"));
-					    "Features marked with (*) are not "
-					    "applied automatically on upgrade, "
-					    "and\nmust be applied explicitly "
-					    "with zpool-set(7).\n\n"));
 					(void) printf(gettext("POOL  "
 					    "FEATURE\n"));
 					(void) printf(gettext("------"
@@ -11562,9 +11497,7 @@ upgrade_list_disabled_cb(zpool_handle_t *zhp, void *arg)
 					poolfirst = B_FALSE;
 				}
 
-				(void) printf(gettext("      %s%s\n"), fname,
+				(void) printf(gettext("      %s\n"), fname);
-				    spa_feature_table[i].fi_flags &
-				    ZFEATURE_FLAG_NO_UPGRADE ? "(*)" : "");
 			}
 			/*
 			 * If they did "zpool upgrade -a", then we could
@@ -12134,11 +12067,6 @@ zpool_do_events_nvprint(nvlist_t *nvl, int depth)
 				zfs_valstr_zio_stage(i32, flagstr,
 				    sizeof (flagstr));
 				printf(gettext("0x%x [%s]"), i32, flagstr);
-			} else if (strcmp(name,
-			    FM_EREPORT_PAYLOAD_ZFS_ZIO_TYPE) == 0) {
-				zfs_valstr_zio_type(i32, flagstr,
-				    sizeof (flagstr));
-				printf(gettext("0x%x [%s]"), i32, flagstr);
 			} else if (strcmp(name,
 			    FM_EREPORT_PAYLOAD_ZFS_ZIO_PRIORITY) == 0) {
 				zfs_valstr_zio_priority(i32, flagstr,
@@ -12365,7 +12293,7 @@ zpool_do_events_next(ev_opts_t *opts)
 		nvlist_free(nvl);
 	}
 
-	VERIFY0(close(zevent_fd));
+	VERIFY(0 == close(zevent_fd));
 
 	return (ret);
 }
@@ -12818,13 +12746,11 @@ found:
 
 			if (strcmp(argv[1], "root") == 0)
 				vdev = strdup("root-0");
+			else
+				vdev = strdup(argv[1]);
 
 			/* ... and the rest are vdev names */
-			if (vdev == NULL)
+			cb.cb_vdevs.cb_names = &vdev;
-				cb.cb_vdevs.cb_names = argv + 1;
-			else
-				cb.cb_vdevs.cb_names = &vdev;
-
 			cb.cb_vdevs.cb_names_count = argc - 1;
 			cb.cb_type = ZFS_TYPE_VDEV;
 			argc = 1; /* One pool to process */

cmd/zpool/zpool_util.c

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *

cmd/zpool/zpool_util.h

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *
@@ -76,10 +75,11 @@ typedef struct zpool_list zpool_list_t;
 
 zpool_list_t *pool_list_get(int, char **, zprop_list_t **, zfs_type_t,
     boolean_t, int *);
-int pool_list_refresh(zpool_list_t *);
+void pool_list_update(zpool_list_t *);
 int pool_list_iter(zpool_list_t *, int unavail, zpool_iter_f, void *);
 void pool_list_free(zpool_list_t *);
 int pool_list_count(zpool_list_t *);
+void pool_list_remove(zpool_list_t *, zpool_handle_t *);
 
 extern libzfs_handle_t *g_zfs;
 

cmd/zpool/zpool_vdev.c

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *
@@ -574,6 +573,7 @@ get_replication(nvlist_t *nvroot, boolean_t fatal)
 				nvlist_t *cnv = child[c];
 				const char *path;
 				struct stat64 statbuf;
+				int64_t size = -1LL;
 				const char *childtype;
 				int fd, err;
 
@@ -608,29 +608,23 @@ get_replication(nvlist_t *nvroot, boolean_t fatal)
 				verify(nvlist_lookup_string(cnv,
 				    ZPOOL_CONFIG_PATH, &path) == 0);
 
-				/*
-				 * Skip active spares they should never cause
-				 * the pool to be evaluated as inconsistent.
-				 */
-				if (is_spare(NULL, path))
-					continue;
-
 				/*
 				 * If we have a raidz/mirror that combines disks
-				 * with files, only report it as an error when
+				 * with files, report it as an error.
-				 * fatal is set to ensure all the replication
-				 * checks aren't skipped in check_replication().
 				 */
-				if (fatal && !dontreport && type != NULL &&
+				if (!dontreport && type != NULL &&
 				    strcmp(type, childtype) != 0) {
 					if (ret != NULL)
 						free(ret);
 					ret = NULL;
-					vdev_error(gettext(
+					if (fatal)
-					    "mismatched replication "
+						vdev_error(gettext(
-					    "level: %s contains both "
+						    "mismatched replication "
-					    "files and devices\n"),
+						    "level: %s contains both "
-					    rep.zprl_type);
+						    "files and devices\n"),
+						    rep.zprl_type);
+					else
+						return (NULL);
 					dontreport = B_TRUE;
 				}
 
@@ -661,7 +655,7 @@ get_replication(nvlist_t *nvroot, boolean_t fatal)
 				    statbuf.st_size == MAXOFFSET_T)
 					continue;
 
-				int64_t size = statbuf.st_size;
+				size = statbuf.st_size;
 
 				/*
 				 * Also make sure that devices and
@@ -881,18 +875,6 @@ check_replication(nvlist_t *config, nvlist_t *newroot)
 				    (u_longlong_t)mirror->zprl_children);
 				ret = -1;
 			}
-		} else if (is_raidz_draid(current, new)) {
-			if (current->zprl_parity != new->zprl_parity) {
-				vdev_error(gettext(
-				    "mismatched replication level: pool and "
-				    "new vdev with different redundancy, %s "
-				    "and %s vdevs, %llu vs. %llu\n"),
-				    current->zprl_type,
-				    new->zprl_type,
-				    (u_longlong_t)current->zprl_parity,
-				    (u_longlong_t)new->zprl_parity);
-				ret = -1;
-			}
 		} else if (strcmp(current->zprl_type, new->zprl_type) != 0) {
 			vdev_error(gettext(
 			    "mismatched replication level: pool uses %s "
@@ -1370,7 +1352,7 @@ is_grouping(const char *type, int *mindev, int *maxdev)
 static int
 draid_config_by_type(nvlist_t *nv, const char *type, uint64_t children)
 {
-	uint64_t nparity;
+	uint64_t nparity = 1;
 	uint64_t nspares = 0;
 	uint64_t ndata = UINT64_MAX;
 	uint64_t ngroups = 1;
@@ -1598,12 +1580,13 @@ construct_spec(nvlist_t *props, int argc, char **argv)
 				is_dedup = is_spare = B_FALSE;
 			}
 
-			if (is_log) {
+			if (is_log || is_special || is_dedup) {
 				if (strcmp(type, VDEV_TYPE_MIRROR) != 0) {
 					(void) fprintf(stderr,
 					    gettext("invalid vdev "
-					    "specification: unsupported 'log' "
+					    "specification: unsupported '%s' "
-					    "device: %s\n"), type);
+					    "device: %s\n"), is_log ? "log" :
+					    "special", type);
 					goto spec_out;
 				}
 				nlogs++;

cmd/zpool_influxdb/zpool_influxdb.c

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * Gather top-level ZFS pool and resilver/scan statistics and print using
  * influxdb line protocol

cmd/zstream/Makefile.am

@@ -18,7 +18,6 @@ zstream_LDADD = \
 	libzpool.la \
 	libnvpair.la
 
-cmd-zstream-install-exec-hook:
+PHONY += install-exec-hook
+install-exec-hook:
 	cd $(DESTDIR)$(sbindir) && $(LN_S) -f zstream zstreamdump
-
-INSTALL_EXEC_HOOKS += cmd-zstream-install-exec-hook

cmd/zstream/zstream.c

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *

cmd/zstream/zstream.h

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *

cmd/zstream/zstream_decompress.c

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *

cmd/zstream/zstream_dump.c

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *

cmd/zstream/zstream_recompress.c

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *