2026-01-25 10:12:13 +03:00
575 changed files with 6019 additions and 20442 deletions
--- a/.cirrus.yml
+++ b/.cirrus.yml
@ -0,0 +1,21 @@
+env:
+  CIRRUS_CLONE_DEPTH: 1
+  ARCH: amd64
+
+build_task:
+  matrix:
+    freebsd_instance:
+      image_family: freebsd-13-5
+    freebsd_instance:
+      image_family: freebsd-14-2
+    freebsd_instance:
+      image_family: freebsd-15-0-snap
+  prepare_script:
+    - pkg install -y autoconf automake libtool gettext-runtime gmake ksh93 py311-packaging py311-cffi py311-sysctl
+  configure_script:
+    - env MAKE=gmake ./autogen.sh
+    - env MAKE=gmake ./configure --with-config="user" --with-python=3.11
+  build_script:
+    - gmake -j `sysctl -n kern.smp.cpus`
+  install_script:
+    - gmake install
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.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.
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.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. -->
--- a/.github/codeql-cpp.yml
+++ b/.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
--- a/.github/codeql/custom-queries/cpp/dslDatasetHoldReleMismatch.ql
+++ b/.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()
--- a/.github/workflows/scripts/generate-ci-type.py
+++ b/.github/workflows/scripts/generate-ci-type.py
@ -7,7 +7,7 @@ Prints "quick" if (explicity required by user):
 - the *last* commit message contains 'ZFS-CI-Type: quick'
 or if (heuristics):
 - the files changed are not in the list of specified directories, and
- all commit messages do not contain 'ZFS-CI-Type: (full|linux|freebsd)'
+- all commit messages do not contain 'ZFS-CI-Type: full'

 Otherwise prints "full".
 """
@ -65,12 +65,12 @@ 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():
        if line.strip().lower() == 'zfs-ci-type: quick':
-            output_type('quick', f'requested by HEAD commit {head}')
+            output_type('quick', f'explicitly requested by HEAD commit {head}')

    # check all commit messages
    all_commit_message_raw = subprocess.run([
@ -83,12 +83,8 @@ if __name__ == '__main__':
    for line in all_commit_message:
        if line.startswith('ZFS-CI-Commit:'):
            commit_ref = line.lstrip('ZFS-CI-Commit:').rstrip()
-        if line.strip().lower() == 'zfs-ci-type: freebsd':
-            output_type('freebsd', f'requested by commit {commit_ref}')
-        if line.strip().lower() == 'zfs-ci-type: linux':
-            output_type('linux', f'requested by commit {commit_ref}')
        if line.strip().lower() == 'zfs-ci-type: full':
-            output_type('full', f'requested by commit {commit_ref}')
+            output_type('full', f'explicitly requested by commit {commit_ref}')

    # check changed files
    changed_files_raw = subprocess.run([
--- a/.github/workflows/scripts/qemu-2-start.sh
+++ b/.github/workflows/scripts/qemu-2-start.sh
@ -25,10 +25,6 @@ UBMIRROR="https://cloud-images.ubuntu.com"
 # default nic model for vm's
 NIC="virtio"

-# additional options for virt-install
-OPTS[0]=""
-OPTS[1]=""
-
 case "$OS" in
  almalinux8)
    OSNAME="AlmaLinux 8"
@ -47,15 +43,16 @@ case "$OS" in
    OSNAME="Archlinux"
    URL="https://geo.mirror.pkgbuild.com/images/latest/Arch-Linux-x86_64-cloudimg.qcow2"
    ;;
+  centos-stream10)
+    OSNAME="CentOS Stream 10"
+    # TODO: #16903 Overwrite OSv to stream9 for virt-install until it's added to osinfo
+    OSv="centos-stream9"
+    URL="https://cloud.centos.org/centos/10-stream/x86_64/images/CentOS-Stream-GenericCloud-10-latest.x86_64.qcow2"
+    ;;
  centos-stream9)
    OSNAME="CentOS Stream 9"
    URL="https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-latest.x86_64.qcow2"
    ;;
-  centos-stream10)
-    OSNAME="CentOS Stream 10"
-    OSv="centos-stream9"
-    URL="https://cloud.centos.org/centos/10-stream/x86_64/images/CentOS-Stream-GenericCloud-10-latest.x86_64.qcow2"
-    ;;
  debian11)
    OSNAME="Debian 11"
    URL="https://cloud.debian.org/images/cloud/bullseye/latest/debian-11-generic-amd64.qcow2"
@ -64,14 +61,6 @@ case "$OS" in
    OSNAME="Debian 12"
    URL="https://cloud.debian.org/images/cloud/bookworm/latest/debian-12-generic-amd64.qcow2"
    ;;
-  debian13)
-    OSNAME="Debian 13"
-    # TODO: Overwrite OSv to debian13 for virt-install until it's added to osinfo
-    OSv="debian12"
-    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"
@ -82,10 +71,13 @@ case "$OS" in
    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"
    ;;
-  fedora43)
-    OSNAME="Fedora 43"
-    OSv="fedora-unknown"
-    URL="https://download.fedoraproject.org/pub/fedora/linux/releases/43/Cloud/x86_64/images/Fedora-Cloud-Base-Generic-43-1.6.x86_64.qcow2"
+  freebsd13-4r)
+    FreeBSD="13.4-RELEASE"
+    OSNAME="FreeBSD $FreeBSD"
+    OSv="freebsd13.0"
+    URLxz="$FREEBSD_REL/$FreeBSD/amd64/Latest/FreeBSD-$FreeBSD-amd64-BASIC-CI.raw.xz"
+    KSRC="$FREEBSD_REL/../amd64/$FreeBSD/src.txz"
+    NIC="rtl8139"
    ;;
  freebsd13-5r)
    FreeBSD="13.5-RELEASE"
@ -99,8 +91,8 @@ case "$OS" in
    FreeBSD="14.2-RELEASE"
    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"
+    URLxz="$FREEBSD_REL/$FreeBSD/amd64/Latest/FreeBSD-$FreeBSD-amd64-BASIC-CI.raw.xz"
    ;;
  freebsd14-3r)
    FreeBSD="14.3-RELEASE"
@ -124,15 +116,8 @@ case "$OS" in
    URLxz="$FREEBSD_SNAP/$FreeBSD/amd64/Latest/FreeBSD-$FreeBSD-amd64-BASIC-CI-ufs.raw.xz"
    KSRC="$FREEBSD_SNAP/../amd64/$FreeBSD/src.txz"
    ;;
-  freebsd15-0s)
-    FreeBSD="15.0-STABLE"
-    OSNAME="FreeBSD $FreeBSD"
-    OSv="freebsd14.0"
-    URLxz="$FREEBSD_SNAP/$FreeBSD/amd64/Latest/FreeBSD-$FreeBSD-amd64-BASIC-CI-ufs.raw.xz"
-    KSRC="$FREEBSD_SNAP/../amd64/$FreeBSD/src.txz"
-    ;;
-  freebsd16-0c)
-    FreeBSD="16.0-CURRENT"
+  freebsd15-0c)
+    FreeBSD="15.0-CURRENT"
    OSNAME="FreeBSD $FreeBSD"
    OSv="freebsd14.0"
    URLxz="$FREEBSD_SNAP/$FreeBSD/amd64/Latest/FreeBSD-$FreeBSD-amd64-BASIC-CI-ufs.raw.xz"
@ -265,7 +250,7 @@ sudo virt-install \
  --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 \
-  --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.
@ -298,7 +283,7 @@ else
  while pidof /usr/bin/qemu-system-x86_64 >/dev/null; do
    ssh 2>/dev/null root@vm0 "uname -a" && break
  done
-  ssh root@vm0 "env IGNORE_OSVERSION=yes pkg install -y bash ca_root_nss git qemu-guest-agent python3 py311-cloud-init"
+  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"'
--- a/.github/workflows/scripts/qemu-3-deps-vm.sh
+++ b/.github/workflows/scripts/qemu-3-deps-vm.sh
@ -20,7 +20,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 +28,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 +40,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 \
-    zlib1g-dev
+    rsync samba sysstat uuid-dev watchdog wget xfslibs-dev  xxhash zlib1g-dev
  echo "##[endgroup]"
 }

@ -53,7 +51,7 @@ 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:]]+$' \
@ -88,8 +86,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 \
-    xxhash zlib-devel
+    rpm-build rsync samba sysstat systemd watchdog wget xfsprogs-devel xxhash \
+    zlib-devel
  echo "##[endgroup]"
 }

@ -105,7 +103,7 @@ 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*)"
+  all="$(sudo dnf list --showduplicates kernel-*)"
  echo "Available versions:"
  echo "$all"

--- a/.github/workflows/scripts/qemu-4-build-vm.sh
+++ b/.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]
-#               [--poweroff][--release][--repo][--tarball]
+#       qemu-4-build-vm.sh OS [--enable-debug][--dkms][--poweroff]
+#           [--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
@ -181,7 +174,7 @@ function freebsd() {
  echo "##[endgroup]"

  echo "##[group]Build"
-  run gmake -j$(nproc)
+  run gmake -j$(sysctl -n hw.ncpu)
  echo "##[endgroup]"

  echo "##[group]Install"
@ -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]"
@ -339,13 +328,7 @@ fi
 # almalinux9.5
 # fedora42
 source /etc/os-release
- if which hostnamectl &> /dev/null ; then
-  # 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
+sudo hostname "$ID$VERSION_ID"

 # save some sysinfo
 uname -a > /var/tmp/uname.txt
--- a/.github/workflows/scripts/qemu-5-setup.sh
+++ b/.github/workflows/scripts/qemu-5-setup.sh
@ -12,26 +12,16 @@ 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

 # cpu pinning
 CPUSET=("0,1" "2,3")

-# additional options for virt-install
-OPTS[0]=""
-OPTS[1]=""
-
 case "$OS" in
  freebsd*)
    # FreeBSD needs only 6GiB
    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
    RAM=8
@ -89,7 +79,7 @@ EOF
    --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-tests,bus=virtio,cache=none,format=$FORMAT,driver.discard=unmap \
-    --import --noautoconsole ${OPTS[0]} ${OPTS[1]}
+    --import --noautoconsole >/dev/null
 done

 # generate some memory stats
@ -108,30 +98,19 @@ 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
  .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=1; i<=VMs; i++)); 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."
--- a/.github/workflows/scripts/qemu-6-tests.sh
+++ b/.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[: ]' \
-    | sed -e 's|^\[.*] Test|Test|g' \
-    | sed -e 's|/usr/local|/usr|g' \
+  CLINE=$(echo $LINE| grep "^Test[ :]" | 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"
@ -111,7 +109,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
--- a/.github/workflows/scripts/qemu-test-repo-vm.sh
+++ b/.github/workflows/scripts/qemu-test-repo-vm.sh
@ -42,10 +42,7 @@ function test_install {
 		sudo sed -i "s;baseurl=http://download.zfsonlinux.org;baseurl=$host;g" /etc/yum.repos.d/zfs.repo
 	fi

-	if ! sudo dnf -y install $args zfs zfs-test ; then
-		echo "$repo ${package}...[FAILED] $baseurl" >> $SUMMARY
-		return
-	fi
+	sudo dnf -y install $args zfs zfs-test

 	# Load modules and create a simple pool as a sanity test.
 	sudo /usr/share/zfs/zfs.sh -r
@ -73,19 +70,16 @@ almalinux*)
 	name=$(curl -Ls $url | grep 'dnf install' | grep -Eo 'zfs-release-[0-9]+-[0-9]+')
 	sudo dnf -y install https://zfsonlinux.org/epel/$name$(rpm --eval "%{dist}").noarch.rpm 2>&1
 	sudo rpm -qi zfs-release
-	for i in zfs zfs-kmod zfs-testing zfs-testing-kmod zfs-latest \
-		zfs-latest-kmod zfs-legacy zfs-legacy-kmod zfs-2.2 \
-		zfs-2.2-kmod zfs-2.3 zfs-2.3-kmod ; do
-		test_install $i $ALTHOST
-	done
+	test_install zfs $ALTHOST
+	test_install zfs-kmod $ALTHOST
+	test_install zfs-testing $ALTHOST
+	test_install zfs-testing-kmod $ALTHOST
 	;;
 fedora*)
 	url='https://raw.githubusercontent.com/openzfs/openzfs-docs/refs/heads/master/docs/Getting%20Started/Fedora/index.rst'
 	name=$(curl -Ls $url | grep 'dnf install' | grep -Eo 'zfs-release-[0-9]+-[0-9]+')
 	sudo dnf -y install -y https://zfsonlinux.org/fedora/$name$(rpm --eval "%{dist}").noarch.rpm
-	for i in zfs zfs-latest zfs-legacy zfs-2.2 zfs-2.3 ; do
-		test_install $i $ALTHOST
-	done
+	test_install zfs $ALTHOST
 	;;
 esac
 echo "##[endgroup]"
--- a/.github/workflows/smatch.yml
+++ b/.github/workflows/smatch.yml
@ -1,52 +0,0 @@
-name: smatch
-
-on:
-  push:
-  pull_request:
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
-jobs:
-  smatch:
-    runs-on: ubuntu-24.04
-    steps:
-    - name: Checkout smatch
-      uses: actions/checkout@v4
-      with:
-        repository: error27/smatch
-        ref: master
-        path: smatch
-    - name: Install smatch dependencies
-      run: |
-        sudo apt-get install -y llvm gcc make sqlite3 libsqlite3-dev libdbd-sqlite3-perl libssl-dev libtry-tiny-perl
-    - name: Make smatch
-      run: |
-        cd $GITHUB_WORKSPACE/smatch
-        make -j$(nproc)
-    - name: Checkout OpenZFS
-      uses: actions/checkout@v4
-      with:
-        ref: ${{ github.event.pull_request.head.sha }}
-        path: zfs
-    - name: Install OpenZFS dependencies
-      run: |
-        cd $GITHUB_WORKSPACE/zfs
-        sudo apt-get purge -y snapd google-chrome-stable firefox
-        ONLY_DEPS=1 .github/workflows/scripts/qemu-3-deps-vm.sh ubuntu24
-    - name: Autogen.sh OpenZFS
-      run: |
-        cd $GITHUB_WORKSPACE/zfs
-        ./autogen.sh
-    - name: Configure OpenZFS
-      run: |
-        cd $GITHUB_WORKSPACE/zfs
-        ./configure --enable-debug
-    - name: Make OpenZFS
-      run: |
-        cd $GITHUB_WORKSPACE/zfs
-        make -j$(nproc) CHECK="$GITHUB_WORKSPACE/smatch/smatch" CC=$GITHUB_WORKSPACE/smatch/cgcc | tee $GITHUB_WORKSPACE/smatch.log
-    - name: Smatch results log
-      run: |
-        grep -E 'error:|warn:|warning:' $GITHUB_WORKSPACE/smatch.log
--- a/.github/workflows/zfs-qemu-packages.yml
+++ b/.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', 'fedora43']
+        os: ['almalinux8', 'almalinux9', 'almalinux10', 'fedora41', 'fedora42']
    runs-on: ubuntu-24.04
    steps:
    - uses: actions/checkout@v4
@ -60,16 +55,20 @@ jobs:
        ref: ${{ github.event.pull_request.head.sha }}

    - name: Setup QEMU
+      timeout-minutes: 10
      run: .github/workflows/scripts/qemu-1-setup.sh

    - name: Start build machine
+      timeout-minutes: 10
      run: .github/workflows/scripts/qemu-2-start.sh ${{ matrix.os }}

    - name: Install dependencies
+      timeout-minutes: 20
      run: |
        .github/workflows/scripts/qemu-3-deps.sh ${{ matrix.os }}

    - name: Build modules or Test repo
+      timeout-minutes: 30
      run: |
        set -e
        if [ "${{ github.event.inputs.test_type }}" == "Test repo" ] ; then
@ -79,17 +78,12 @@ 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=""
-                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 }}
+                .github/workflows/scripts/qemu-4-build.sh --repo --release --dkms --tarball ${{ matrix.os }}
        fi

    - name: Prepare artifacts
      if: always()
+      timeout-minutes: 10
      run: |
        rsync -a zfs@vm0:/tmp/repo /tmp || true
        .github/workflows/scripts/replace-dupes-with-symlinks.sh /tmp/repo
--- a/.github/workflows/zfs-qemu.yml
+++ b/.github/workflows/zfs-qemu.yml
@ -5,6 +5,16 @@ on:
  pull_request:
  workflow_dispatch:
    inputs:
+      include_stream9:
+        type: boolean
+        required: false
+        default: false
+        description: 'Test on CentOS 9 stream'
+      include_stream10:
+        type: boolean
+        required: false
+        default: false
+        description: 'Test on CentOS 10 stream'
      fedora_kernel_ver:
        type: string
        required: false
@ -29,42 +39,41 @@ jobs:
      - name: Generate OS config and CI type
        id: os
        run: |
-          ci_type="default"
-
+          FULL_OS='["almalinux8", "almalinux9", "almalinux10", "debian11", "debian12", "fedora41", "fedora42", "freebsd13-4r", "freebsd14-3s", "freebsd15-0c", "ubuntu22", "ubuntu24"]'
+          QUICK_OS='["almalinux8", "almalinux9", "almalinux10", "debian12", "fedora42", "freebsd14-3s", "ubuntu24"]'
          # determine CI type when running on PR
+          ci_type="full"
          if ${{ github.event_name == 'pull_request' }}; then
            head=${{ github.event.pull_request.head.sha }}
            base=${{ github.event.pull_request.base.sha }}
            ci_type=$(python3 .github/workflows/scripts/generate-ci-type.py $head $base)
          fi
+          if [ "$ci_type" == "quick" ]; then
+            os_selection="$QUICK_OS"
+          else
+            os_selection="$FULL_OS"
+          fi

-          case "$ci_type" in
-          quick)
-            os_selection='["almalinux8", "almalinux9", "almalinux10", "debian12", "fedora42", "freebsd15-0s", "ubuntu24"]'
-            ;;
-          linux)
-            os_selection='["almalinux8", "almalinux9", "almalinux10", "centos-stream9", "centos-stream10", "debian11", "debian12", "debian13", "fedora41", "fedora42", "fedora43", "ubuntu22", "ubuntu24"]'
-            ;;
-          freebsd)
-            os_selection='["freebsd13-5r", "freebsd14-2r", "freebsd14-3r", "freebsd13-5s", "freebsd14-3s", "freebsd15-0s", "freebsd16-0c"]'
-            ;;
-          *)
-            # default list
-            os_selection='["almalinux8", "almalinux9", "almalinux10", "centos-stream9", "centos-stream10", "debian12", "debian13", "fedora42", "fedora43", "freebsd14-3r", "freebsd15-0s", "freebsd16-0c", "ubuntu22", "ubuntu24"]'
-            ;;
-          esac
-
-          if ${{ github.event.inputs.fedora_kernel_ver != '' }}; then
-              # They specified a custom kernel version for Fedora.
-              # Use only Fedora runners.
+          if [ ${{ github.event.inputs.fedora_kernel_ver }} != "" ] ; then
+              # They specified a custom kernel version for Fedora.  Use only
+              # Fedora runners.
              os_json=$(echo ${os_selection} | jq -c '[.[] | select(startswith("fedora"))]')
          else
              # Normal case
              os_json=$(echo ${os_selection} | jq -c)
          fi

-          echo "os=$os_json" | tee -a $GITHUB_OUTPUT
-          echo "ci_type=$ci_type" | tee -a $GITHUB_OUTPUT
+          # Add optional runners
+          if [ "${{ github.event.inputs.include_stream9 }}" == 'true' ]; then
+            os_json=$(echo $os_json | jq -c '. += ["centos-stream9"]')
+          fi
+          if [ "${{ github.event.inputs.include_stream10 }}" == 'true' ]; then
+            os_json=$(echo $os_json | jq -c '. += ["centos-stream10"]')
+          fi
+
+          echo $os_json
+          echo "os=$os_json" >> $GITHUB_OUTPUT
+          echo "ci_type=$ci_type" >> $GITHUB_OUTPUT

  qemu-vm:
    name: qemu-x86
@ -72,13 +81,13 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        # rhl:     almalinux8, almalinux9, centos-streamX, fedora4x
-        # debian:  debian12, debian13, ubuntu22, ubuntu24
+        # rhl:     almalinux8, almalinux9, centos-stream9, fedora41
+        # debian:  debian11, debian12, ubuntu22, ubuntu24
        # misc:    archlinux, tumbleweed
-        # FreeBSD variants of november 2025:
-        # FreeBSD Release: freebsd13-5r, freebsd14-2r, freebsd14-3r
-        # FreeBSD Stable:  freebsd13-5s, freebsd14-3s, freebsd15-0s
-        # FreeBSD Current: freebsd16-0c
+        # FreeBSD variants of 2025-06:
+        # FreeBSD Release: freebsd13-4r, freebsd13-5r, freebsd14-1r, freebsd14-2r, freebsd14-3r
+        # FreeBSD Stable:  freebsd13-5s, freebsd14-3s
+        # FreeBSD Current: freebsd15-0c
        os: ${{ fromJson(needs.test-config.outputs.test_os) }}
    runs-on: ubuntu-24.04
    steps:
@ -87,7 +96,7 @@ jobs:
        ref: ${{ github.event.pull_request.head.sha }}

    - name: Setup QEMU
-      timeout-minutes: 60
+      timeout-minutes: 10
      run: .github/workflows/scripts/qemu-1-setup.sh

    - name: Start build machine
@ -95,7 +104,7 @@ jobs:
      run: .github/workflows/scripts/qemu-2-start.sh ${{ matrix.os }}

    - name: Install dependencies
-      timeout-minutes: 60
+      timeout-minutes: 20
      run: .github/workflows/scripts/qemu-3-deps.sh ${{ matrix.os }} ${{ github.event.inputs.fedora_kernel_ver }}

    - name: Build modules
--- a/.github/workflows/zloop.yml
+++ b/.github/workflows/zloop.yml
@ -12,8 +12,7 @@ jobs:
  zloop:
    runs-on: ubuntu-24.04
    env:
-      WORK_DIR: /mnt/zloop
-      CORE_DIR: /mnt/zloop/cores
+      TEST_DIR: /var/tmp/zloop
    steps:
    - uses: actions/checkout@v4
      with:
@ -41,37 +40,38 @@ jobs:
        sudo modprobe zfs
    - name: Tests
      run: |
-        sudo truncate -s 256G /mnt/vdev
-        sudo zpool create cipool -m $WORK_DIR -O compression=on -o autotrim=on /mnt/vdev
-        sudo /usr/share/zfs/zloop.sh -t 600 -I 6 -l -m 1 -c $CORE_DIR -f $WORK_DIR -- -T 120 -P 60
+        sudo mkdir -p $TEST_DIR
+        # run for 10 minutes or at most 6 iterations for a maximum runner
+        # 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/*/
-          !/mnt/zloop/cores/*/vdev/
+          /var/tmp/zloop/*/
+          !/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
--- a/.mailmap
+++ b/.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>
@ -53,7 +51,6 @@ Jason Harmening <jason.harmening@gmail.com>
 Jeremy Faulkner <gldisater@gmail.com>
 Jinshan Xiong <jinshan.xiong@gmail.com>
 John Poduska <jpoduska@datto.com>
-Jo Zzsi <jozzsicsataban@gmail.com>
 Justin Scholz <git@justinscholz.de>
 Ka Ho Ng <khng300@gmail.com>
 Kash Pande <github@tripleback.net>
@ -68,7 +65,6 @@ Michael Gmelin <grembo@FreeBSD.org>
 Olivier Mazouffre <olivier.mazouffre@ims-bordeaux.fr>
 Piotr Kubaj <pkubaj@anongoth.pl>
 Quentin Zdanis <zdanisq@gmail.com>
-Roberto Ricci <io@r-ricci.it>
 Roberto Ricci <ricci@disroot.org>
 Rob Norris <robn@despairlabs.com>
 Rob Norris <rob.norris@klarasystems.com>
@ -85,10 +81,7 @@ 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>
-Jean-Sébastien Pédron <dumbbell@FreeBSD.org> <jean-sebastien.pedron@dumbbell.fr>
-Konstantin Belousov <kib@FreeBSD.org> <kib@kib.kiev.ua>
 Olivier Certner <olce@FreeBSD.org> <olce.freebsd@certner.fr>
-Patrick Xia <patrickx@google.com> <octalc0de@aim.com>
 Phil Sutter <phil@nwl.cc> <p.github@nwl.cc>
 poscat <poscat@poscat.moe> <poscat0x04@outlook.com>
 Qiuhao Chen <chenqiuhao1997@gmail.com> <haohao0924@126.com>
@ -130,7 +123,6 @@ buzzingwires <buzzingwires@outlook.com> <131118055+buzzingwires@users.noreply.gi
 Cedric Maunoury <cedric.maunoury@gmail.com> <38213715+cedricmaunoury@users.noreply.github.com>
 Charles Suh <charles.suh@gmail.com> <charlessuh@users.noreply.github.com>
 Chris Peredun <chris.peredun@ixsystems.com> <126915832+chrisperedun@users.noreply.github.com>
-classabbyamp <dev@placeviolette.net> <5366828+classabbyamp@users.noreply.github.com>
 Dacian Reece-Stremtan <dacianstremtan@gmail.com> <35844628+dacianstremtan@users.noreply.github.com>
 Damian Szuberski <szuberskidamian@gmail.com> <30863496+szubersk@users.noreply.github.com>
 Daniel Hiepler <d-git@coderdu.de> <32984777+heeplr@users.noreply.github.com>
@ -153,7 +145,6 @@ 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>
@ -173,7 +164,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>
@ -191,7 +181,6 @@ Michael Niewöhner <foss@mniewoehner.de> <c0d3z3r0@users.noreply.github.com>
 Michael Zhivich <mzhivich@akamai.com> <33133421+mzhivich@users.noreply.github.com>
 MigeljanImeri <ImeriMigel@gmail.com> <78048439+MigeljanImeri@users.noreply.github.com>
 Mo Zhou <cdluminate@gmail.com> <5723047+cdluminate@users.noreply.github.com>
-nav1s <nav1s@proton.me> <42621369+nav1s@users.noreply.github.com>
 Nick Mattis <nickm970@gmail.com> <nmattis@users.noreply.github.com>
 omni <omni+vagant@hack.org> <79493359+omnivagant@users.noreply.github.com>
 Pablo Correa Gómez <ablocorrea@hotmail.com> <32678034+pablofsf@users.noreply.github.com>
@ -213,7 +202,6 @@ Samuel Wycliffe <samuelwycliffe@gmail.com> <50765275+npc203@users.noreply.github
 Savyasachee Jha <hi@savyasacheejha.com> <savyajha@users.noreply.github.com>
 Scott Colby <scott@scolby.com> <scolby33@users.noreply.github.com>
 Sean Eric Fagan <kithrup@mac.com> <kithrup@users.noreply.github.com>
-Shreshth Srivastava <shreshthsrivastava2@gmail.com> <66148173+Shreshth3@users.noreply.github.com>
 Spencer Kinny <spencerkinny1995@gmail.com> <30333052+Spencer-Kinny@users.noreply.github.com>
 Srikanth N S <srikanth.nagasubbaraoseetharaman@hpe.com> <75025422+nssrikanth@users.noreply.github.com>
 Stefan Lendl <s.lendl@proxmox.com> <1321542+stfl@users.noreply.github.com>
--- a/27
+++ b/27
@ -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>
@ -60,7 +59,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 +72,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>
@ -123,7 +120,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>
@ -154,7 +150,6 @@ CONTRIBUTORS:
    Chris Zubrzycki <github@mid-earth.net>
    Chuck Tuffli <ctuffli@gmail.com>
    Chunwei Chen <david.chen@nutanix.com>
-    classabbyamp <dev@placeviolette.net>
    Clemens Fruhwirth <clemens@endorphin.org>
    Clemens Lang <cl@clang.name>
    Clint Armstrong <clint@clintarmstrong.net>
@ -162,7 +157,6 @@ CONTRIBUTORS:
    Colin Ian King <colin.king@canonical.com>
    Colin Percival <cperciva@tarsnap.com>
    Colm Buckley <colm@tuatha.org>
-    Cong Zhang <congzhangzh@users.noreply.github.com>
    Crag Wang <crag0715@gmail.com>
    Craig Loomis <cloomis@astro.princeton.edu>
    Craig Sanders <github@taz.net.au>
@ -206,7 +200,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>
@ -219,7 +212,6 @@ CONTRIBUTORS:
    Eitan Adler <lists@eitanadler.com>
    Eli Rosenthal <eli.rosenthal@delphix.com>
    Eli Schwartz <eschwartz93@gmail.com>
-    Eric A. Borisch <eborisch@gmail.com>
    Eric Desrochers <eric.desrochers@canonical.com>
    Eric Dillmann <eric@jave.fr>
    Eric Schrock <Eric.Schrock@delphix.com>
@ -258,7 +250,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>
@ -291,20 +282,17 @@ CONTRIBUTORS:
    Henrik Riomar <henrik.riomar@gmail.com>
    Herb Wartens <wartens2@llnl.gov>
    Hiếu Lê <leorize+oss@disroot.org>
-    hoshinomori <hoshinomorimorimo@gmail.com>
    Huang Liu <liu.huang@zte.com.cn>
    Håkan Johansson <f96hajo@chalmers.se>
    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 Shapovalov <intelfx@intelfx.name>
    Ivan Volosyuk <Ivan.Volosyuk@gmail.com>
    Jacek Fefliński <feflik@gmail.com>
    Jacob Adams <tookmund@gmail.com>
@ -327,7 +315,6 @@ CONTRIBUTORS:
    Javen Wu <wu.javen@gmail.com>
    Jaydeep Kshirsagar <jkshirsagar@maxlinear.com>
    Jean-Baptiste Lallement <jean-baptiste@ubuntu.com>
-    Jean-Sébastien Pédron <dumbbell@FreeBSD.org>
    Jeff Dike <jdike@akamai.com>
    Jeremy Faulkner <gldisater@gmail.com>
    Jeremy Gill <jgill@parallax-innovations.com>
@ -339,7 +326,6 @@ CONTRIBUTORS:
    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>
@ -361,9 +347,7 @@ CONTRIBUTORS:
    Josh Soref <jsoref@users.noreply.github.com>
    Joshua M. Clulow <josh@sysmgr.org>
    José Luis Salvador Rufo <salvador.joseluis@gmail.com>
-    Jo Zzsi <jozzsicsataban@gmail.com>
    João Carlos Mendes Luís <jonny@jonny.eng.br>
-    JT Pennington <jt.pennington@klarasystems.com>
    Julian Brunner <julian.brunner@gmail.com>
    Julian Heuking <JulianH@beckhoff.com>
    jumbi77 <jumbi77@users.noreply.github.com>
@ -390,13 +374,11 @@ 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>
    Kody A Kantor <kody.kantor@gmail.com>
    Kohsuke Kawaguchi <kk@kohsuke.org>
-    Konstantin Belousov <kib@FreeBSD.org>
    Konstantin Khorenko <khorenko@virtuozzo.com>
    KORN Andras <korn@elan.rulez.org>
    kotauskas <v.toncharov@gmail.com>
@ -425,7 +407,6 @@ CONTRIBUTORS:
    luozhengzheng <luo.zhengzheng@zte.com.cn>
    Luís Henriques <henrix@camandro.org>
    Madhav Suresh <madhav.suresh@delphix.com>
-    Maksym Shkolnyi <maksym.shkolnyi@workato.com>
    manfromafar <jonsonb10@gmail.com>
    Manoj Joseph <manoj.joseph@delphix.com>
    Manuel Amador (Rudd-O) <rudd-o@rudd-o.com>
@ -466,7 +447,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>
@ -492,7 +472,6 @@ CONTRIBUTORS:
    Nathaniel Clark <Nathaniel.Clark@misrule.us>
    Nathaniel Wesley Filardo <nwf@cs.jhu.edu>
    Nathan Lewis <linux.robotdude@gmail.com>
-    nav1s <nav1s@proton.me>
    Nav Ravindranath <nav@delphix.com>
    Neal Gompa (ニール・ゴンパ) <ngompa13@gmail.com>
    Ned Bass <bass6@llnl.gov>
@ -515,9 +494,7 @@ CONTRIBUTORS:
    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>
-    Patrick Xia <patrickx@google.com>
    Patrik Greco <sikevux@sikevux.se>
    Paul B. Henson <henson@acm.org>
    Paul Dagnelie <pcd@delphix.com>
@ -558,7 +535,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>
@ -617,7 +593,6 @@ CONTRIBUTORS:
    Shengqi Chen <harry-chen@outlook.com>
    SHENGYI HONG <aokblast@FreeBSD.org>
    Shen Yan <shenyanxxxy@qq.com>
-    Shreshth Srivastava <shreshthsrivastava2@gmail.com>
    Sietse <sietse@wizdom.nu>
    Simon Guest <simon.guest@tesujimath.org>
    Simon Howard <fraggle@soulsphere.org>
@ -665,7 +640,6 @@ CONTRIBUTORS:
    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>
@ -678,7 +652,6 @@ CONTRIBUTORS:
    Toyam Cox <aviator45003@gmail.com>
    Trevor Bautista <trevrb@trevrb.net>
    Trey Dockendorf <treydock@gmail.com>
-    trick2011 <trick2011@users.noreply.github.com>
    Troels Nørgaard <tnn@tradeshift.com>
    tstabrawa <tstabrawa@users.noreply.github.com>
    Tulsi Jain <tulsi.jain@delphix.com>
--- a/4
+++ b/4
@ -1,10 +1,10 @@
 Meta:          1
 Name:          zfs
 Branch:        1.0
-Version:       2.4.0
+Version:       2.3.99
 Release:       1
 Release-Tags:  relext
 License:       CDDL
 Author:        OpenZFS
-Linux-Maximum: 6.18
+Linux-Maximum: 6.15
 Linux-Minimum: 4.18
--- a/Makefile.am
+++ b/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)
--- a/README.md
+++ b/README.md
@ -10,7 +10,7 @@ This repository contains the code for running OpenZFS on Linux and FreeBSD.
 # Official Resources

  * [Documentation](https://openzfs.github.io/openzfs-docs/) - for using and developing this repo
-  * [ZoL site](https://zfsonlinux.org) - Linux release info & links
+  * [ZoL Site](https://zfsonlinux.org) - Linux release info & links
  * [Mailing lists](https://openzfs.github.io/openzfs-docs/Project%20and%20Community/Mailing%20Lists.html)
  * [OpenZFS site](https://openzfs.org/) - for conference videos and info on other platforms (illumos, OSX, Windows, etc)

--- a/autogen.sh
+++ b/autogen.sh
@ -1,3 +1,62 @@
 #!/bin/sh
+[ "${0%/*}" = "$0" ] || cd "${0%/*}" || exit

-autoreconf -fiv "$(dirname "$0")" && rm -rf "$(dirname "$0")"/autom4te.cache
+# %reldir%/%canon_reldir% (%D%/%C%) only appeared in automake 1.14, but RHEL/CentOS 7 has 1.13.4
+# This is an (overly) simplistic preprocessor that papers around this for the duration of the generation step,
+# and can be removed once support for CentOS 7 is dropped
+automake --version | awk '{print $NF; exit}' | (
+	IFS=. read -r AM_MAJ AM_MIN _
+	[ "$AM_MAJ" -gt 1 ] || [ "$AM_MIN" -ge 14 ]
+) || {
+	process_root() {
+		root="$1"; shift
+
+		grep -q '%[CD]%' "$root/Makefile.am" || return
+		find "$root" -name Makefile.am "$@" | while read -r dir; do
+			dir="${dir%/Makefile.am}"
+			grep -q '%[CD]%' "$dir/Makefile.am" || continue
+
+			reldir="${dir#"$root"}"
+			reldir="${reldir#/}"
+
+			canon_reldir="$(printf '%s' "$reldir" | tr -C 'a-zA-Z0-9@_' '_')"
+
+			reldir_slash="$reldir/"
+			canon_reldir_slash="${canon_reldir}_"
+			[ -z "$reldir" ] && reldir_slash=
+			[ -z "$reldir" ] && canon_reldir_slash=
+
+			echo "$dir/Makefile.am" >&3
+			sed -i~ -e "s:%D%/:$reldir_slash:g"       -e "s:%D%:$reldir:g" \
+			        -e "s:%C%_:$canon_reldir_slash:g" -e "s:%C%:$canon_reldir:g" "$dir/Makefile.am"
+		done 3>>"$substituted_files"
+	}
+
+	rollback() {
+		while read -r f; do
+			mv "$f~" "$f"
+		done < "$substituted_files"
+		rm -f "$substituted_files"
+	}
+
+
+	echo "Automake <1.14; papering over missing %reldir%/%canon_reldir% support" >&2
+
+	substituted_files="$(mktemp)"
+	trap rollback EXIT
+
+	roots="$(sed '/Makefile$/!d;/module/d;s:^\s*:./:;s:/Makefile::;/^\.$/d' configure.ac)"
+
+	IFS="
+"
+	for root in $roots; do
+		root="${root#./}"
+		process_root "$root"
+	done
+
+	set -f
+	# shellcheck disable=SC2086,SC2046
+	process_root . $(printf '!\n-path\n%s/*\n' $roots)
+}
+
+autoreconf -fiv && rm -rf autom4te.cache
--- a/cmd/Makefile.am
+++ b/cmd/Makefile.am
@ -98,16 +98,17 @@ endif


 if USING_PYTHON
-bin_SCRIPTS      += zarcsummary     zarcstat        dbufstat        zilstat
-CLEANFILES       += zarcsummary     zarcstat        dbufstat        zilstat
-dist_noinst_DATA += %D%/zarcsummary %D%/zarcstat.in %D%/dbufstat.in %D%/zilstat.in
+bin_SCRIPTS      += arc_summary     arcstat        dbufstat        zilstat
+CLEANFILES       += arc_summary     arcstat        dbufstat        zilstat
+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)
--- a/cmd/arc_summary
+++ b/cmd/arc_summary
@ -34,7 +34,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 +161,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 +439,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 +559,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 +671,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'])
--- a/cmd/zarcstat.in
+++ b/cmd/zarcstat.in
@ -2,7 +2,7 @@
 # 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 +56,6 @@ import time
 import getopt
 import re
 import copy
-import os

 from signal import signal, SIGINT, SIGWINCH, SIG_DFL

@ -172,7 +171,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 +187,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 +198,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 +261,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 +348,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("\tzarcstat -s \",\" -o /tmp/a.log 2 10\n")
-    sys.stderr.write("\tzarcstat -v\n")
-    sys.stderr.write("\tzarcstat -f time,hit%,dh%,ph%,mh% 1\n")
+    sys.stderr.write("\tarcstat -o /tmp/a.log 2 10\n")
+    sys.stderr.write("\tarcstat -s \",\" -o /tmp/a.log 2 10\n")
+    sys.stderr.write("\tarcstat -v\n")
+    sys.stderr.write("\tarcstat -f time,hit%,dh%,ph%,mh% 1\n")
    sys.stderr.write("\n")

    sys.exit(1)
@ -367,7 +366,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"]
@ -767,7 +766,6 @@ def calculate():


 def main():
-
    global sint
    global count
    global hdr_intr
--- a/cmd/raidz_test/raidz_test.c
+++ b/cmd/raidz_test/raidz_test.c
@ -264,21 +264,9 @@ cmp_data(raidz_test_opts_t *opts, raidz_map_t *rm)

 static int
 init_rand(void *data, size_t size, void *private)
-{
-	size_t *offsetp = (size_t *)private;
-	size_t offset = *offsetp;
-
-	VERIFY3U(offset + size, <=, SPA_MAXBLOCKSIZE);
-	memcpy(data, (char *)rand_data + offset, size);
-	*offsetp = offset + size;
-	return (0);
-}
-
-static int
-corrupt_rand_fill(void *data, size_t size, void *private)
 {
 	(void) private;
-	memset(data, 0xAA, size);
+	memcpy(data, rand_data, size);
 	return (0);
 }

@ -290,7 +278,7 @@ corrupt_colums(raidz_map_t *rm, const int *tgts, const int cnt)
 		for (int i = 0; i < cnt; i++) {
 			raidz_col_t *col = &rr->rr_col[tgts[i]];
 			abd_iterate_func(col->rc_abd, 0, col->rc_size,
-			    corrupt_rand_fill, NULL);
+			    init_rand, NULL);
 		}
 	}
 }
@ -298,8 +286,7 @@ corrupt_colums(raidz_map_t *rm, const int *tgts, const int cnt)
 void
 init_zio_abd(zio_t *zio)
 {
-	size_t offset = 0;
-	abd_iterate_func(zio->io_abd, 0, zio->io_size, init_rand, &offset);
+	abd_iterate_func(zio->io_abd, 0, zio->io_size, init_rand, NULL);
 }

 static void
@ -386,7 +373,7 @@ init_raidz_map(raidz_test_opts_t *opts, zio_t **zio, const int parity)

 	*zio = umem_zalloc(sizeof (zio_t), UMEM_NOFAIL);

-	(*zio)->io_offset = opts->rto_offset;
+	(*zio)->io_offset = 0;
 	(*zio)->io_size = alloc_dsize;
 	(*zio)->io_abd = raidz_alloc(alloc_dsize);
 	init_zio_abd(*zio);
@ -847,8 +834,6 @@ main(int argc, char **argv)
 		err = run_test(NULL);
 	}

-	mprotect(rand_data, SPA_MAXBLOCKSIZE, PROT_READ | PROT_WRITE);
-
 	umem_free(rand_data, SPA_MAXBLOCKSIZE);
 	kernel_fini();

--- a/cmd/raidz_test/raidz_test.h
+++ b/cmd/raidz_test/raidz_test.h
@ -72,7 +72,7 @@ typedef struct raidz_test_opts {

 static const raidz_test_opts_t rto_opts_defaults = {
 	.rto_ashift = 9,
-	.rto_offset = 0,
+	.rto_offset = 1ULL << 0,
 	.rto_dcols = 8,
 	.rto_dsize = 1<<19,
 	.rto_v = D_ALL,
--- a/cmd/zdb/zdb.c
+++ b/cmd/zdb/zdb.c
--- a/cmd/zdb/zdb.h
+++ b/cmd/zdb/zdb.h
@ -29,6 +29,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 */
--- a/cmd/zdb/zdb_il.c
+++ b/cmd/zdb/zdb_il.c
@ -48,6 +48,8 @@

 #include "zdb.h"

+extern uint8_t dump_opt[256];
+
 static char tab_prefix[4] = "\t\t\t";

 static void
@ -174,7 +176,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 +189,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 +240,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 +476,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";
--- a/cmd/zed/agents/zfs_agents.c
+++ b/cmd/zed/agents/zfs_agents.c
@ -134,13 +134,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,
-			    &gsp->gs_devid);
-		}
+		(void) nvlist_lookup_string(nvl, ZPOOL_CONFIG_DEVID,
+		    &gsp->gs_devid);
 		(void) nvlist_lookup_uint64(nvl, ZPOOL_CONFIG_EXPANSION_TIME,
 		    &gsp->gs_vdev_expandtime);
 		return (B_TRUE);
@ -158,28 +156,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;
-	uint64_t pool_guid;
+	if ((config = zpool_get_config(zhp, NULL)) != NULL) {
+		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 +233,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;
-		search.gs_vdev_guid = vdev_guid;
-		search.gs_pool_guid = pool_guid;
-		zpool_iter(g_zfs_hdl, zfs_agent_iter_pool, &search);
-		if (devid == NULL)
-			devid = search.gs_devid;
-		if (pool_guid == 0)
-			pool_guid = search.gs_pool_guid;
-		if (vdev_guid == 0)
-			vdev_guid = search.gs_vdev_guid;
-		devtype = search.gs_vdev_type;
+		if (devid == NULL || pool_guid == 0 || vdev_guid == 0) {
+			if (devid == NULL)
+				search.gs_vdev_guid = vdev_guid;
+			else
+				search.gs_devid = devid;
+			zpool_iter(g_zfs_hdl, zfs_agent_iter_pool, &search);
+			if (devid == NULL)
+				devid = search.gs_devid;
+			if (pool_guid == 0)
+				pool_guid = search.gs_pool_guid;
+			if (vdev_guid == 0)
+				vdev_guid = search.gs_vdev_guid;
+			devtype = search.gs_vdev_type;
+		}

 		/*
 		 * We want to avoid reporting "remove" events coming from
--- a/cmd/zed/zed.d/Makefile.am
+++ b/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_clear-sync-led.sh
+	%D%/vdev_attach-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 \
-	vdev_attach-sync-led.sh \
-	vdev_clear-sync-led.sh
+	statechange-slot_off.sh \
+	vdev_attach-led.sh \
+	vdev_clear-led.sh

 dist_noinst_DATA += %D%/README

--- a/cmd/zed/zed.d/deadman-sync-slot_off.sh
+++ b/cmd/zed/zed.d/deadman-sync-slot_off.sh
--- a/cmd/zed/zed.d/pool_import-led.sh
+++ b/cmd/zed/zed.d/pool_import-led.sh
@ -0,0 +1 @@
+statechange-led.sh
--- a/cmd/zed/zed.d/pool_import-sync-led.sh
+++ b/cmd/zed/zed.d/pool_import-sync-led.sh
@ -1 +0,0 @@
-statechange-sync-led.sh
--- a/cmd/zed/zed.d/statechange-sync-led.sh
+++ b/cmd/zed/zed.d/statechange-sync-led.sh
--- a/cmd/zed/zed.d/statechange-sync-slot_off.sh
+++ b/cmd/zed/zed.d/statechange-sync-slot_off.sh
--- a/cmd/zed/zed.d/vdev_attach-led.sh
+++ b/cmd/zed/zed.d/vdev_attach-led.sh
@ -0,0 +1 @@
+statechange-led.sh
--- a/cmd/zed/zed.d/vdev_attach-sync-led.sh
+++ b/cmd/zed/zed.d/vdev_attach-sync-led.sh
@ -1 +0,0 @@
-statechange-sync-led.sh
--- a/cmd/zed/zed.d/vdev_clear-led.sh
+++ b/cmd/zed/zed.d/vdev_clear-led.sh
@ -0,0 +1 @@
+statechange-led.sh
--- a/cmd/zed/zed.d/vdev_clear-sync-led.sh
+++ b/cmd/zed/zed.d/vdev_clear-sync-led.sh
@ -1 +0,0 @@
-statechange-sync-led.sh
--- a/cmd/zed/zed.d/zed-functions.sh
+++ b/cmd/zed/zed.d/zed-functions.sh
@ -441,9 +441,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.
    #
--- a/cmd/zed/zed_event.c
+++ b/cmd/zed/zed_event.c
@ -110,7 +110,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;

--- a/cmd/zed/zed_exec.c
+++ b/cmd/zed/zed_exec.c
@ -196,29 +196,37 @@ _nop(int sig)
 	(void) sig;
 }

-static void
-wait_for_children(boolean_t do_pause, boolean_t wait)
+static void *
+_reap_children(void *arg)
 {
-	pid_t pid;
-	struct rusage usage;
-	int status;
+	(void) arg;
 	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 (do_pause)
-					pause();
-			} else if (errno != EINTR)
+			if (pid == 0 || errno == ECHILD)
+				pause();
+			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 +278,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 +306,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 +368,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])) {
-				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);
-				}
-
+			if ((strncmp(z, *csp, n) == 0) && !isalpha(z[n]))
 				_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);
--- a/cmd/zfs/zfs_main.c
+++ b/cmd/zfs/zfs_main.c
@ -440,7 +440,7 @@ get_usage(zfs_help_t idx)
 		return (gettext("\tredact <snapshot> <bookmark> "
 		    "<redaction_snapshot> ...\n"));
 	case HELP_REWRITE:
-		return (gettext("\trewrite [-Prvx] [-o <offset>] [-l <length>] "
+		return (gettext("\trewrite [-rvx] [-o <offset>] [-l <length>] "
 		    "<directory|file ...>\n"));
 	case HELP_JAIL:
 		return (gettext("\tjail <jailid|jailname> <filesystem>\n"));
@ -914,11 +914,7 @@ zfs_do_clone(int argc, char **argv)
 			log_history = B_FALSE;
 		}

-		/*
-		 * Dataset cloned successfully, mount/share failures are
-		 * non-fatal.
-		 */
-		(void) zfs_mount_and_share(g_zfs, argv[1], ZFS_TYPE_DATASET);
+		ret = zfs_mount_and_share(g_zfs, argv[1], ZFS_TYPE_DATASET);
 	}

 	zfs_close(zhp);
@ -927,22 +923,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) {
@ -973,24 +973,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.
@ -1337,9 +1319,7 @@ zfs_do_create(int argc, char **argv)
 		goto error;
 	}

-	/* Dataset created successfully, mount/share failures are non-fatal */
-	ret = 0;
-	(void) zfs_mount_and_share(g_zfs, argv[0], ZFS_TYPE_DATASET);
+	ret = zfs_mount_and_share(g_zfs, argv[0], ZFS_TYPE_DATASET);
 error:
 	nvlist_free(props);
 	return (ret);
@ -1994,8 +1974,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 = strsep(&snap, "@");
+		char *ds, *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);
@ -2038,7 +2019,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);
@ -5323,7 +5305,6 @@ 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"
@ -5366,7 +5347,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 },
@ -5899,7 +5879,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) {
@ -5951,10 +5931,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");
@ -6884,17 +6860,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,
-					    tagname, (long long)time);
+					(void) printf("%s\t%s\t%ld\n", zname,
+					    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,
@ -7753,7 +7729,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.
@ -7795,24 +7770,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];
@ -9203,11 +9160,8 @@ zfs_do_rewrite(int argc, char **argv)
 	zfs_rewrite_args_t args;
 	memset(&args, 0, sizeof (args));

-	while ((c = getopt(argc, argv, "Pl:o:rvx")) != -1) {
+	while ((c = getopt(argc, argv, "l:o:rvx")) != -1) {
 		switch (c) {
-		case 'P':
-			args.flags |= ZFS_REWRITE_PHYSICAL;
-			break;
 		case 'l':
 			args.len = strtoll(optarg, NULL, 0);
 			break;
--- a/cmd/zfs/zfs_project.c
+++ b/cmd/zfs/zfs_project.c
@ -145,11 +145,11 @@ zfs_project_handle_one(const char *name, zfs_project_control_t *zpc)
 	switch (zpc->zpc_op) {
 	case ZFS_PROJECT_OP_LIST:
 		(void) printf("%5u %c %s\n", fsx.fsx_projid,
-		    (fsx.fsx_xflags & FS_XFLAG_PROJINHERIT) ? 'P' : '-', name);
+		    (fsx.fsx_xflags & ZFS_PROJINHERIT_FL) ? 'P' : '-', name);
 		goto out;
 	case ZFS_PROJECT_OP_CHECK:
 		if (fsx.fsx_projid == zpc->zpc_expected_projid &&
-		    fsx.fsx_xflags & FS_XFLAG_PROJINHERIT)
+		    fsx.fsx_xflags & ZFS_PROJINHERIT_FL)
 			goto out;

 		if (!zpc->zpc_newline) {
@ -164,30 +164,29 @@ zfs_project_handle_one(const char *name, zfs_project_control_t *zpc)
 			    "(%u/%u)\n", name, fsx.fsx_projid,
 			    (uint32_t)zpc->zpc_expected_projid);

-		if (!(fsx.fsx_xflags & FS_XFLAG_PROJINHERIT))
+		if (!(fsx.fsx_xflags & ZFS_PROJINHERIT_FL))
 			(void) printf("%s - project inherit flag is not set\n",
 			    name);

 		goto out;
 	case ZFS_PROJECT_OP_CLEAR:
-		if (!(fsx.fsx_xflags & FS_XFLAG_PROJINHERIT) &&
+		if (!(fsx.fsx_xflags & ZFS_PROJINHERIT_FL) &&
 		    (zpc->zpc_keep_projid ||
 		    fsx.fsx_projid == ZFS_DEFAULT_PROJID))
 			goto out;

-		fsx.fsx_xflags &= ~FS_XFLAG_PROJINHERIT;
+		fsx.fsx_xflags &= ~ZFS_PROJINHERIT_FL;
 		if (!zpc->zpc_keep_projid)
 			fsx.fsx_projid = ZFS_DEFAULT_PROJID;
 		break;
 	case ZFS_PROJECT_OP_SET:
 		if (fsx.fsx_projid == zpc->zpc_expected_projid &&
-		    (!zpc->zpc_set_flag ||
-		    fsx.fsx_xflags & FS_XFLAG_PROJINHERIT))
+		    (!zpc->zpc_set_flag || fsx.fsx_xflags & ZFS_PROJINHERIT_FL))
 			goto out;

 		fsx.fsx_projid = zpc->zpc_expected_projid;
 		if (zpc->zpc_set_flag)
-			fsx.fsx_xflags |= FS_XFLAG_PROJINHERIT;
+			fsx.fsx_xflags |= ZFS_PROJINHERIT_FL;
 		break;
 	default:
 		ASSERT(0);
@ -195,30 +194,11 @@ zfs_project_handle_one(const char *name, zfs_project_control_t *zpc)
 	}

 	ret = ioctl(fd, ZFS_IOC_FSSETXATTR, &fsx);
-	if (ret) {
+	if (ret)
 		(void) fprintf(stderr,
 		    gettext("failed to set xattr for %s: %s\n"),
 		    name, strerror(errno));

-		if (errno == ENOTSUP) {
-			char *kver = zfs_version_kernel();
-			/*
-			 * Special case: a module/userspace version mismatch can
-			 * return ENOTSUP due to us fixing the XFLAGs bits in
-			 * #17884.  In that case give a hint to the user that
-			 * they should take action to make the versions match.
-			 */
-			if (strcmp(kver, ZFS_META_ALIAS) != 0) {
-				fprintf(stderr,
-				    gettext("Warning: The zfs module version "
-				    "(%s) and userspace\nversion (%s) do not "
-				    "match up.  This may be the\ncause of the "
-				    "\"Operation not supported\" error.\n"),
-				    kver, ZFS_META_ALIAS);
-			}
-		}
-	}
-
 out:
 	close(fd);
 	return (ret);
--- a/cmd/zhack.c
+++ b/cmd/zhack.c
@ -54,7 +54,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 +69,7 @@ static __attribute__((noreturn)) void
 usage(void)
 {
 	(void) fprintf(stderr,
-	    "Usage: zhack [-o tunable] [-c cachefile] [-d dir] <subcommand> "
-	    "<args> ...\n"
+	    "Usage: zhack [-c cachefile] [-d dir] <subcommand> <args> ...\n"
 	    "where <subcommand> <args> is one of the following:\n"
 	    "\n");

@ -95,10 +93,7 @@ usage(void)
 	    "        -c repair corrupted label checksums\n"
 	    "        -u restore the label on a detached device\n"
 	    "\n"
-	    "    <device> : path to vdev\n"
-	    "\n"
-	    "    metaslab leak <pool>\n"
-	    "        apply allocation map from zdb to specified pool\n");
+	    "    <device> : path to vdev\n");
 	exit(1);
 }

@ -167,9 +162,9 @@ zhack_import(char *target, boolean_t readonly)

 	props = NULL;
 	if (readonly) {
-		VERIFY0(nvlist_alloc(&props, NV_UNIQUE_NAME, 0));
-		VERIFY0(nvlist_add_uint64(props,
-		    zpool_prop_to_name(ZPOOL_PROP_READONLY), 1));
+		VERIFY(nvlist_alloc(&props, NV_UNIQUE_NAME, 0) == 0);
+		VERIFY(nvlist_add_uint64(props,
+		    zpool_prop_to_name(ZPOOL_PROP_READONLY), 1) == 0);
 	}

 	zfeature_checks_disable = B_TRUE;
@ -223,8 +218,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,
-			    1, sizeof (val), val));
+			VERIFY(zap_lookup(os, obj, za->za_name,
+			    1, sizeof (val), val) == 0);
 			(void) printf("\t%s = %s\n", za->za_name, val);
 		}
 	}
@ -368,12 +363,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 +376,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 +496,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 +525,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 +551,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 +601,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 +616,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 (err) {
+		if (nvlist_remove_all(cfg, ZPOOL_CONFIG_CREATE_TXG) != 0) {
 			(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 (err) {
+		if (nvlist_remove_all(cfg, ZPOOL_CONFIG_POOL_TXG) != 0) {
 			(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 (err) {
+		if (nvlist_add_uint64(cfg, ZPOOL_CONFIG_POOL_TXG, txg) != 0) {
 			(void) fprintf(stderr,
 			    "error: label %d: "
 			    "Failed to add pool TXG of %" PRIu64 "\n",
 			    l, txg);
-			return (err);
+			return (1);
 		}
 	}

@ -921,7 +733,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 +754,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 +767,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 +778,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 (err)
+	if (vdev_eck->zec_magic == 0) {
+		(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 +805,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 +822,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 +981,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 +990,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 +1011,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);
--- a/cmd/zilstat.in
+++ b/cmd/zilstat.in
@ -47,7 +47,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"],
--- a/cmd/zinject/zinject.c
+++ b/cmd/zinject/zinject.c
@ -107,8 +107,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 +132,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 +346,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"
@ -737,15 +724,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 +742,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 +910,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 +940,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 +1113,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 +1150,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 +1186,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 +1276,13 @@ main(int argc, char **argv)
 			return (1);
 		}

-		if (record.zi_cmd == ZINJECT_UNINITIALIZED) {
-			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;
-		}
-
+		record.zi_cmd = ZINJECT_DATA_FAULT;
 		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 +1410,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 +1425,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 +1434,8 @@ main(int argc, char **argv)
 			libzfs_fini(g_zfs);
 			return (1);
 		}
+		if (!error)
+			error = EIO;
 	}

 	/*
--- a/cmd/zpool/Makefile.am
+++ b/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.4		openzfs-2.4-linux" \
-	"openzfs-2.4		openzfs-2.4-freebsd"
+	"openzfs-2.3		openzfs-2.3-freebsd"

 zpoolconfdir = $(sysconfdir)/zfs/zpool.d
 INSTALL_DATA_HOOKS += zpool-install-data-hook
--- a/cmd/zpool/compatibility.d/openzfs-2.4
+++ b/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
--- a/cmd/zpool/zpool_iter.c
+++ b/cmd/zpool/zpool_iter.c
@ -26,7 +26,6 @@

 /*
 * Copyright 2016 Igor Kozhukhov <ikozhukhov@gmail.com>.
- * Copyright (c) 2025, Klara, Inc.
 */

 #include <libintl.h>
@ -53,7 +52,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 +62,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,48 +81,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;
-	uu_avl_node_init(new, &new->zn_avlnode, zlp->zl_pool);
-
-	node = uu_avl_find(zlp->zl_avl, new, NULL, &idx);
-	if (node == NULL) {
+	node->zn_handle = zhp;
+	uu_avl_node_init(node, &node->zn_avlnode, zlp->zl_pool);
+	if (uu_avl_find(zlp->zl_avl, node, NULL, &idx) == 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, new, idx);
+		uu_avl_insert(zlp->zl_avl, node, idx);
 	} else {
-		zpool_refresh_stats_from_handle(node->zn_handle, zhp);
-		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
@ -153,10 +135,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;
@ -178,61 +159,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
- * given on the command line, add any new pools and remove any that are no
- * longer available.
+ * Search for any new pools, adding them to the list.  We only add pools when no
+ * options were given on the command line.  Otherwise, we keep the list fixed as
+ * those that were explicitly specified.
 */
-int
-pool_list_refresh(zpool_list_t *zlp)
+void
+pool_list_update(zpool_list_t *zlp)
 {
-	zlp->zl_last_refresh = gethrtime();
-
-	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. */
-	(void) zpool_iter(g_zfs, add_pool_cb, zlp);
-
-	/* Walk the list of existing pools, and update or remove them. */
-	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 were added
-		 * by zpool_iter() and are already up to date.
-		 */
-		if (node->zn_last_refresh == zlp->zl_last_refresh &&
-		    zpool_get_state(node->zn_handle) != POOL_STATE_UNAVAIL)
-			continue;
-
-		/* Refresh and remove if necessary. */
-		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));
+	if (zlp->zl_findall)
+		(void) zpool_iter(g_zfs, add_pool, zlp);
 }

 /*
@ -255,6 +190,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.
 */
@ -427,8 +379,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 *val;
+	char *col = NULL;
+	char *val = line;
 	char *equals;
 	char **tmp;

@ -445,7 +397,6 @@ vdev_process_cmd_output(vdev_cmd_data_t *data, char *line)
 		col = line;
 		val = equals + 1;
 	} else {
-		col = NULL;
 		val = line;
 	}

--- a/cmd/zpool/zpool_main.c
+++ b/cmd/zpool/zpool_main.c
--- a/cmd/zpool/zpool_util.h
+++ b/cmd/zpool/zpool_util.h
@ -76,10 +76,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;

--- a/cmd/zpool/zpool_vdev.c
+++ b/cmd/zpool/zpool_vdev.c
@ -195,7 +195,7 @@ is_shorthand_path(const char *arg, char *path, size_t path_size,
 			return (0);
 	}

-	(void) strlcpy(path, arg, path_size);
+	strlcpy(path, arg, path_size);
 	memset(statbuf, 0, sizeof (*statbuf));
 	*wholedisk = B_FALSE;

@ -270,13 +270,14 @@ is_spare(nvlist_t *config, const char *path)
 *	draid*		Virtual dRAID spare
 */
 static nvlist_t *
-make_leaf_vdev(const char *arg, boolean_t is_primary, uint64_t ashift)
+make_leaf_vdev(nvlist_t *props, const char *arg, boolean_t is_primary)
 {
 	char path[MAXPATHLEN];
 	struct stat64 statbuf;
 	nvlist_t *vdev = NULL;
 	const char *type = NULL;
 	boolean_t wholedisk = B_FALSE;
+	uint64_t ashift = 0;
 	int err;

 	/*
@ -308,7 +309,7 @@ make_leaf_vdev(const char *arg, boolean_t is_primary, uint64_t ashift)
 		}

 		/* After whole disk check restore original passed path */
-		(void) strlcpy(path, arg, sizeof (path));
+		strlcpy(path, arg, sizeof (path));
 	} else if (zpool_is_draid_spare(arg)) {
 		if (!is_primary) {
 			(void) fprintf(stderr,
@ -318,7 +319,7 @@ make_leaf_vdev(const char *arg, boolean_t is_primary, uint64_t ashift)
 		}

 		wholedisk = B_TRUE;
-		(void) strlcpy(path, arg, sizeof (path));
+		strlcpy(path, arg, sizeof (path));
 		type = VDEV_TYPE_DRAID_SPARE;
 	} else {
 		err = is_shorthand_path(arg, path, sizeof (path),
@ -380,6 +381,31 @@ make_leaf_vdev(const char *arg, boolean_t is_primary, uint64_t ashift)
 		verify(nvlist_add_uint64(vdev, ZPOOL_CONFIG_WHOLE_DISK,
 		    (uint64_t)wholedisk) == 0);

+	/*
+	 * Override defaults if custom properties are provided.
+	 */
+	if (props != NULL) {
+		const char *value = NULL;
+
+		if (nvlist_lookup_string(props,
+		    zpool_prop_to_name(ZPOOL_PROP_ASHIFT), &value) == 0) {
+			if (zfs_nicestrtonum(NULL, value, &ashift) != 0) {
+				(void) fprintf(stderr,
+				    gettext("ashift must be a number.\n"));
+				return (NULL);
+			}
+			if (ashift != 0 &&
+			    (ashift < ASHIFT_MIN || ashift > ASHIFT_MAX)) {
+				(void) fprintf(stderr,
+				    gettext("invalid 'ashift=%" PRIu64 "' "
+				    "property: only values between %" PRId32 " "
+				    "and %" PRId32 " are allowed.\n"),
+				    ashift, ASHIFT_MIN, ASHIFT_MAX);
+				return (NULL);
+			}
+		}
+	}
+
 	/*
 	 * If the device is known to incorrectly report its physical sector
 	 * size explicitly provide the known correct value.
@ -548,6 +574,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;

@ -582,29 +609,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
-				 * fatal is set to ensure all the replication
-				 * checks aren't skipped in check_replication().
+				 * with files, report it as an error.
 				 */
-				if (fatal && !dontreport && type != NULL &&
+				if (!dontreport && type != NULL &&
 				    strcmp(type, childtype) != 0) {
 					if (ret != NULL)
 						free(ret);
 					ret = NULL;
-					vdev_error(gettext(
-					    "mismatched replication "
-					    "level: %s contains both "
-					    "files and devices\n"),
-					    rep.zprl_type);
+					if (fatal)
+						vdev_error(gettext(
+						    "mismatched replication "
+						    "level: %s contains both "
+						    "files and devices\n"),
+						    rep.zprl_type);
+					else
+						return (NULL);
 					dontreport = B_TRUE;
 				}

@ -635,7 +656,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
@ -855,18 +876,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 "
@ -1010,7 +1019,7 @@ make_disks(zpool_handle_t *zhp, nvlist_t *nv, boolean_t replacing)
 		 * window between when udev deletes and recreates the link
 		 * during which access attempts will fail with ENOENT.
 		 */
-		(void) strlcpy(udevpath, path, MAXPATHLEN);
+		strlcpy(udevpath, path, MAXPATHLEN);
 		(void) zfs_append_partition(udevpath, MAXPATHLEN);

 		fd = open(devpath, O_RDWR|O_EXCL);
@ -1344,7 +1353,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;
@ -1487,29 +1496,6 @@ construct_spec(nvlist_t *props, int argc, char **argv)
 	const char *type, *fulltype;
 	boolean_t is_log, is_special, is_dedup, is_spare;
 	boolean_t seen_logs;
-	uint64_t ashift = 0;
-
-	if (props != NULL) {
-		const char *value = NULL;
-
-		if (nvlist_lookup_string(props,
-		    zpool_prop_to_name(ZPOOL_PROP_ASHIFT), &value) == 0) {
-			if (zfs_nicestrtonum(NULL, value, &ashift) != 0) {
-				(void) fprintf(stderr,
-				    gettext("ashift must be a number.\n"));
-				return (NULL);
-			}
-			if (ashift != 0 &&
-			    (ashift < ASHIFT_MIN || ashift > ASHIFT_MAX)) {
-				(void) fprintf(stderr,
-				    gettext("invalid 'ashift=%" PRIu64 "' "
-				    "property: only values between %" PRId32 " "
-				    "and %" PRId32 " are allowed.\n"),
-				    ashift, ASHIFT_MIN, ASHIFT_MAX);
-				return (NULL);
-			}
-		}
-	}

 	top = NULL;
 	toplevels = 0;
@ -1595,12 +1581,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' "
-					    "device: %s\n"), type);
+					    "specification: unsupported '%s' "
+					    "device: %s\n"), is_log ? "log" :
+					    "special", type);
 					goto spec_out;
 				}
 				nlogs++;
@ -1615,9 +1602,9 @@ construct_spec(nvlist_t *props, int argc, char **argv)
 				    children * sizeof (nvlist_t *));
 				if (child == NULL)
 					zpool_no_memory();
-				if ((nv = make_leaf_vdev(argv[c],
+				if ((nv = make_leaf_vdev(props, argv[c],
 				    !(is_log || is_special || is_dedup ||
-				    is_spare), ashift)) == NULL) {
+				    is_spare))) == NULL) {
 					for (c = 0; c < children - 1; c++)
 						nvlist_free(child[c]);
 					free(child);
@ -1681,10 +1668,6 @@ construct_spec(nvlist_t *props, int argc, char **argv)
 					    ZPOOL_CONFIG_ALLOCATION_BIAS,
 					    VDEV_ALLOC_BIAS_DEDUP) == 0);
 				}
-				if (ashift > 0) {
-					fnvlist_add_uint64(nv,
-					    ZPOOL_CONFIG_ASHIFT, ashift);
-				}
 				if (strcmp(type, VDEV_TYPE_RAIDZ) == 0) {
 					verify(nvlist_add_uint64(nv,
 					    ZPOOL_CONFIG_NPARITY,
@ -1712,9 +1695,8 @@ construct_spec(nvlist_t *props, int argc, char **argv)
 			 * We have a device.  Pass off to make_leaf_vdev() to
 			 * construct the appropriate nvlist describing the vdev.
 			 */
-			if ((nv = make_leaf_vdev(argv[0], !(is_log ||
-			    is_special || is_dedup || is_spare),
-			    ashift)) == NULL)
+			if ((nv = make_leaf_vdev(props, argv[0], !(is_log ||
+			    is_special || is_dedup || is_spare))) == NULL)
 				goto spec_out;

 			verify(nvlist_add_uint64(nv,
--- a/cmd/zstream/Makefile.am
+++ b/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
--- a/cmd/ztest.c
+++ b/cmd/ztest.c
@ -273,6 +273,7 @@ extern int zfs_compressed_arc_enabled;
 extern int zfs_abd_scatter_enabled;
 extern uint_t dmu_object_alloc_chunk_shift;
 extern boolean_t zfs_force_some_double_word_sm_entries;
+extern unsigned long zio_decompress_fail_fraction;
 extern unsigned long zfs_reconstruct_indirect_damage_fraction;
 extern uint64_t raidz_expand_max_reflow_bytes;
 extern uint_t raidz_expand_pause_point;
@ -808,8 +809,8 @@ static ztest_option_t option_table[] = {
 	{ 'X', "raidz-expansion", NULL,
 	    "Perform a dedicated raidz expansion test",
 	    NO_DEFAULT, NULL},
-	{ 'o',	"option", "\"NAME=VALUE\"",
-	    "Set the named tunable to the given value",
+	{ 'o',	"option", "\"OPTION=INTEGER\"",
+	    "Set global variable to an unsigned 32-bit integer value",
 	    NO_DEFAULT, NULL},
 	{ 'G',	"dump-debug-msg", NULL,
 	    "Dump zfs_dbgmsg buffer before exiting due to an error",
@ -828,8 +829,8 @@ static char *short_opts = NULL;
 static void
 init_options(void)
 {
-	ASSERT0P(long_opts);
-	ASSERT0P(short_opts);
+	ASSERT3P(long_opts, ==, NULL);
+	ASSERT3P(short_opts, ==, NULL);

 	int count = sizeof (option_table) / sizeof (option_table[0]);
 	long_opts = umem_alloc(sizeof (struct option) * count, UMEM_NOFAIL);
@ -918,7 +919,7 @@ ztest_parse_name_value(const char *input, ztest_shared_opts_t *zo)
 {
 	char name[32];
 	char *value;
-	int state;
+	int state = ZTEST_VDEV_CLASS_RND;

 	(void) strlcpy(name, input, sizeof (name));

@ -1228,10 +1229,10 @@ ztest_kill(ztest_shared_t *zs)
 	 * See comment above spa_write_cachefile().
 	 */
 	if (raidz_expand_pause_point != RAIDZ_EXPAND_PAUSE_NONE) {
-		if (spa_namespace_tryenter(FTAG)) {
+		if (mutex_tryenter(&spa_namespace_lock)) {
 			spa_write_cachefile(ztest_spa, B_FALSE, B_FALSE,
 			    B_FALSE);
-			spa_namespace_exit(FTAG);
+			mutex_exit(&spa_namespace_lock);

 			ztest_scratch_state->zs_raidz_scratch_verify_pause =
 			    raidz_expand_pause_point;
@ -1246,9 +1247,9 @@ ztest_kill(ztest_shared_t *zs)
 			return;
 		}
 	} else {
-		spa_namespace_enter(FTAG);
+		mutex_enter(&spa_namespace_lock);
 		spa_write_cachefile(ztest_spa, B_FALSE, B_FALSE, B_FALSE);
-		spa_namespace_exit(FTAG);
+		mutex_exit(&spa_namespace_lock);
 	}

 	(void) raise(SIGKILL);
@ -1685,7 +1686,7 @@ ztest_rll_init(rll_t *rll)
 static void
 ztest_rll_destroy(rll_t *rll)
 {
-	ASSERT0P(rll->rll_writer);
+	ASSERT3P(rll->rll_writer, ==, NULL);
 	ASSERT0(rll->rll_readers);
 	mutex_destroy(&rll->rll_lock);
 	cv_destroy(&rll->rll_cv);
@ -1719,7 +1720,7 @@ ztest_rll_unlock(rll_t *rll)
 		rll->rll_writer = NULL;
 	} else {
 		ASSERT3S(rll->rll_readers, >, 0);
-		ASSERT0P(rll->rll_writer);
+		ASSERT3P(rll->rll_writer, ==, NULL);
 		rll->rll_readers--;
 	}

@ -1995,7 +1996,7 @@ ztest_log_write(ztest_ds_t *zd, dmu_tx_t *tx, lr_write_t *lr)
 	    dmu_read(zd->zd_os, lr->lr_foid, lr->lr_offset, lr->lr_length,
 	    ((lr_write_t *)&itx->itx_lr) + 1, DMU_READ_NO_PREFETCH |
 	    DMU_KEEP_CACHING) != 0) {
-		zil_itx_destroy(itx, 0);
+		zil_itx_destroy(itx);
 		itx = zil_itx_create(TX_WRITE, sizeof (*lr));
 		write_state = WR_NEED_COPY;
 	}
@ -2277,8 +2278,8 @@ ztest_replay_write(void *arg1, void *arg2, boolean_t byteswap)

 			ztest_block_tag_t rbt;

-			VERIFY0(dmu_read(os, lr->lr_foid, offset,
-			    sizeof (rbt), &rbt, flags));
+			VERIFY(dmu_read(os, lr->lr_foid, offset,
+			    sizeof (rbt), &rbt, flags) == 0);
 			if (rbt.bt_magic == BT_MAGIC) {
 				ztest_bt_verify(&rbt, os, lr->lr_foid, 0,
 				    offset, gen, txg, crtxg);
@ -2306,8 +2307,7 @@ ztest_replay_write(void *arg1, void *arg2, boolean_t byteswap)
 	}

 	if (abuf == NULL) {
-		dmu_write(os, lr->lr_foid, offset, length, data, tx,
-		    DMU_READ_PREFETCH);
+		dmu_write(os, lr->lr_foid, offset, length, data, tx);
 	} else {
 		memcpy(abuf->b_data, data, length);
 		VERIFY0(dmu_assign_arcbuf_by_dbuf(db, offset, abuf, tx, 0));
@ -2966,7 +2966,7 @@ ztest_zil_commit(ztest_ds_t *zd, uint64_t id)

 	(void) pthread_rwlock_rdlock(&zd->zd_zilog_lock);

-	VERIFY0(zil_commit(zilog, ztest_random(ZTEST_OBJECTS)));
+	zil_commit(zilog, ztest_random(ZTEST_OBJECTS));

 	/*
 	 * Remember the committed values in zd, which is in parent/child
@ -3689,10 +3689,10 @@ ztest_split_pool(ztest_ds_t *zd, uint64_t id)

 	if (error == 0) {
 		(void) printf("successful split - results:\n");
-		spa_namespace_enter(FTAG);
+		mutex_enter(&spa_namespace_lock);
 		show_pool_stats(spa);
 		show_pool_stats(spa_lookup("splitp"));
-		spa_namespace_exit(FTAG);
+		mutex_exit(&spa_namespace_lock);
 		++zs->zs_splits;
 		--zs->zs_mirrors;
 	}
@ -3882,7 +3882,7 @@ ztest_vdev_attach_detach(ztest_ds_t *zd, uint64_t id)
 	 * If newvd is too small, it should fail with EOVERFLOW.
 	 *
 	 * If newvd is a distributed spare and it's being attached to a
-	 * dRAID which is not its parent it should fail with ENOTSUP.
+	 * dRAID which is not its parent it should fail with EINVAL.
 	 */
 	if (pvd->vdev_ops != &vdev_mirror_ops &&
 	    pvd->vdev_ops != &vdev_root_ops && (!replacing ||
@ -3901,7 +3901,7 @@ ztest_vdev_attach_detach(ztest_ds_t *zd, uint64_t id)
 	else if (ashift > oldvd->vdev_top->vdev_ashift)
 		expected_error = EDOM;
 	else if (newvd_is_dspare && pvd != vdev_draid_spare_get_parent(newvd))
-		expected_error = ENOTSUP;
+		expected_error = EINVAL;
 	else
 		expected_error = 0;

@ -3976,11 +3976,11 @@ raidz_scratch_verify(void)

 	kernel_init(SPA_MODE_READ);

-	spa_namespace_enter(FTAG);
+	mutex_enter(&spa_namespace_lock);
 	spa = spa_lookup(ztest_opts.zo_pool);
 	ASSERT(spa);
 	spa->spa_import_flags |= ZFS_IMPORT_SKIP_MMP;
-	spa_namespace_exit(FTAG);
+	mutex_exit(&spa_namespace_lock);

 	VERIFY0(spa_open(ztest_opts.zo_pool, &spa, FTAG));

@ -4007,7 +4007,7 @@ raidz_scratch_verify(void)
 		 * requested by user, but scratch object was not created.
 		 */
 		case RRSS_SCRATCH_NOT_IN_USE:
-			ASSERT0(offset);
+			ASSERT3U(offset, ==, 0);
 			break;

 		/*
@ -5244,8 +5244,7 @@ ztest_dmu_read_write(ztest_ds_t *zd, uint64_t id)
 	 * We've verified all the old bufwads, and made new ones.
 	 * Now write them out.
 	 */
-	dmu_write(os, packobj, packoff, packsize, packbuf, tx,
-	    DMU_READ_PREFETCH);
+	dmu_write(os, packobj, packoff, packsize, packbuf, tx);

 	if (freeit) {
 		if (ztest_opts.zo_verbose >= 7) {
@ -5260,8 +5259,7 @@ ztest_dmu_read_write(ztest_ds_t *zd, uint64_t id)
 			    " txg %"PRIx64"\n",
 			    bigoff, bigsize, txg);
 		}
-		dmu_write(os, bigobj, bigoff, bigsize, bigbuf, tx,
-		    DMU_READ_PREFETCH);
+		dmu_write(os, bigobj, bigoff, bigsize, bigbuf, tx);
 	}

 	dmu_tx_commit(tx);
@ -5516,8 +5514,7 @@ ztest_dmu_read_write_zcopy(ztest_ds_t *zd, uint64_t id)
 		 * We've verified all the old bufwads, and made new ones.
 		 * Now write them out.
 		 */
-		dmu_write(os, packobj, packoff, packsize, packbuf, tx,
-		    DMU_READ_PREFETCH);
+		dmu_write(os, packobj, packoff, packsize, packbuf, tx);
 		if (ztest_opts.zo_verbose >= 7) {
 			(void) printf("writing offset %"PRIx64" size %"PRIx64""
 			    " txg %"PRIx64"\n",
@ -5540,8 +5537,8 @@ ztest_dmu_read_write_zcopy(ztest_ds_t *zd, uint64_t id)
 			}

 			if (i == 1) {
-				VERIFY0(dmu_buf_hold(os, bigobj, off,
-				    FTAG, &dbt, DMU_READ_NO_PREFETCH));
+				VERIFY(dmu_buf_hold(os, bigobj, off,
+				    FTAG, &dbt, DMU_READ_NO_PREFETCH) == 0);
 			}
 			if (i != 5 || chunksize < (SPA_MINBLOCKSIZE * 2)) {
 				VERIFY0(dmu_assign_arcbuf_by_dbuf(bonus_db,
@ -6123,8 +6120,7 @@ ztest_dmu_commit_callbacks(ztest_ds_t *zd, uint64_t id)
 		    "future leak: got %"PRIu64", open txg is %"PRIu64"",
 		    old_txg, txg);

-	dmu_write(os, od->od_object, 0, sizeof (uint64_t), &txg, tx,
-	    DMU_READ_PREFETCH);
+	dmu_write(os, od->od_object, 0, sizeof (uint64_t), &txg, tx);

 	(void) mutex_enter(&zcl.zcl_callbacks_lock);

@ -7073,7 +7069,7 @@ ztest_set_global_vars(void)
 		char *kv = ztest_opts.zo_gvars[i];
 		VERIFY3U(strlen(kv), <=, ZO_GVARS_MAX_ARGLEN);
 		VERIFY3U(strlen(kv), >, 0);
-		int err = handle_tunable_option(kv, B_TRUE);
+		int err = set_global_var(kv);
 		if (ztest_opts.zo_verbose > 0) {
 			(void) printf("setting global var %s ... %s\n", kv,
 			    err ? "failed" : "ok");
@ -7427,11 +7423,11 @@ ztest_walk_pool_directory(const char *header)
 	if (ztest_opts.zo_verbose >= 6)
 		(void) puts(header);

-	spa_namespace_enter(FTAG);
+	mutex_enter(&spa_namespace_lock);
 	while ((spa = spa_next(spa)) != NULL)
 		if (ztest_opts.zo_verbose >= 6)
 			(void) printf("\t%s\n", spa_name(spa));
-	spa_namespace_exit(FTAG);
+	mutex_exit(&spa_namespace_lock);
 }

 static void
@ -7817,9 +7813,6 @@ ztest_dataset_open(int d)

 	ztest_dataset_name(name, ztest_opts.zo_pool, d);

-	if (ztest_opts.zo_verbose >= 6)
-		(void) printf("Opening %s\n", name);
-
 	(void) pthread_rwlock_rdlock(&ztest_name_lock);

 	error = ztest_dataset_create(name);
@ -7941,7 +7934,7 @@ ztest_freeze(void)
 	 */
 	while (BP_IS_HOLE(&zd->zd_zilog->zl_header->zh_log)) {
 		ztest_dmu_object_alloc_free(zd, 0);
-		VERIFY0(zil_commit(zd->zd_zilog, 0));
+		zil_commit(zd->zd_zilog, 0);
 	}

 	txg_wait_synced(spa_get_dsl(spa), 0);
@ -7983,7 +7976,7 @@ ztest_freeze(void)
 	/*
 	 * Commit all of the changes we just generated.
 	 */
-	VERIFY0(zil_commit(zd->zd_zilog, 0));
+	zil_commit(zd->zd_zilog, 0);
 	txg_wait_synced(spa_get_dsl(spa), 0);

 	/*
@ -8315,44 +8308,41 @@ static void
 ztest_generic_run(ztest_shared_t *zs, spa_t *spa)
 {
 	kthread_t **run_threads;
-	int i, ndatasets;
+	int t;

 	run_threads = umem_zalloc(ztest_opts.zo_threads * sizeof (kthread_t *),
 	    UMEM_NOFAIL);

-	/*
-	 * Actual number of datasets to be used.
-	 */
-	ndatasets = MIN(ztest_opts.zo_datasets, ztest_opts.zo_threads);
-
-	/*
-	 * Prepare the datasets first.
-	 */
-	for (i = 0; i < ndatasets; i++)
-		VERIFY0(ztest_dataset_open(i));
-
 	/*
 	 * Kick off all the tests that run in parallel.
 	 */
-	for (i = 0; i < ztest_opts.zo_threads; i++) {
-		run_threads[i] = thread_create(NULL, 0, ztest_thread,
-		    (void *)(uintptr_t)i, 0, NULL, TS_RUN | TS_JOINABLE,
+	for (t = 0; t < ztest_opts.zo_threads; t++) {
+		if (t < ztest_opts.zo_datasets && ztest_dataset_open(t) != 0) {
+			umem_free(run_threads, ztest_opts.zo_threads *
+			    sizeof (kthread_t *));
+			return;
+		}
+
+		run_threads[t] = thread_create(NULL, 0, ztest_thread,
+		    (void *)(uintptr_t)t, 0, NULL, TS_RUN | TS_JOINABLE,
 		    defclsyspri);
 	}

 	/*
 	 * Wait for all of the tests to complete.
 	 */
-	for (i = 0; i < ztest_opts.zo_threads; i++)
-		VERIFY0(thread_join(run_threads[i]));
+	for (t = 0; t < ztest_opts.zo_threads; t++)
+		VERIFY0(thread_join(run_threads[t]));

 	/*
 	 * Close all datasets. This must be done after all the threads
 	 * are joined so we can be sure none of the datasets are in-use
 	 * by any of the threads.
 	 */
-	for (i = 0; i < ndatasets; i++)
-		ztest_dataset_close(i);
+	for (t = 0; t < ztest_opts.zo_threads; t++) {
+		if (t < ztest_opts.zo_datasets)
+			ztest_dataset_close(t);
+	}

 	txg_wait_synced(spa_get_dsl(spa), 0);

@ -8475,7 +8465,6 @@ ztest_run(ztest_shared_t *zs)

 		int d = ztest_random(ztest_opts.zo_datasets);
 		ztest_dataset_destroy(d);
-		txg_wait_synced(spa_get_dsl(spa), 0);
 	}
 	zs->zs_enospc_count = 0;

@ -8546,11 +8535,11 @@ ztest_run(ztest_shared_t *zs)
 	/*
 	 * Verify that we can loop over all pools.
 	 */
-	spa_namespace_enter(FTAG);
+	mutex_enter(&spa_namespace_lock);
 	for (spa = spa_next(NULL); spa != NULL; spa = spa_next(spa))
 		if (ztest_opts.zo_verbose > 3)
 			(void) printf("spa_next: found %s\n", spa_name(spa));
-	spa_namespace_exit(FTAG);
+	mutex_exit(&spa_namespace_lock);

 	/*
 	 * Verify that we can export the pool and reimport it under a
@ -8983,7 +8972,7 @@ main(int argc, char **argv)
 		exit(EXIT_FAILURE);
 	} else {
 		/* children should not be spawned if setting gvars fails */
-		VERIFY0(err);
+		VERIFY3S(err, ==, 0);
 	}

 	/* Override location of zpool.cache */
--- a/config/Shellcheck.am
+++ b/config/Shellcheck.am
@ -16,14 +16,10 @@ SHELLCHECK_OPTS         = $(call JUST_SHELLCHECK_OPTS,$(1)) $(call JUST_CHECKBAS

 PHONY += shellcheck

-shellcheck_verbose = $(shellcheck_verbose_@AM_V@)
-shellcheck_verbose_ = $(shellcheck_verbose_@AM_DEFAULT_V@)
-shellcheck_verbose_0 = @echo SHELLCHECK $(_STGT);
-
 _STGT = $(subst ^,/,$(subst shellcheck-here-,,$@))
 shellcheck-here-%:
 if HAVE_SHELLCHECK
-	$(shellcheck_verbose)shellcheck --format=gcc --enable=all --exclude=SC1090,SC1091,SC2039,SC2250,SC2312,SC2317,SC3043 $$([ -n "$(SHELLCHECK_SHELL)" ] && echo "--shell=$(SHELLCHECK_SHELL)") "$$([ -e "$(_STGT)" ] || echo "$(srcdir)/")$(_STGT)"
+	shellcheck --format=gcc --enable=all --exclude=SC1090,SC1091,SC2039,SC2250,SC2312,SC2317,SC3043 $$([ -n "$(SHELLCHECK_SHELL)" ] && echo "--shell=$(SHELLCHECK_SHELL)") "$$([ -e "$(_STGT)" ] || echo "$(srcdir)/")$(_STGT)"
 else
 	@echo "skipping shellcheck of" $(_STGT) "because shellcheck is not installed"
 endif
@ -33,15 +29,11 @@ shellcheck: $(SHELLCHECKSCRIPTS) $(call JUST_SHELLCHECK_OPTS,$(SHELLCHECKSCRIPTS

 PHONY += checkbashisms

-checkbashisms_verbose = $(checkbashisms_verbose_@AM_V@)
-checkbashisms_verbose_ = $(checkbashisms_verbose_@AM_DEFAULT_V@)
-checkbashisms_verbose_0 = @echo CHECKBASHISMS $(_BTGT);
-
 # command -v *is* specified by POSIX and every shell in existence supports it
 _BTGT = $(subst ^,/,$(subst checkbashisms-here-,,$@))
 checkbashisms-here-%:
 if HAVE_CHECKBASHISMS
-	$(checkbashisms_verbose)! { [ -n "$(SHELLCHECK_SHELL)" ] && echo '#!/bin/$(SHELLCHECK_SHELL)'; cat "$$([ -e "$(_BTGT)" ] || echo "$(srcdir)/")$(_BTGT)"; } | \
+	! { [ -n "$(SHELLCHECK_SHELL)" ] && echo '#!/bin/$(SHELLCHECK_SHELL)'; cat "$$([ -e "$(_BTGT)" ] || echo "$(srcdir)/")$(_BTGT)"; } | \
 	checkbashisms -npx 2>&1 | grep -vFe "'command' with option other than -p" -e 'command -v' -e 'any possible bashisms' $(CHECKBASHISMS_IGNORE) >&2
 else
 	@echo "skipping checkbashisms of" $(_BTGT) "because checkbashisms is not installed"
--- a/config/always-arch.m4
+++ b/config/always-arch.m4
@ -34,26 +34,8 @@ AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_ARCH], [
 	esac

 	AM_CONDITIONAL([TARGET_CPU_AARCH64], test $TARGET_CPU = aarch64)
-	AM_CONDITIONAL([TARGET_CPU_I386],    test $TARGET_CPU = i386)
 	AM_CONDITIONAL([TARGET_CPU_X86_64],  test $TARGET_CPU = x86_64)
 	AM_CONDITIONAL([TARGET_CPU_POWERPC], test $TARGET_CPU = powerpc)
 	AM_CONDITIONAL([TARGET_CPU_SPARC64], test $TARGET_CPU = sparc64)
 	AM_CONDITIONAL([TARGET_CPU_ARM],     test $TARGET_CPU = arm)
 ])
-dnl #
-dnl # Check for conflicting environment variables
-dnl #
-dnl # If ARCH env variable is set up, then kernel Makefile in the /usr/src/kernel
-dnl # can misbehave during the zfs ./configure test of the module compilation.
-AC_DEFUN([ZFS_AC_CONFIG_CHECK_ARCH_VAR], [
-	AC_MSG_CHECKING([for conflicting environment variables])
-	if test -n "$ARCH"; then
-		AC_MSG_RESULT([warning])
-		AC_MSG_WARN(m4_normalize([ARCH environment variable is set to "$ARCH".
-    This can cause build kernel modules support check failure.
-    Please unset it.]))
-	else
-		AC_MSG_RESULT([done])
-	fi
-])
-
--- a/config/always-compiler-options.m4
+++ b/config/always-compiler-options.m4
@ -155,34 +155,6 @@ AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_CC_NO_FORMAT_ZERO_LENGTH], [
 	AC_SUBST([NO_FORMAT_ZERO_LENGTH])
 ])

-dnl #
-dnl # Check if kernel cc supports -Wno-format-zero-length option.
-dnl #
-AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_KERNEL_CC_NO_FORMAT_ZERO_LENGTH], [
-	saved_cc="$CC"
-	AS_IF(
-		[ test -n "$KERNEL_CC" ], [ CC="$KERNEL_CC" ],
-		[ test -n "$KERNEL_LLVM" ], [ CC="clang" ],
-		[ CC="gcc" ]
-	)
-	AC_MSG_CHECKING([whether $CC supports -Wno-format-zero-length])
-
-	saved_flags="$CFLAGS"
-	CFLAGS="$CFLAGS -Werror -Wno-format-zero-length"
-
-	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [])], [
-		KERNEL_NO_FORMAT_ZERO_LENGTH=-Wno-format-zero-length
-		AC_MSG_RESULT([yes])
-	], [
-		KERNEL_NO_FORMAT_ZERO_LENGTH=
-		AC_MSG_RESULT([no])
-	])
-
-	CC="$saved_cc"
-	CFLAGS="$saved_flags"
-	AC_SUBST([KERNEL_NO_FORMAT_ZERO_LENGTH])
-])
-
 dnl #
 dnl # Check if cc supports -Wno-clobbered option.
 dnl #
@ -209,27 +181,6 @@ AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_CC_NO_CLOBBERED], [
 	AC_SUBST([NO_CLOBBERED])
 ])

-dnl #
-dnl # Check if cc supports -Wno-atomic-alignment option.
-dnl #
-AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_CC_NO_ATOMIC_ALIGNMENT], [
-	AC_MSG_CHECKING([whether $CC supports -Wno-atomic-alignment])
-
-	saved_flags="$CFLAGS"
-	CFLAGS="$CFLAGS -Werror -Wno-atomic-alignment"
-
-	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [])], [
-		NO_ATOMIC_ALIGNMENT=-Wno-atomic-alignment
-		AC_MSG_RESULT([yes])
-	], [
-		NO_ATOMIC_ALIGNMENT=
-		AC_MSG_RESULT([no])
-	])
-
-	CFLAGS="$saved_flags"
-	AC_SUBST([NO_ATOMIC_ALIGNMENT])
-])
-
 dnl #
 dnl # Check if cc supports -Wimplicit-fallthrough option.
 dnl #
@ -280,17 +231,20 @@ dnl #
 dnl # Check if kernel cc supports -Winfinite-recursion option.
 dnl #
 AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_KERNEL_CC_INFINITE_RECURSION], [
-	saved_cc="$CC"
-	AS_IF(
-		[ test -n "$KERNEL_CC" ], [ CC="$KERNEL_CC" ],
-		[ test -n "$KERNEL_LLVM" ], [ CC="clang" ],
-		[ CC="gcc" ]
-	)
-	AC_MSG_CHECKING([whether $CC supports -Winfinite-recursion])
+	AC_MSG_CHECKING([whether $KERNEL_CC supports -Winfinite-recursion])

+	saved_cc="$CC"
 	saved_flags="$CFLAGS"
+	CC="gcc"
 	CFLAGS="$CFLAGS -Werror -Winfinite-recursion"

+	AS_IF([ test -n "$KERNEL_CC" ], [
+		CC="$KERNEL_CC"
+	])
+	AS_IF([ test -n "$KERNEL_LLVM" ], [
+		CC="clang"
+	])
+
 	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [])], [
 		KERNEL_INFINITE_RECURSION=-Winfinite-recursion
 		AC_DEFINE([HAVE_KERNEL_INFINITE_RECURSION], 1,
@ -375,17 +329,20 @@ dnl #
 dnl # Check if kernel cc supports -fno-ipa-sra option.
 dnl #
 AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_KERNEL_CC_NO_IPA_SRA], [
-	saved_cc="$CC"
-	AS_IF(
-		[ test -n "$KERNEL_CC" ], [ CC="$KERNEL_CC" ],
-		[ test -n "$KERNEL_LLVM" ], [ CC="clang" ],
-		[ CC="gcc" ]
-	)
-	AC_MSG_CHECKING([whether $CC supports -fno-ipa-sra])
+	AC_MSG_CHECKING([whether $KERNEL_CC supports -fno-ipa-sra])

+	saved_cc="$CC"
 	saved_flags="$CFLAGS"
+	CC="gcc"
 	CFLAGS="$CFLAGS -Werror -fno-ipa-sra"

+	AS_IF([ test -n "$KERNEL_CC" ], [
+		CC="$KERNEL_CC"
+	])
+	AS_IF([ test -n "$KERNEL_LLVM" ], [
+		CC="clang"
+	])
+
 	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [])], [
 		KERNEL_NO_IPA_SRA=-fno-ipa-sra
 		AC_MSG_RESULT([yes])
--- a/config/ax_python_devel.m4
+++ b/config/ax_python_devel.m4
@ -72,7 +72,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.

-#serial 37
+#serial 36

 AU_ALIAS([AC_PYTHON_DEVEL], [AX_PYTHON_DEVEL])
 AC_DEFUN([AX_PYTHON_DEVEL],[
@ -316,7 +316,7 @@ EOD`
 			PYTHON_LIBS="-L$ac_python_libdir -lpython$ac_python_version"
 		fi

-		if test -z "$PYTHON_LIBS"; then
+		if test -z "PYTHON_LIBS"; then
 			AC_MSG_WARN([
  Cannot determine location of your Python DSO. Please check it was installed with
  dynamic libraries enabled, or try setting PYTHON_LIBS by hand.
--- a/config/deb.am
+++ b/config/deb.am
@ -58,9 +58,9 @@ deb-utils: deb-local rpm-utils-initramfs
 	pkg1=$${name}-$${version}.$${arch}.rpm; \
 	pkg2=libnvpair3-$${version}.$${arch}.rpm; \
 	pkg3=libuutil3-$${version}.$${arch}.rpm; \
-	pkg4=libzfs7-$${version}.$${arch}.rpm; \
-	pkg5=libzpool7-$${version}.$${arch}.rpm; \
-	pkg6=libzfs7-devel-$${version}.$${arch}.rpm; \
+	pkg4=libzfs6-$${version}.$${arch}.rpm; \
+	pkg5=libzpool6-$${version}.$${arch}.rpm; \
+	pkg6=libzfs6-devel-$${version}.$${arch}.rpm; \
 	pkg7=$${name}-test-$${version}.$${arch}.rpm; \
 	pkg8=$${name}-dracut-$${version}.noarch.rpm; \
 	pkg9=$${name}-initramfs-$${version}.$${arch}.rpm; \
@ -72,7 +72,7 @@ deb-utils: deb-local rpm-utils-initramfs
 	path_prepend=`mktemp -d /tmp/intercept.XXXXXX`; \
 	echo "#!$(SHELL)" > $${path_prepend}/dh_shlibdeps; \
 	echo "`which dh_shlibdeps` -- \
-	 -xlibuutil3linux -xlibnvpair3linux -xlibzfs7linux -xlibzpool7linux" \
+	 -xlibuutil3linux -xlibnvpair3linux -xlibzfs6linux -xlibzpool6linux" \
 	 >> $${path_prepend}/dh_shlibdeps; \
 ## These -x arguments are passed to dpkg-shlibdeps, which exclude the
 ## Debianized packages from the auto-generated dependencies of the new debs,
--- a/config/kernel-blkdev.m4
+++ b/config/kernel-blkdev.m4
@ -29,8 +29,9 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_BLKDEV_GET_BY_PATH_4ARG], [
 		const char *path = "path";
 		fmode_t mode = 0;
 		void *holder = NULL;
+		struct blk_holder_ops h;

-		bdev = blkdev_get_by_path(path, mode, holder, NULL);
+		bdev = blkdev_get_by_path(path, mode, holder, &h);
 	])
 ])

@ -47,8 +48,9 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_BLKDEV_BDEV_OPEN_BY_PATH], [
 		const char *path = "path";
 		fmode_t mode = 0;
 		void *holder = NULL;
+		struct blk_holder_ops h;

-		bdh = bdev_open_by_path(path, mode, holder, NULL);
+		bdh = bdev_open_by_path(path, mode, holder, &h);
 	])
 ])

@ -66,8 +68,9 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_BDEV_FILE_OPEN_BY_PATH], [
 		const char *path = "path";
 		fmode_t mode = 0;
 		void *holder = NULL;
+		struct blk_holder_ops h;

-		file = bdev_file_open_by_path(path, mode, holder, NULL);
+		file = bdev_file_open_by_path(path, mode, holder, &h);
 	])
 ])

--- a/config/kernel-block-device-operations.m4
+++ b/config/kernel-block-device-operations.m4
@ -119,49 +119,15 @@ AC_DEFUN([ZFS_AC_KERNEL_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK], [
 	])
 ])

-dnl #
-dnl # 6.18 API change
-dnl # block_device_operation->getgeo takes struct gendisk* as first arg
-dnl #
-AC_DEFUN([ZFS_AC_KERNEL_SRC_BLOCK_DEVICE_OPERATIONS_GETGEO_GENDISK], [
-	ZFS_LINUX_TEST_SRC([block_device_operations_getgeo_gendisk], [
-		#include <linux/blkdev.h>
-
-		static int blk_getgeo(struct gendisk *disk, struct hd_geometry *geo)
-		{
-			(void) disk, (void) geo;
-			return (0);
-		}
-
-		static const struct block_device_operations
-		    bops __attribute__ ((unused)) = {
-			.getgeo	= blk_getgeo,
-		};
-	], [], [])
-])
-
-AC_DEFUN([ZFS_AC_KERNEL_BLOCK_DEVICE_OPERATIONS_GETGEO_GENDISK], [
-	AC_MSG_CHECKING([whether bops->getgeo() takes gendisk as first arg])
-	ZFS_LINUX_TEST_RESULT([block_device_operations_getgeo_gendisk], [
-		AC_MSG_RESULT(yes)
-		AC_DEFINE([HAVE_BLOCK_DEVICE_OPERATIONS_GETGEO_GENDISK], [1],
-			[Define if getgeo() in block_device_operations takes struct gendisk * as its first arg])
-	],[
-		AC_MSG_RESULT(no)
-	])
-])
-
 AC_DEFUN([ZFS_AC_KERNEL_SRC_BLOCK_DEVICE_OPERATIONS], [
 	ZFS_AC_KERNEL_SRC_BLOCK_DEVICE_OPERATIONS_CHECK_EVENTS
 	ZFS_AC_KERNEL_SRC_BLOCK_DEVICE_OPERATIONS_RELEASE_VOID
 	ZFS_AC_KERNEL_SRC_BLOCK_DEVICE_OPERATIONS_RELEASE_1ARG
 	ZFS_AC_KERNEL_SRC_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK
-	ZFS_AC_KERNEL_SRC_BLOCK_DEVICE_OPERATIONS_GETGEO_GENDISK
 ])

 AC_DEFUN([ZFS_AC_KERNEL_BLOCK_DEVICE_OPERATIONS], [
 	ZFS_AC_KERNEL_BLOCK_DEVICE_OPERATIONS_CHECK_EVENTS
 	ZFS_AC_KERNEL_BLOCK_DEVICE_OPERATIONS_RELEASE_VOID
 	ZFS_AC_KERNEL_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK
-	ZFS_AC_KERNEL_BLOCK_DEVICE_OPERATIONS_GETGEO_GENDISK
 ])
--- a/config/kernel-dentry-operations.m4
+++ b/config/kernel-dentry-operations.m4
@ -24,9 +24,6 @@ dnl #
 dnl # 2.6.38 API change
 dnl # Added d_set_d_op() helper function.
 dnl #
-dnl # 6.17 API change
-dnl # d_set_d_op() removed. No direct replacement.
-dnl #
 AC_DEFUN([ZFS_AC_KERNEL_SRC_D_SET_D_OP], [
 	ZFS_LINUX_TEST_SRC([d_set_d_op], [
 		#include <linux/dcache.h>
@ -37,46 +34,22 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_D_SET_D_OP], [

 AC_DEFUN([ZFS_AC_KERNEL_D_SET_D_OP], [
 	AC_MSG_CHECKING([whether d_set_d_op() is available])
-	ZFS_LINUX_TEST_RESULT([d_set_d_op], [
+	ZFS_LINUX_TEST_RESULT_SYMBOL([d_set_d_op],
+	    [d_set_d_op], [fs/dcache.c], [
 		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_D_SET_D_OP, 1,
-		    [Define if d_set_d_op() is available])
 	], [
-		AC_MSG_RESULT(no)
-	])
-])
-
-dnl #
-dnl # 6.17 API change
-dnl # sb->s_d_op removed; set_default_d_op(sb, dop) added
-dnl #
-AC_DEFUN([ZFS_AC_KERNEL_SRC_SET_DEFAULT_D_OP], [
-	ZFS_LINUX_TEST_SRC([set_default_d_op], [
-		#include <linux/dcache.h>
-	], [
-		set_default_d_op(NULL, NULL);
-	])
-])
-
-AC_DEFUN([ZFS_AC_KERNEL_SET_DEFAULT_D_OP], [
-	AC_MSG_CHECKING([whether set_default_d_op() is available])
-	ZFS_LINUX_TEST_RESULT([set_default_d_op], [
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_SET_DEFAULT_D_OP, 1,
-		    [Define if set_default_d_op() is available])
-	], [
-		AC_MSG_RESULT(no)
+		ZFS_LINUX_TEST_ERROR([d_set_d_op])
 	])
 ])

 AC_DEFUN([ZFS_AC_KERNEL_SRC_DENTRY], [
        ZFS_AC_KERNEL_SRC_D_OBTAIN_ALIAS
        ZFS_AC_KERNEL_SRC_D_SET_D_OP
-        ZFS_AC_KERNEL_SRC_SET_DEFAULT_D_OP
+        ZFS_AC_KERNEL_SRC_S_D_OP
 ])

 AC_DEFUN([ZFS_AC_KERNEL_DENTRY], [
        ZFS_AC_KERNEL_D_OBTAIN_ALIAS
        ZFS_AC_KERNEL_D_SET_D_OP
-        ZFS_AC_KERNEL_SET_DEFAULT_D_OP
+        ZFS_AC_KERNEL_S_D_OP
 ])
--- a/config/kernel-drop-inode.m4
+++ b/config/kernel-drop-inode.m4
@ -1,24 +0,0 @@
-dnl #
-dnl # 6.18 API change
-dnl # - generic_drop_inode() renamed to inode_generic_drop()
-dnl # - generic_delete_inode() renamed to inode_just_drop()
-dnl #
-AC_DEFUN([ZFS_AC_KERNEL_SRC_INODE_GENERIC_DROP], [
-	ZFS_LINUX_TEST_SRC([inode_generic_drop], [
-		#include <linux/fs.h>
-	],[
-		struct inode *ip = NULL;
-		inode_generic_drop(ip);
-	])
-])
-
-AC_DEFUN([ZFS_AC_KERNEL_INODE_GENERIC_DROP], [
-	AC_MSG_CHECKING([whether inode_generic_drop() exists])
-	ZFS_LINUX_TEST_RESULT([inode_generic_drop], [
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_INODE_GENERIC_DROP, 1,
-			[inode_generic_drop() exists])
-	],[
-		AC_MSG_RESULT(no)
-	])
-])
--- a/config/kernel-free-inode.m4
+++ b/config/kernel-free-inode.m4
@ -1,24 +0,0 @@
-dnl #
-dnl # Linux 5.2 API change
-dnl #
-AC_DEFUN([ZFS_AC_KERNEL_SRC_SOPS_FREE_INODE], [
-	ZFS_LINUX_TEST_SRC([super_operations_free_inode], [
-		#include <linux/fs.h>
-
-		static void free_inode(struct inode *) { }
-
-		static struct super_operations sops __attribute__ ((unused)) = {
-			.free_inode = free_inode,
-		};
-	],[])
-])
-
-AC_DEFUN([ZFS_AC_KERNEL_SOPS_FREE_INODE], [
-	AC_MSG_CHECKING([whether sops->free_inode() exists])
-	ZFS_LINUX_TEST_RESULT([super_operations_free_inode], [
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_SOPS_FREE_INODE, 1, [sops->free_inode() exists])
-	],[
-		AC_MSG_RESULT(no)
-	])
-])
--- a/config/kernel-kasan-enabled.m4
+++ b/config/kernel-kasan-enabled.m4
@ -1,23 +0,0 @@
-dnl #
-dnl # 6.18: some architectures and config option causes the kasan_ inline
-dnl #       functions to reference the GPL-only symbol 'kasan_flag_enabled',
-dnl #       breaking the build. Detect this and work
-dnl #       around it.
-AC_DEFUN([ZFS_AC_KERNEL_SRC_KASAN_ENABLED], [
-	ZFS_LINUX_TEST_SRC([kasan_enabled], [
-		#include <linux/kasan.h>
-	], [
-		kasan_enabled();
-	], [], [ZFS_META_LICENSE])
-])
-AC_DEFUN([ZFS_AC_KERNEL_KASAN_ENABLED], [
-	AC_MSG_CHECKING([whether kasan_enabled() is GPL-only])
-	ZFS_LINUX_TEST_RESULT([kasan_enabled_license], [
-		AC_MSG_RESULT(no)
-	], [
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_KASAN_ENABLED_GPL_ONLY, 1,
-		    [kasan_enabled() is GPL-only])
-	])
-])
-
--- a/config/kernel-kmap-atomic-args.m4
+++ b/config/kernel-kmap-atomic-args.m4
@ -7,7 +7,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_KMAP_ATOMIC_ARGS], [
 	ZFS_LINUX_TEST_SRC([kmap_atomic], [
 		#include <linux/pagemap.h>
 	],[
-		struct page page = {};
+		struct page page;
 		kmap_atomic(&page);
 	])
 ])
--- a/config/kernel-mkdir.m4
+++ b/config/kernel-mkdir.m4
@ -84,8 +84,6 @@ AC_DEFUN([ZFS_AC_KERNEL_MKDIR], [
 		AC_DEFINE(HAVE_IOPS_MKDIR_DENTRY, 1,
 		    [iops->mkdir() returns struct dentry*])
 	],[
-		AC_MSG_RESULT(no)
-
 		dnl #
 		dnl # 6.3 API change
 		dnl # mkdir() takes struct mnt_idmap * as the first arg
--- a/config/kernel-namespace.m4
+++ b/config/kernel-namespace.m4
@ -1,31 +0,0 @@
-dnl #
-dnl # 6.18 API change
-dnl # ns->ops->type was moved to ns->ns.ns_type (struct ns_common)
-dnl #
-AC_DEFUN([ZFS_AC_KERNEL_SRC_NS_COMMON_TYPE], [
-	ZFS_LINUX_TEST_SRC([ns_common_type], [
-		#include <linux/user_namespace.h>
-	],[
-		struct user_namespace ns;
-		ns.ns.ns_type = 0;
-	])
-])
-
-AC_DEFUN([ZFS_AC_KERNEL_NS_COMMON_TYPE], [
-	AC_MSG_CHECKING([whether ns_type is accessible through ns_common])
-	ZFS_LINUX_TEST_RESULT([ns_common_type], [
-		AC_MSG_RESULT(yes)
-		AC_DEFINE([HAVE_NS_COMMON_TYPE], 1,
-			[Define if ns_type is accessible through ns_common])
-	],[
-		AC_MSG_RESULT(no)
-	])
-])
-
-AC_DEFUN([ZFS_AC_KERNEL_SRC_NAMESPACE], [
-	ZFS_AC_KERNEL_SRC_NS_COMMON_TYPE
-])
-
-AC_DEFUN([ZFS_AC_KERNEL_NAMESPACE], [
-	ZFS_AC_KERNEL_NS_COMMON_TYPE
-])
--- a/config/kernel-userns-capabilities.m4
+++ b/config/kernel-userns-capabilities.m4
@ -0,0 +1,79 @@
+dnl #
+dnl # 2.6.38 API change
+dnl # ns_capable() was introduced
+dnl #
+AC_DEFUN([ZFS_AC_KERNEL_SRC_NS_CAPABLE], [
+	ZFS_LINUX_TEST_SRC([ns_capable], [
+		#include <linux/capability.h>
+	],[
+		ns_capable((struct user_namespace *)NULL, CAP_SYS_ADMIN);
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_NS_CAPABLE], [
+	AC_MSG_CHECKING([whether ns_capable exists])
+	ZFS_LINUX_TEST_RESULT([ns_capable], [
+		AC_MSG_RESULT(yes)
+	],[
+		ZFS_LINUX_TEST_ERROR([ns_capable()])
+	])
+])
+
+dnl #
+dnl # 2.6.39 API change
+dnl # struct user_namespace was added to struct cred_t as cred->user_ns member
+dnl #
+AC_DEFUN([ZFS_AC_KERNEL_SRC_CRED_USER_NS], [
+	ZFS_LINUX_TEST_SRC([cred_user_ns], [
+		#include <linux/cred.h>
+	],[
+		struct cred cr;
+		cr.user_ns = (struct user_namespace *)NULL;
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_CRED_USER_NS], [
+	AC_MSG_CHECKING([whether cred_t->user_ns exists])
+	ZFS_LINUX_TEST_RESULT([cred_user_ns], [
+		AC_MSG_RESULT(yes)
+	],[
+		ZFS_LINUX_TEST_ERROR([cred_t->user_ns()])
+	])
+])
+
+dnl #
+dnl # 3.4 API change
+dnl # kuid_has_mapping() and kgid_has_mapping() were added to distinguish
+dnl # between internal kernel uids/gids and user namespace uids/gids.
+dnl #
+AC_DEFUN([ZFS_AC_KERNEL_SRC_KUID_HAS_MAPPING], [
+	ZFS_LINUX_TEST_SRC([kuid_has_mapping], [
+		#include <linux/uidgid.h>
+	],[
+		kuid_has_mapping((struct user_namespace *)NULL, KUIDT_INIT(0));
+		kgid_has_mapping((struct user_namespace *)NULL, KGIDT_INIT(0));
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_KUID_HAS_MAPPING], [
+	AC_MSG_CHECKING([whether kuid_has_mapping/kgid_has_mapping exist])
+	ZFS_LINUX_TEST_RESULT([kuid_has_mapping], [
+		AC_MSG_RESULT(yes)
+	],[
+		ZFS_LINUX_TEST_ERROR([kuid_has_mapping()])
+	])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_SRC_USERNS_CAPABILITIES], [
+	ZFS_AC_KERNEL_SRC_NS_CAPABLE
+	ZFS_AC_KERNEL_SRC_HAS_CAPABILITY
+	ZFS_AC_KERNEL_SRC_CRED_USER_NS
+	ZFS_AC_KERNEL_SRC_KUID_HAS_MAPPING
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_USERNS_CAPABILITIES], [
+	ZFS_AC_KERNEL_NS_CAPABLE
+	ZFS_AC_KERNEL_HAS_CAPABILITY
+	ZFS_AC_KERNEL_CRED_USER_NS
+	ZFS_AC_KERNEL_KUID_HAS_MAPPING
+])
--- a/config/kernel-writeback.m4
+++ b/config/kernel-writeback.m4
@ -1,58 +0,0 @@
-AC_DEFUN([ZFS_AC_KERNEL_SRC_WRITEPAGE_T], [
-	dnl #
-	dnl # 6.3 API change
-	dnl # The writepage_t function type now has its first argument as
-	dnl # struct folio* instead of struct page*
-	dnl #
-	ZFS_LINUX_TEST_SRC([writepage_t_folio], [
-		#include <linux/writeback.h>
-		static int putpage(struct folio *folio,
-		    struct writeback_control *wbc, void *data)
-		{ return 0; }
-		writepage_t func = putpage;
-	],[])
-])
-
-AC_DEFUN([ZFS_AC_KERNEL_WRITEPAGE_T], [
-	AC_MSG_CHECKING([whether int (*writepage_t)() takes struct folio*])
-	ZFS_LINUX_TEST_RESULT([writepage_t_folio], [
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_WRITEPAGE_T_FOLIO, 1,
-		   [int (*writepage_t)() takes struct folio*])
-	],[
-		AC_MSG_RESULT(no)
-	])
-])
-
-AC_DEFUN([ZFS_AC_KERNEL_SRC_WRITE_CACHE_PAGES], [
-	dnl #
-	dnl # 6.18 API change
-	dnl # write_cache_pages() has been removed.
-	dnl #
-	ZFS_LINUX_TEST_SRC([write_cache_pages], [
-		#include <linux/writeback.h>
-	], [
-		(void) write_cache_pages(NULL, NULL, NULL, NULL);
-	])
-])
-
-AC_DEFUN([ZFS_AC_KERNEL_WRITE_CACHE_PAGES], [
-	AC_MSG_CHECKING([whether write_cache_pages() is available])
-	ZFS_LINUX_TEST_RESULT([write_cache_pages], [
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_WRITE_CACHE_PAGES, 1,
-		    [write_cache_pages() is available])
-	],[
-		AC_MSG_RESULT(no)
-	])
-])
-
-AC_DEFUN([ZFS_AC_KERNEL_SRC_WRITEBACK], [
-	ZFS_AC_KERNEL_SRC_WRITEPAGE_T
-	ZFS_AC_KERNEL_SRC_WRITE_CACHE_PAGES
-])
-
-AC_DEFUN([ZFS_AC_KERNEL_WRITEBACK], [
-	ZFS_AC_KERNEL_WRITEPAGE_T
-	ZFS_AC_KERNEL_WRITE_CACHE_PAGES
-])
--- a/config/kernel-writepage_t.m4
+++ b/config/kernel-writepage_t.m4
@ -0,0 +1,26 @@
+AC_DEFUN([ZFS_AC_KERNEL_SRC_WRITEPAGE_T], [
+	dnl #
+	dnl # 6.3 API change
+	dnl # The writepage_t function type now has its first argument as
+	dnl # struct folio* instead of struct page*
+	dnl #
+	ZFS_LINUX_TEST_SRC([writepage_t_folio], [
+		#include <linux/writeback.h>
+		static int putpage(struct folio *folio,
+		    struct writeback_control *wbc, void *data)
+		{ return 0; }
+		writepage_t func = putpage;
+	],[])
+])
+
+AC_DEFUN([ZFS_AC_KERNEL_WRITEPAGE_T], [
+	AC_MSG_CHECKING([whether int (*writepage_t)() takes struct folio*])
+	ZFS_LINUX_TEST_RESULT([writepage_t_folio], [
+		AC_MSG_RESULT(yes)
+		AC_DEFINE(HAVE_WRITEPAGE_T_FOLIO, 1,
+		   [int (*writepage_t)() takes struct folio*])
+	],[
+		AC_MSG_RESULT(no)
+	])
+])
+
--- a/config/kernel.m4
+++ b/config/kernel.m4
@ -70,7 +70,6 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_SRC], [
 	ZFS_AC_KERNEL_SRC_COMMIT_METADATA
 	ZFS_AC_KERNEL_SRC_SETATTR_PREPARE
 	ZFS_AC_KERNEL_SRC_INSERT_INODE_LOCKED
-	ZFS_AC_KERNEL_SRC_DENTRY
 	ZFS_AC_KERNEL_SRC_TRUNCATE_SETSIZE
 	ZFS_AC_KERNEL_SRC_SECURITY_INODE
 	ZFS_AC_KERNEL_SRC_FST_MOUNT
@ -121,7 +120,7 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_SRC], [
 	ZFS_AC_KERNEL_SRC_IDMAP_MNT_API
 	ZFS_AC_KERNEL_SRC_IDMAP_NO_USERNS
 	ZFS_AC_KERNEL_SRC_IATTR_VFSID
-	ZFS_AC_KERNEL_SRC_WRITEBACK
+	ZFS_AC_KERNEL_SRC_WRITEPAGE_T
 	ZFS_AC_KERNEL_SRC_RECLAIMED
 	ZFS_AC_KERNEL_SRC_REGISTER_SYSCTL_TABLE
 	ZFS_AC_KERNEL_SRC_REGISTER_SYSCTL_SZ
@ -135,10 +134,6 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_SRC], [
 	ZFS_AC_KERNEL_SRC_PIN_USER_PAGES
 	ZFS_AC_KERNEL_SRC_TIMER
 	ZFS_AC_KERNEL_SRC_SUPER_BLOCK_S_WB_ERR
-	ZFS_AC_KERNEL_SRC_SOPS_FREE_INODE
-	ZFS_AC_KERNEL_SRC_NAMESPACE
-	ZFS_AC_KERNEL_SRC_INODE_GENERIC_DROP
-	ZFS_AC_KERNEL_SRC_KASAN_ENABLED
 	case "$host_cpu" in
 		powerpc*)
 			ZFS_AC_KERNEL_SRC_CPU_HAS_FEATURE
@ -192,7 +187,6 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_RESULT], [
 	ZFS_AC_KERNEL_COMMIT_METADATA
 	ZFS_AC_KERNEL_SETATTR_PREPARE
 	ZFS_AC_KERNEL_INSERT_INODE_LOCKED
-	ZFS_AC_KERNEL_DENTRY
 	ZFS_AC_KERNEL_TRUNCATE_SETSIZE
 	ZFS_AC_KERNEL_SECURITY_INODE
 	ZFS_AC_KERNEL_FST_MOUNT
@ -243,7 +237,7 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_RESULT], [
 	ZFS_AC_KERNEL_IDMAP_MNT_API
 	ZFS_AC_KERNEL_IDMAP_NO_USERNS
 	ZFS_AC_KERNEL_IATTR_VFSID
-	ZFS_AC_KERNEL_WRITEBACK
+	ZFS_AC_KERNEL_WRITEPAGE_T
 	ZFS_AC_KERNEL_RECLAIMED
 	ZFS_AC_KERNEL_REGISTER_SYSCTL_TABLE
 	ZFS_AC_KERNEL_REGISTER_SYSCTL_SZ
@ -258,10 +252,6 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_RESULT], [
 	ZFS_AC_KERNEL_PIN_USER_PAGES
 	ZFS_AC_KERNEL_TIMER
 	ZFS_AC_KERNEL_SUPER_BLOCK_S_WB_ERR
-	ZFS_AC_KERNEL_SOPS_FREE_INODE
-	ZFS_AC_KERNEL_NAMESPACE
-	ZFS_AC_KERNEL_INODE_GENERIC_DROP
-	ZFS_AC_KERNEL_KASAN_ENABLED
 	case "$host_cpu" in
 		powerpc*)
 			ZFS_AC_KERNEL_CPU_HAS_FEATURE
--- a/config/toolchain-simd.m4
+++ b/config/toolchain-simd.m4
@ -24,8 +24,6 @@ AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_TOOLCHAIN_SIMD], [
 			ZFS_AC_CONFIG_TOOLCHAIN_CAN_BUILD_AES
 			ZFS_AC_CONFIG_TOOLCHAIN_CAN_BUILD_PCLMULQDQ
 			ZFS_AC_CONFIG_TOOLCHAIN_CAN_BUILD_MOVBE
-			ZFS_AC_CONFIG_TOOLCHAIN_CAN_BUILD_VAES
-			ZFS_AC_CONFIG_TOOLCHAIN_CAN_BUILD_VPCLMULQDQ
 			ZFS_AC_CONFIG_TOOLCHAIN_CAN_BUILD_XSAVE
 			ZFS_AC_CONFIG_TOOLCHAIN_CAN_BUILD_XSAVEOPT
 			ZFS_AC_CONFIG_TOOLCHAIN_CAN_BUILD_XSAVES
@ -40,10 +38,9 @@ AC_DEFUN([ZFS_AC_CONFIG_TOOLCHAIN_CAN_BUILD_SSE], [
 	AC_MSG_CHECKING([whether host toolchain supports SSE])

 	AC_LINK_IFELSE([AC_LANG_SOURCE([[
-		int main()
+		void main()
 		{
 			__asm__ __volatile__("xorps %xmm0, %xmm1");
-			return (0);
 		}
 	]])], [
 		AC_DEFINE([HAVE_SSE], 1, [Define if host toolchain supports SSE])
@ -60,10 +57,9 @@ AC_DEFUN([ZFS_AC_CONFIG_TOOLCHAIN_CAN_BUILD_SSE2], [
 	AC_MSG_CHECKING([whether host toolchain supports SSE2])

 	AC_LINK_IFELSE([AC_LANG_SOURCE([[
-		int main()
+		void main()
 		{
 			__asm__ __volatile__("pxor %xmm0, %xmm1");
-			return (0);
 		}
 	]])], [
 		AC_DEFINE([HAVE_SSE2], 1, [Define if host toolchain supports SSE2])
@ -80,11 +76,10 @@ AC_DEFUN([ZFS_AC_CONFIG_TOOLCHAIN_CAN_BUILD_SSE3], [
 	AC_MSG_CHECKING([whether host toolchain supports SSE3])

 	AC_LINK_IFELSE([AC_LANG_SOURCE([[
-		int main()
+		void main()
 		{
 			char v[16];
 			__asm__ __volatile__("lddqu %0,%%xmm0" :: "m"(v[0]));
-			return (0);
 		}
 	]])], [
 		AC_DEFINE([HAVE_SSE3], 1, [Define if host toolchain supports SSE3])
@ -101,10 +96,9 @@ AC_DEFUN([ZFS_AC_CONFIG_TOOLCHAIN_CAN_BUILD_SSSE3], [
 	AC_MSG_CHECKING([whether host toolchain supports SSSE3])

 	AC_LINK_IFELSE([AC_LANG_SOURCE([[
-		int main()
+		void main()
 		{
 			__asm__ __volatile__("pshufb %xmm0,%xmm1");
-			return (0);
 		}
 	]])], [
 		AC_DEFINE([HAVE_SSSE3], 1, [Define if host toolchain supports SSSE3])
@ -121,10 +115,9 @@ AC_DEFUN([ZFS_AC_CONFIG_TOOLCHAIN_CAN_BUILD_SSE4_1], [
 	AC_MSG_CHECKING([whether host toolchain supports SSE4.1])

 	AC_LINK_IFELSE([AC_LANG_SOURCE([[
-		int main()
+		void main()
 		{
 			__asm__ __volatile__("pmaxsb %xmm0,%xmm1");
-			return (0);
 		}
 	]])], [
 		AC_DEFINE([HAVE_SSE4_1], 1, [Define if host toolchain supports SSE4.1])
@ -141,10 +134,9 @@ AC_DEFUN([ZFS_AC_CONFIG_TOOLCHAIN_CAN_BUILD_SSE4_2], [
 	AC_MSG_CHECKING([whether host toolchain supports SSE4.2])

 	AC_LINK_IFELSE([AC_LANG_SOURCE([[
-		int main()
+		void main()
 		{
 			__asm__ __volatile__("pcmpgtq %xmm0, %xmm1");
-			return (0);
 		}
 	]])], [
 		AC_DEFINE([HAVE_SSE4_2], 1, [Define if host toolchain supports SSE4.2])
@ -161,11 +153,10 @@ AC_DEFUN([ZFS_AC_CONFIG_TOOLCHAIN_CAN_BUILD_AVX], [
 	AC_MSG_CHECKING([whether host toolchain supports AVX])

 	AC_LINK_IFELSE([AC_LANG_SOURCE([[
-		int main()
+		void main()
 		{
 			char v[32];
 			__asm__ __volatile__("vmovdqa %0,%%ymm0" :: "m"(v[0]));
-			return (0);
 		}
 	]])], [
 		AC_MSG_RESULT([yes])
@ -183,10 +174,9 @@ AC_DEFUN([ZFS_AC_CONFIG_TOOLCHAIN_CAN_BUILD_AVX2], [

 	AC_LINK_IFELSE([AC_LANG_SOURCE([
 	[
-		int main()
+		void main()
 		{
 			__asm__ __volatile__("vpshufb %ymm0,%ymm1,%ymm2");
-			return (0);
 		}
 	]])], [
 		AC_MSG_RESULT([yes])
@ -204,10 +194,9 @@ AC_DEFUN([ZFS_AC_CONFIG_TOOLCHAIN_CAN_BUILD_AVX512F], [

 	AC_LINK_IFELSE([AC_LANG_SOURCE([
 	[
-		int main()
+		void main()
 		{
 			__asm__ __volatile__("vpandd %zmm0,%zmm1,%zmm2");
-			return (0);
 		}
 	]])], [
 		AC_MSG_RESULT([yes])
@ -225,10 +214,9 @@ AC_DEFUN([ZFS_AC_CONFIG_TOOLCHAIN_CAN_BUILD_AVX512CD], [

 	AC_LINK_IFELSE([AC_LANG_SOURCE([
 	[
-		int main()
+		void main()
 		{
 			__asm__ __volatile__("vplzcntd %zmm0,%zmm1");
-			return (0);
 		}
 	]])], [
 		AC_MSG_RESULT([yes])
@ -246,10 +234,9 @@ AC_DEFUN([ZFS_AC_CONFIG_TOOLCHAIN_CAN_BUILD_AVX512DQ], [

 	AC_LINK_IFELSE([AC_LANG_SOURCE([
 	[
-		int main()
+		void main()
 		{
 			__asm__ __volatile__("vandpd %zmm0,%zmm1,%zmm2");
-			return (0);
 		}
 	]])], [
 		AC_MSG_RESULT([yes])
@ -267,10 +254,9 @@ AC_DEFUN([ZFS_AC_CONFIG_TOOLCHAIN_CAN_BUILD_AVX512BW], [

 	AC_LINK_IFELSE([AC_LANG_SOURCE([
 	[
-		int main()
+		void main()
 		{
 			__asm__ __volatile__("vpshufb %zmm0,%zmm1,%zmm2");
-			return (0);
 		}
 	]])], [
 		AC_MSG_RESULT([yes])
@ -288,10 +274,9 @@ AC_DEFUN([ZFS_AC_CONFIG_TOOLCHAIN_CAN_BUILD_AVX512IFMA], [

 	AC_LINK_IFELSE([AC_LANG_SOURCE([
 	[
-		int main()
+		void main()
 		{
 			__asm__ __volatile__("vpmadd52luq %zmm0,%zmm1,%zmm2");
-			return (0);
 		}
 	]])], [
 		AC_MSG_RESULT([yes])
@ -309,10 +294,9 @@ AC_DEFUN([ZFS_AC_CONFIG_TOOLCHAIN_CAN_BUILD_AVX512VBMI], [

 	AC_LINK_IFELSE([AC_LANG_SOURCE([
 	[
-		int main()
+		void main()
 		{
 			__asm__ __volatile__("vpermb %zmm0,%zmm1,%zmm2");
-			return (0);
 		}
 	]])], [
 		AC_MSG_RESULT([yes])
@ -330,10 +314,9 @@ AC_DEFUN([ZFS_AC_CONFIG_TOOLCHAIN_CAN_BUILD_AVX512PF], [

 	AC_LINK_IFELSE([AC_LANG_SOURCE([
 	[
-		int main()
+		void main()
 		{
 			__asm__ __volatile__("vgatherpf0dps (%rsi,%zmm0,4){%k1}");
-			return (0);
 		}
 	]])], [
 		AC_MSG_RESULT([yes])
@ -351,10 +334,9 @@ AC_DEFUN([ZFS_AC_CONFIG_TOOLCHAIN_CAN_BUILD_AVX512ER], [

 	AC_LINK_IFELSE([AC_LANG_SOURCE([
 	[
-		int main()
+		void main()
 		{
 			__asm__ __volatile__("vexp2pd %zmm0,%zmm1");
-			return (0);
 		}
 	]])], [
 		AC_MSG_RESULT([yes])
@ -372,10 +354,9 @@ AC_DEFUN([ZFS_AC_CONFIG_TOOLCHAIN_CAN_BUILD_AVX512VL], [

 	AC_LINK_IFELSE([AC_LANG_SOURCE([
 	[
-		int main()
+		void main()
 		{
 			__asm__ __volatile__("vpabsq %zmm0,%zmm1");
-			return (0);
 		}
 	]])], [
 		AC_MSG_RESULT([yes])
@ -393,10 +374,9 @@ AC_DEFUN([ZFS_AC_CONFIG_TOOLCHAIN_CAN_BUILD_AES], [

 	AC_LINK_IFELSE([AC_LANG_SOURCE([
 	[
-		int main()
+		void main()
 		{
 			__asm__ __volatile__("aesenc %xmm0, %xmm1");
-			return (0);
 		}
 	]])], [
 		AC_MSG_RESULT([yes])
@ -414,10 +394,9 @@ AC_DEFUN([ZFS_AC_CONFIG_TOOLCHAIN_CAN_BUILD_PCLMULQDQ], [

 	AC_LINK_IFELSE([AC_LANG_SOURCE([
 	[
-		int main()
+		void main()
 		{
 			__asm__ __volatile__("pclmulqdq %0, %%xmm0, %%xmm1" :: "i"(0));
-			return (0);
 		}
 	]])], [
 		AC_MSG_RESULT([yes])
@ -435,10 +414,9 @@ AC_DEFUN([ZFS_AC_CONFIG_TOOLCHAIN_CAN_BUILD_MOVBE], [

 	AC_LINK_IFELSE([AC_LANG_SOURCE([
 	[
-		int main()
+		void main()
 		{
 			__asm__ __volatile__("movbe 0(%eax), %eax");
-			return (0);
 		}
 	]])], [
 		AC_MSG_RESULT([yes])
@ -448,48 +426,6 @@ AC_DEFUN([ZFS_AC_CONFIG_TOOLCHAIN_CAN_BUILD_MOVBE], [
 	])
 ])

-dnl #
-dnl # ZFS_AC_CONFIG_TOOLCHAIN_CAN_BUILD_VAES
-dnl #
-AC_DEFUN([ZFS_AC_CONFIG_TOOLCHAIN_CAN_BUILD_VAES], [
-	AC_MSG_CHECKING([whether host toolchain supports VAES])
-
-	AC_LINK_IFELSE([AC_LANG_SOURCE([
-	[
-		int main()
-		{
-			__asm__ __volatile__("vaesenc %ymm0, %ymm1, %ymm0");
-			return (0);
-		}
-	]])], [
-		AC_MSG_RESULT([yes])
-		AC_DEFINE([HAVE_VAES], 1, [Define if host toolchain supports VAES])
-	], [
-		AC_MSG_RESULT([no])
-	])
-])
-
-dnl #
-dnl # ZFS_AC_CONFIG_TOOLCHAIN_CAN_BUILD_VPCLMULQDQ
-dnl #
-AC_DEFUN([ZFS_AC_CONFIG_TOOLCHAIN_CAN_BUILD_VPCLMULQDQ], [
-	AC_MSG_CHECKING([whether host toolchain supports VPCLMULQDQ])
-
-	AC_LINK_IFELSE([AC_LANG_SOURCE([
-	[
-		int main()
-		{
-			__asm__ __volatile__("vpclmulqdq %0, %%ymm4, %%ymm3, %%ymm5" :: "i"(0));
-			return (0);
-		}
-	]])], [
-		AC_MSG_RESULT([yes])
-		AC_DEFINE([HAVE_VPCLMULQDQ], 1, [Define if host toolchain supports VPCLMULQDQ])
-	], [
-		AC_MSG_RESULT([no])
-	])
-])
-
 dnl #
 dnl # ZFS_AC_CONFIG_TOOLCHAIN_CAN_BUILD_XSAVE
 dnl #
@ -498,11 +434,10 @@ AC_DEFUN([ZFS_AC_CONFIG_TOOLCHAIN_CAN_BUILD_XSAVE], [

 	AC_LINK_IFELSE([AC_LANG_SOURCE([
 	[
-		int main()
+		void main()
 		{
 		  char b[4096] __attribute__ ((aligned (64)));
 		  __asm__ __volatile__("xsave %[b]\n" : : [b] "m" (*b) : "memory");
-		  return (0);
 		}
 	]])], [
 		AC_MSG_RESULT([yes])
@ -520,11 +455,10 @@ AC_DEFUN([ZFS_AC_CONFIG_TOOLCHAIN_CAN_BUILD_XSAVEOPT], [

 	AC_LINK_IFELSE([AC_LANG_SOURCE([
 	[
-		int main()
+		void main()
 		{
 		  char b[4096] __attribute__ ((aligned (64)));
 		  __asm__ __volatile__("xsaveopt %[b]\n" : : [b] "m" (*b) : "memory");
-		  return (0);
 		}
 	]])], [
 		AC_MSG_RESULT([yes])
@ -542,11 +476,10 @@ AC_DEFUN([ZFS_AC_CONFIG_TOOLCHAIN_CAN_BUILD_XSAVES], [

 	AC_LINK_IFELSE([AC_LANG_SOURCE([
 	[
-		int main()
+		void main()
 		{
 		  char b[4096] __attribute__ ((aligned (64)));
 		  __asm__ __volatile__("xsaves %[b]\n" : : [b] "m" (*b) : "memory");
-		  return (0);
 		}
 	]])], [
 		AC_MSG_RESULT([yes])
--- a/config/user-statx.m4
+++ b/config/user-statx.m4
@ -1,34 +0,0 @@
-dnl #
-dnl # Check for statx() function and STATX_MNT_ID availability
-dnl #
-AC_DEFUN([ZFS_AC_CONFIG_USER_STATX], [
-	AC_CHECK_HEADERS([sys/stat.h],
-		[have_stat_headers=yes],
-		[have_stat_headers=no])
-
-	AS_IF([test "x$have_stat_headers" = "xyes"], [
-		AC_CHECK_FUNC([statx], [
-			AC_DEFINE([HAVE_STATX], [1], [statx() is available])
-
-			dnl Check for STATX_MNT_ID availability
-			AC_MSG_CHECKING([for STATX_MNT_ID])
-			AC_COMPILE_IFELSE([
-				AC_LANG_PROGRAM([[
-					#include <sys/stat.h>
-				]], [[
-					struct statx stx;
-					int mask = STATX_MNT_ID;
-					(void)mask;
-					(void)stx.stx_mnt_id;
-				]])
-			], [
-				AC_MSG_RESULT([yes])
-				AC_DEFINE([HAVE_STATX_MNT_ID], [1], [STATX_MNT_ID is available])
-			], [
-				AC_MSG_RESULT([no])
-			])
-		])
-	], [
-		AC_MSG_WARN([sys/stat.h not found; skipping statx support])
-	])
-])  dnl end AC_DEFUN
--- a/config/user.m4
+++ b/config/user.m4
@ -17,7 +17,6 @@ AC_DEFUN([ZFS_AC_CONFIG_USER], [
 		ZFS_AC_CONFIG_USER_LIBUDEV
 		ZFS_AC_CONFIG_USER_LIBUUID
 		ZFS_AC_CONFIG_USER_LIBBLKID
-		ZFS_AC_CONFIG_USER_STATX
 	])
 	ZFS_AC_CONFIG_USER_LIBTIRPC
 	ZFS_AC_CONFIG_USER_LIBCRYPTO
--- a/config/zfs-build.m4
+++ b/config/zfs-build.m4
@ -252,12 +252,10 @@ AC_DEFUN([ZFS_AC_CONFIG_ALWAYS], [
 	ZFS_AC_CONFIG_ALWAYS_CC_NO_CLOBBERED
 	ZFS_AC_CONFIG_ALWAYS_CC_INFINITE_RECURSION
 	ZFS_AC_CONFIG_ALWAYS_KERNEL_CC_INFINITE_RECURSION
-	ZFS_AC_CONFIG_ALWAYS_CC_NO_ATOMIC_ALIGNMENT
 	ZFS_AC_CONFIG_ALWAYS_CC_IMPLICIT_FALLTHROUGH
 	ZFS_AC_CONFIG_ALWAYS_CC_FRAME_LARGER_THAN
 	ZFS_AC_CONFIG_ALWAYS_CC_NO_FORMAT_TRUNCATION
 	ZFS_AC_CONFIG_ALWAYS_CC_NO_FORMAT_ZERO_LENGTH
-	ZFS_AC_CONFIG_ALWAYS_KERNEL_CC_NO_FORMAT_ZERO_LENGTH
 	ZFS_AC_CONFIG_ALWAYS_CC_FORMAT_OVERFLOW
 	ZFS_AC_CONFIG_ALWAYS_CC_NO_OMIT_FRAME_POINTER
 	ZFS_AC_CONFIG_ALWAYS_CC_NO_IPA_SRA
@ -267,7 +265,6 @@ AC_DEFUN([ZFS_AC_CONFIG_ALWAYS], [
 	ZFS_AC_CONFIG_ALWAYS_TOOLCHAIN_SIMD
 	ZFS_AC_CONFIG_ALWAYS_SYSTEM
 	ZFS_AC_CONFIG_ALWAYS_ARCH
-	ZFS_AC_CONFIG_CHECK_ARCH_VAR
 	ZFS_AC_CONFIG_ALWAYS_PYTHON
 	ZFS_AC_CONFIG_ALWAYS_PYZFS
 	ZFS_AC_CONFIG_ALWAYS_SED
--- a/contrib/debian/Makefile.am
+++ b/contrib/debian/Makefile.am
@ -12,14 +12,14 @@ dist_noinst_DATA += %D%/openzfs-libpam-zfs.postinst
 dist_noinst_DATA += %D%/openzfs-libpam-zfs.prerm
 dist_noinst_DATA += %D%/openzfs-libuutil3.docs
 dist_noinst_DATA += %D%/openzfs-libuutil3.install.in
-dist_noinst_DATA += %D%/openzfs-libzfs7.docs
-dist_noinst_DATA += %D%/openzfs-libzfs7.install.in
+dist_noinst_DATA += %D%/openzfs-libzfs6.docs
+dist_noinst_DATA += %D%/openzfs-libzfs6.install.in
 dist_noinst_DATA += %D%/openzfs-libzfsbootenv1.docs
 dist_noinst_DATA += %D%/openzfs-libzfsbootenv1.install.in
 dist_noinst_DATA += %D%/openzfs-libzfs-dev.docs
 dist_noinst_DATA += %D%/openzfs-libzfs-dev.install.in
-dist_noinst_DATA += %D%/openzfs-libzpool7.docs
-dist_noinst_DATA += %D%/openzfs-libzpool7.install.in
+dist_noinst_DATA += %D%/openzfs-libzpool6.docs
+dist_noinst_DATA += %D%/openzfs-libzpool6.install.in
 dist_noinst_DATA += %D%/openzfs-python3-pyzfs.install
 dist_noinst_DATA += %D%/openzfs-zfs-dkms.config
 dist_noinst_DATA += %D%/openzfs-zfs-dkms.dkms
--- a/contrib/debian/clean
+++ b/contrib/debian/clean
@ -6,6 +6,6 @@ contrib/pyzfs/libzfs_core/bindings/__pycache__/
 contrib/pyzfs/pyzfs.egg-info/
 debian/openzfs-libnvpair3.install
 debian/openzfs-libuutil3.install
-debian/openzfs-libzfs7.install
+debian/openzfs-libzfs6.install
 debian/openzfs-libzfs-dev.install
-debian/openzfs-libzpool7.install
+debian/openzfs-libzpool6.install
--- a/contrib/debian/control
+++ b/contrib/debian/control
@ -79,9 +79,9 @@ Architecture: linux-any
 Depends: libssl-dev | libssl1.0-dev,
         openzfs-libnvpair3 (= ${binary:Version}),
         openzfs-libuutil3 (= ${binary:Version}),
-         openzfs-libzfs7 (= ${binary:Version}),
+         openzfs-libzfs6 (= ${binary:Version}),
         openzfs-libzfsbootenv1 (= ${binary:Version}),
-         openzfs-libzpool7 (= ${binary:Version}),
+         openzfs-libzpool6 (= ${binary:Version}),
         ${misc:Depends}
 Replaces: libzfslinux-dev
 Conflicts: libzfslinux-dev
@ -91,18 +91,18 @@ Description: OpenZFS filesystem development files for Linux
 libraries of OpenZFS filesystem.
 .
 This package includes the development files of libnvpair3, libuutil3,
- libzpool7 and libzfs7.
+ libzpool6 and libzfs6.

-Package: openzfs-libzfs7
+Package: openzfs-libzfs6
 Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 # The libcurl4 is loaded through dlopen("libcurl.so.4").
 # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=988521
 Recommends: libcurl4
-Breaks: libzfs2, libzfs4, libzfs4linux, libzfs6linux, libzfs7linux, openzfs-libzfs4, openzfs-libzfs6
-Replaces: libzfs2, libzfs4, libzfs4linux, libzfs6linux, libzfs7linux, openzfs-libzfs4, openzfs-libzfs6
-Conflicts: libzfs7linux
+Breaks: libzfs2, libzfs4, libzfs4linux, libzfs6linux
+Replaces: libzfs2, libzfs4, libzfs4linux, libzfs6linux
+Conflicts: libzfs6linux
 Description: OpenZFS filesystem library for Linux - general support
 OpenZFS is a storage platform that encompasses the functionality of
 traditional filesystems and volume managers. It supports data checksums,
@ -124,13 +124,13 @@ Description: OpenZFS filesystem library for Linux - label info support
 .
 The zfsbootenv library provides support for modifying ZFS label information.

-Package: openzfs-libzpool7
+Package: openzfs-libzpool6
 Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libzpool2, libzpool5, libzpool6linux, libzpool7linux
-Replaces: libzpool2, libzpool5, libzpool6linux, libzpool7linux
-Conflicts: libzpool7linux
+Breaks: libzpool2, libzpool5, libzpool5linux, libzpool6linux
+Replaces: libzpool2, libzpool5, libzpool5linux, libzpool6linux
+Conflicts: libzpool6linux
 Description: OpenZFS pool library for Linux
 OpenZFS is a storage platform that encompasses the functionality of
 traditional filesystems and volume managers. It supports data checksums,
@ -247,8 +247,8 @@ Architecture: linux-any
 Pre-Depends: ${misc:Pre-Depends}
 Depends: openzfs-libnvpair3 (= ${binary:Version}),
         openzfs-libuutil3 (= ${binary:Version}),
-         openzfs-libzfs7 (= ${binary:Version}),
-         openzfs-libzpool7 (= ${binary:Version}),
+         openzfs-libzfs6 (= ${binary:Version}),
+         openzfs-libzpool6 (= ${binary:Version}),
         python3,
         ${misc:Depends},
         ${shlibs:Depends}
--- a/contrib/debian/copyright
+++ b/contrib/debian/copyright
@ -4,7 +4,7 @@ The detailed contributor information can be found in [2][3].

 Files: contrib/debian/*
 Copyright:
- 2013-2025, Aron Xu <aron@debian.org>
+ 2013-2016, Aron Xu <aron@debian.org>
 2016, Petter Reinholdtsen <pere@hungry.com>
 2013, Carlos Alberto Lopez Perez <clopez@igalia.com>
 2013, Turbo Fredriksson <turbo@bayour.com>
@ -12,8 +12,6 @@ Copyright:
 2011-2013, Darik Horn <dajhorn@vanadac.com>
 2018-2019, Mo Zhou <cdluminate@gmail.com>
 2018-2020, Mo Zhou <lumin@debian.org>
- 2023-2024, Shengqi Chen <harry-chen@outlook.com>
- 2024-2025, Shengqi Chen <harry@debian.org>
 License: GPL-2+

 [1] https://tracker.debian.org/pkg/zfs-linux
--- a/contrib/debian/not-installed
+++ b/contrib/debian/not-installed
@ -1,4 +1,4 @@
-usr/bin/zarcsummary.py
+usr/bin/arc_summary.py
 usr/share/zfs/zfs-helpers.sh
 etc/default/zfs
 etc/init.d
@ -9,4 +9,4 @@ etc/zfs/vdev_id.conf.sas_direct.example
 etc/zfs/vdev_id.conf.sas_switch.example
 etc/zfs/vdev_id.conf.scsi.example
 etc/zfs/zfs-functions
-usr/lib/systemd/system/zfs-import.service
+lib/systemd/system/zfs-import.service
--- a/contrib/debian/openzfs-libnvpair3.install.in
+++ b/contrib/debian/openzfs-libnvpair3.install.in
@ -1 +1 @@
-usr/lib/@DEB_HOST_MULTIARCH@/libnvpair.so.*
+lib/@DEB_HOST_MULTIARCH@/libnvpair.so.*
--- a/contrib/debian/openzfs-libpam-zfs.install
+++ b/contrib/debian/openzfs-libpam-zfs.install
@ -1,2 +1,2 @@
-usr/lib/*/security/pam_zfs_key.so
+lib/*/security/pam_zfs_key.so
 usr/share/pam-configs/zfs_key
--- a/contrib/debian/openzfs-libpam-zfs.postinst
+++ b/contrib/debian/openzfs-libpam-zfs.postinst
@ -1,7 +1,7 @@
 #!/bin/sh
 set -e

-if ! $(ldd "/usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)/security/pam_zfs_key.so" | grep -q "libasan") ; then
+if ! $(ldd "/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)/security/pam_zfs_key.so" | grep -q "libasan") ; then
 	pam-auth-update --package
 fi

--- a/contrib/debian/openzfs-libuutil3.install.in
+++ b/contrib/debian/openzfs-libuutil3.install.in
@ -1 +1 @@
-usr/lib/@DEB_HOST_MULTIARCH@/libuutil.so.*
+lib/@DEB_HOST_MULTIARCH@/libuutil.so.*
--- a/contrib/debian/openzfs-libzfs-dev.install.in
+++ b/contrib/debian/openzfs-libzfs-dev.install.in
@ -1,5 +1,3 @@
-usr/lib/@DEB_HOST_MULTIARCH@/*.a
-usr/lib/@DEB_HOST_MULTIARCH@/*.so
-usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig
+lib/@DEB_HOST_MULTIARCH@/*.a usr/lib/@DEB_HOST_MULTIARCH@
 usr/include
-
+usr/lib/@DEB_HOST_MULTIARCH@
--- a/contrib/debian/openzfs-libzfs6.docs
+++ b/contrib/debian/openzfs-libzfs6.docs
--- a/contrib/debian/openzfs-libzfs6.install.in
+++ b/contrib/debian/openzfs-libzfs6.install.in
@ -0,0 +1,2 @@
+lib/@DEB_HOST_MULTIARCH@/libzfs.so.*
+lib/@DEB_HOST_MULTIARCH@/libzfs_core.so.*
--- a/contrib/debian/openzfs-libzfs7.install.in
+++ b/contrib/debian/openzfs-libzfs7.install.in
@ -1,2 +0,0 @@
-usr/lib/@DEB_HOST_MULTIARCH@/libzfs.so.*
-usr/lib/@DEB_HOST_MULTIARCH@/libzfs_core.so.*
--- a/contrib/debian/openzfs-libzfsbootenv1.install.in
+++ b/contrib/debian/openzfs-libzfsbootenv1.install.in
@ -1 +1 @@
-usr/lib/@DEB_HOST_MULTIARCH@/libzfsbootenv.so.*
+lib/@DEB_HOST_MULTIARCH@/libzfsbootenv.so.*
--- a/contrib/debian/openzfs-libzpool6.docs
+++ b/contrib/debian/openzfs-libzpool6.docs
--- a/contrib/debian/openzfs-libzpool6.install.in
+++ b/contrib/debian/openzfs-libzpool6.install.in
@ -0,0 +1 @@
+lib/@DEB_HOST_MULTIARCH@/libzpool.so.*
--- a/contrib/debian/openzfs-libzpool7.install.in
+++ b/contrib/debian/openzfs-libzpool7.install.in
@ -1 +0,0 @@
-usr/lib/@DEB_HOST_MULTIARCH@/libzpool.so.*
--- a/contrib/debian/openzfs-zfs-test.install
+++ b/contrib/debian/openzfs-zfs-test.install
@ -1,4 +1,4 @@
-usr/sbin/ztest
+sbin/ztest
 usr/bin/raidz_test
 usr/share/man/man1/raidz_test.1
 usr/share/man/man1/test-runner.1
--- a/contrib/debian/openzfs-zfs-zed.install
+++ b/contrib/debian/openzfs-zfs-zed.install
@ -1,5 +1,5 @@
 etc/zfs/zed.d/*
-usr/lib/systemd/system/zfs-zed.service
+lib/systemd/system/zfs-zed.service
 usr/lib/zfs-linux/zed.d/*
 usr/sbin/zed
 usr/share/man/man8/zed.8
--- a/contrib/debian/openzfs-zfsutils.install
+++ b/contrib/debian/openzfs-zfsutils.install
@ -1,48 +1,47 @@
 etc/default/zfs
 etc/zfs/zfs-functions
 etc/zfs/zpool.d/
-usr/lib/systemd/system-generators/
-usr/lib/systemd/system-preset/
-usr/lib/systemd/system/zfs-import-cache.service
-usr/lib/systemd/system/zfs-import-scan.service
-usr/lib/systemd/system/zfs-import.target
-usr/lib/systemd/system/zfs-load-key.service
-usr/lib/systemd/system/zfs-mount.service
-usr/lib/systemd/system/zfs-mount@.service
-usr/lib/systemd/system/zfs-scrub-monthly@.timer
-usr/lib/systemd/system/zfs-scrub-weekly@.timer
-usr/lib/systemd/system/zfs-scrub@.service
-usr/lib/systemd/system/zfs-trim-monthly@.timer
-usr/lib/systemd/system/zfs-trim-weekly@.timer
-usr/lib/systemd/system/zfs-trim@.service
-usr/lib/systemd/system/zfs-share.service
-usr/lib/systemd/system/zfs-volume-wait.service
-usr/lib/systemd/system/zfs-volumes.target
-usr/lib/systemd/system/zfs.target
-usr/lib/udev/
-usr/sbin/fsck.zfs
-usr/sbin/mount.zfs
-usr/sbin/zdb
-usr/sbin/zfs
-usr/sbin/zfs_ids_to_path
-usr/sbin/zgenhostid
-usr/sbin/zhack
-usr/sbin/zinject
-usr/sbin/zpool
-usr/sbin/zstream
-usr/sbin/zstreamdump
+lib/systemd/system-generators/
+lib/systemd/system-preset/
+lib/systemd/system/zfs-import-cache.service
+lib/systemd/system/zfs-import-scan.service
+lib/systemd/system/zfs-import.target
+lib/systemd/system/zfs-load-key.service
+lib/systemd/system/zfs-mount.service
+lib/systemd/system/zfs-scrub-monthly@.timer
+lib/systemd/system/zfs-scrub-weekly@.timer
+lib/systemd/system/zfs-scrub@.service
+lib/systemd/system/zfs-trim-monthly@.timer
+lib/systemd/system/zfs-trim-weekly@.timer
+lib/systemd/system/zfs-trim@.service
+lib/systemd/system/zfs-share.service
+lib/systemd/system/zfs-volume-wait.service
+lib/systemd/system/zfs-volumes.target
+lib/systemd/system/zfs.target
+lib/udev/
+sbin/fsck.zfs
+sbin/mount.zfs
+sbin/zdb
+sbin/zfs
+sbin/zfs_ids_to_path
+sbin/zgenhostid
+sbin/zhack
+sbin/zinject
+sbin/zpool
+sbin/zstream
+sbin/zstreamdump
 usr/bin/zvol_wait
-usr/lib/modules-load.d/
+usr/lib/modules-load.d/ lib/
 usr/lib/zfs-linux/zpool.d/
 usr/lib/zfs-linux/zpool_influxdb
 usr/lib/zfs-linux/zfs_prepare_disk
-usr/bin/zarcsummary
-usr/bin/zarcstat
-usr/bin/dbufstat usr/sbin
-usr/bin/zilstat
+usr/sbin/arc_summary
+usr/sbin/arcstat
+usr/sbin/dbufstat
+usr/sbin/zilstat
 usr/share/zfs/compatibility.d/
 usr/share/bash-completion/completions
-usr/share/man/man1/zarcstat.1
+usr/share/man/man1/arcstat.1
 usr/share/man/man1/zhack.1
 usr/share/man/man1/zvol_wait.1
 usr/share/man/man5/
--- a/contrib/debian/openzfs-zfsutils.links
+++ b/contrib/debian/openzfs-zfsutils.links
@ -1,3 +0,0 @@
-usr/sbin/zfs      usr/bin/zfs
-usr/sbin/zpool    usr/bin/zpool
-usr/lib/zfs-linux/zpool_influxdb  usr/bin/zpool_influxdb
--- a/Show More
+++ b/Show More