439 changed files with 3609 additions and 14867 deletions
--- a/.github/codeql-cpp.yml
+++ b/.github/codeql-cpp.yml
@ -1,4 +0,0 @@
-name: "Custom CodeQL Analysis"
-
-queries:
-  - uses: ./.github/codeql/custom-queries/cpp/deprecatedFunctionUsage.ql
--- a/.github/codeql-python.yml
+++ b/.github/codeql-python.yml
@ -1,4 +0,0 @@
-name: "Custom CodeQL Analysis"
-
-paths-ignore:
-  - tests
--- a/.github/codeql/custom-queries/cpp/deprecatedFunctionUsage.ql
+++ b/.github/codeql/custom-queries/cpp/deprecatedFunctionUsage.ql
@ -1,59 +0,0 @@
-/**
- * @name Deprecated function usage detection
- * @description Detects functions whose usage is banned from the OpenZFS
- *              codebase due to QA concerns.
- * @kind problem
- * @severity error
- * @id cpp/deprecated-function-usage
-*/
-
-import cpp
-
-predicate isDeprecatedFunction(Function f) {
-  f.getName() = "strtok" or
-  f.getName() = "__xpg_basename" or
-  f.getName() = "basename" or
-  f.getName() = "dirname" or
-  f.getName() = "bcopy" or
-  f.getName() = "bcmp" or
-  f.getName() = "bzero" or
-  f.getName() = "asctime" or
-  f.getName() = "asctime_r" or
-  f.getName() = "gmtime" or
-  f.getName() = "localtime" or
-  f.getName() = "strncpy"
-
-}
-
-string getReplacementMessage(Function f) {
-  if f.getName() = "strtok" then
-    result = "Use strtok_r(3) instead!"
-  else if f.getName() = "__xpg_basename" then
-    result = "basename(3) is underspecified. Use zfs_basename() instead!"
-  else if f.getName() = "basename" then
-    result = "basename(3) is underspecified. Use zfs_basename() instead!"
-  else if f.getName() = "dirname" then
-    result = "dirname(3) is underspecified. Use zfs_dirnamelen() instead!"
-  else if f.getName() = "bcopy" then
-    result = "bcopy(3) is deprecated. Use memcpy(3)/memmove(3) instead!"
-  else if f.getName() = "bcmp" then
-    result = "bcmp(3) is deprecated. Use memcmp(3) instead!"
-  else if f.getName() = "bzero" then
-    result = "bzero(3) is deprecated. Use memset(3) instead!"
-  else if f.getName() = "asctime" then
-    result = "Use strftime(3) instead!"
-  else if f.getName() = "asctime_r" then
-    result = "Use strftime(3) instead!"
-  else if f.getName() = "gmtime" then
-    result = "gmtime(3) isn't thread-safe. Use gmtime_r(3) instead!"
-  else if f.getName() = "localtime" then
-    result = "localtime(3) isn't thread-safe. Use localtime_r(3) instead!"
-  else
-    result = "strncpy(3) is deprecated. Use strlcpy(3) instead!"
-}
-
-from FunctionCall fc, Function f
-where
-  fc.getTarget() = f and
-  isDeprecatedFunction(f)
-select fc, getReplacementMessage(f)
--- a/.github/codeql/custom-queries/cpp/qlpack.yml
+++ b/.github/codeql/custom-queries/cpp/qlpack.yml
@ -1,4 +0,0 @@
-name: openzfs-cpp-queries
-version: 0.0.0
-libraryPathDependencies: codeql-cpp
-suites: openzfs-cpp-suite
--- a/.github/workflows/README.md
+++ b/.github/workflows/README.md
@ -4,54 +4,44 @@
 ```mermaid
 flowchart TB
 subgraph CleanUp and Summary
-  CleanUp+Summary
+  Part1-20.04-->CleanUp+nice+Summary
+  Part2-20.04-->CleanUp+nice+Summary
+  PartN-20.04-->CleanUp+nice+Summary
+  Part1-22.04-->CleanUp+nice+Summary
+  Part2-22.04-->CleanUp+nice+Summary
+  PartN-22.04-->CleanUp+nice+Summary
 end

 subgraph Functional Testings
-  sanity-checks-20.04
-  zloop-checks-20.04
  functional-testing-20.04-->Part1-20.04
  functional-testing-20.04-->Part2-20.04
-  functional-testing-20.04-->Part3-20.04
-  functional-testing-20.04-->Part4-20.04
+  functional-testing-20.04-->PartN-20.04
  functional-testing-22.04-->Part1-22.04
  functional-testing-22.04-->Part2-22.04
-  functional-testing-22.04-->Part3-22.04
-  functional-testing-22.04-->Part4-22.04
-  sanity-checks-22.04
-  zloop-checks-22.04
+  functional-testing-22.04-->PartN-22.04
+end
+
+subgraph Sanity and zloop Testings
+  sanity-checks-20.04-->functional-testing-20.04
+  sanity-checks-22.04-->functional-testing-22.04
+  zloop-checks-20.04-->functional
+  zloop-checks-22.04-->functional
 end

 subgraph Code Checking + Building
-  Build-Ubuntu-20.04
  codeql.yml
  checkstyle.yml
-  Build-Ubuntu-22.04
-end
-
  Build-Ubuntu-20.04-->sanity-checks-20.04
-  Build-Ubuntu-20.04-->zloop-checks-20.04
-  Build-Ubuntu-20.04-->functional-testing-20.04
  Build-Ubuntu-22.04-->sanity-checks-22.04
+  Build-Ubuntu-20.04-->zloop-checks-20.04
  Build-Ubuntu-22.04-->zloop-checks-22.04
-  Build-Ubuntu-22.04-->functional-testing-22.04
-
-  sanity-checks-20.04-->CleanUp+Summary
-  Part1-20.04-->CleanUp+Summary
-  Part2-20.04-->CleanUp+Summary
-  Part3-20.04-->CleanUp+Summary
-  Part4-20.04-->CleanUp+Summary
-  Part1-22.04-->CleanUp+Summary
-  Part2-22.04-->CleanUp+Summary
-  Part3-22.04-->CleanUp+Summary
-  Part4-22.04-->CleanUp+Summary
-  sanity-checks-22.04-->CleanUp+Summary
+end
 ```


 1) build zfs modules for Ubuntu 20.04 and 22.04 (~15m)
 2) 2x zloop test (~10m) + 2x sanity test (~25m)
-3) 4x functional testings in parts 1..4 (each ~1h)
+3) functional testings in parts 1..5 (each ~1h)
 4) cleanup and create summary
   - content of summary depends on the results of the steps

--- a/.github/workflows/checkstyle.yaml
+++ b/.github/workflows/checkstyle.yaml
@ -8,7 +8,7 @@ jobs:
  checkstyle:
    runs-on: ubuntu-22.04
    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
      with:
        ref: ${{ github.event.pull_request.head.sha }}
    - name: Install dependencies
@ -52,7 +52,7 @@ jobs:
      if: failure() && steps.CheckABI.outcome == 'failure'
      run: |
        find -name *.abi | tar -cf abi_files.tar -T -
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v3
      if: failure() && steps.CheckABI.outcome == 'failure'
      with:
        name: New ABI files (use only if you're sure about interface changes)
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@ -24,12 +24,11 @@ jobs:
        echo "MAKEFLAGS=-j$(nproc)" >> $GITHUB_ENV

    - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3

    - name: Initialize CodeQL
      uses: github/codeql-action/init@v2
      with:
-        config-file: .github/codeql-${{ matrix.language }}.yml
        languages: ${{ matrix.language }}

    - name: Autobuild
--- a/.github/workflows/scripts/generate-summary.sh
+++ b/.github/workflows/scripts/generate-summary.sh
@ -87,7 +87,7 @@ function summarize_f() {
  output "\n## $headline\n"
  rm -rf testfiles
  for i in $(seq 1 $FUNCTIONAL_PARTS); do
-    tarfile="$2-part$i/part$i.tar"
+    tarfile="$2/part$i.tar"
    check_tarfile "$tarfile"
    check_logfile "testfiles/log"
  done
--- a/.github/workflows/scripts/setup-dependencies.sh
+++ b/.github/workflows/scripts/setup-dependencies.sh
@ -55,24 +55,29 @@ function mod_install() {
  cat /proc/spl/kstat/zfs/chksum_bench
  echo "::endgroup::"

-  echo "::group::Optimize storage for ZFS testings"
-  # remove swap and umount fast storage
-  # 89GiB -> rootfs + bootfs with ~80MB/s -> don't care
-  # 64GiB -> /mnt with 420MB/s -> new testing ssd
-  sudo swapoff -a
+  echo "::group::Reclaim and report disk space"
+  # remove 4GiB of images
+  sudo systemd-run docker system prune --force --all --volumes

-  # this one is fast and mounted @ /mnt
-  # -> we reformat with ext4 + move it to /var/tmp
-  DEV="/dev/disk/azure/resource-part1"
-  sudo umount /mnt
-  sudo mkfs.ext4 -O ^has_journal -F $DEV
-  sudo mount -o noatime,barrier=0 $DEV /var/tmp
-  sudo chmod 1777 /var/tmp
+  # remove unused software
+  sudo systemd-run --wait rm -rf \
+    "$AGENT_TOOLSDIRECTORY" \
+    /opt/* \
+    /usr/local/* \
+    /usr/share/az* \
+    /usr/share/dotnet \
+    /usr/share/gradle* \
+    /usr/share/miniconda \
+    /usr/share/swift \
+    /var/lib/gems \
+    /var/lib/mysql \
+    /var/lib/snapd
+
+  # trim the cleaned space
+  sudo fstrim /

  # disk usage afterwards
-  sudo df -h /
-  sudo df -h /var/tmp
-  sudo fstrim -a
+  df -h /
  echo "::endgroup::"
 }

--- a/.github/workflows/zfs-linux-tests.yml
+++ b/.github/workflows/zfs-linux-tests.yml
@ -13,10 +13,10 @@ jobs:
  zloop:
    runs-on: ubuntu-${{ inputs.os }}
    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
      with:
        ref: ${{ github.event.pull_request.head.sha }}
-    - uses: actions/download-artifact@v4
+    - uses: actions/download-artifact@v3
      with:
        name: modules-${{ inputs.os }}
    - name: Install modules
@ -34,7 +34,7 @@ jobs:
      if: failure()
      run: |
        sudo chmod +r -R /var/tmp/zloop/
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v3
      if: failure()
      with:
        name: Zpool-logs-${{ inputs.os }}
@ -43,7 +43,7 @@ jobs:
          !/var/tmp/zloop/*/vdev/
        retention-days: 14
        if-no-files-found: ignore
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v3
      if: failure()
      with:
        name: Zpool-files-${{ inputs.os }}
@ -55,10 +55,10 @@ jobs:
  sanity:
    runs-on: ubuntu-${{ inputs.os }}
    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
      with:
        ref: ${{ github.event.pull_request.head.sha }}
-    - uses: actions/download-artifact@v4
+    - uses: actions/download-artifact@v3
      with:
        name: modules-${{ inputs.os }}
    - name: Install modules
@ -77,7 +77,7 @@ jobs:
        RESPATH="/var/tmp/test_results"
        mv -f $RESPATH/current $RESPATH/testfiles
        tar cf $RESPATH/sanity.tar -h -C $RESPATH testfiles
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v3
      if: success() || failure()
      with:
        name: Logs-${{ inputs.os }}-sanity
@ -91,10 +91,10 @@ jobs:
      matrix:
        tests: [ part1, part2, part3, part4 ]
    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
      with:
        ref: ${{ github.event.pull_request.head.sha }}
-    - uses: actions/download-artifact@v4
+    - uses: actions/download-artifact@v3
      with:
        name: modules-${{ inputs.os }}
    - name: Install modules
@ -116,9 +116,9 @@ jobs:
        RESPATH="/var/tmp/test_results"
        mv -f $RESPATH/current $RESPATH/testfiles
        tar cf $RESPATH/${{ matrix.tests }}.tar -h -C $RESPATH testfiles
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v3
      if: success() || failure()
      with:
-        name: Logs-${{ inputs.os }}-functional-${{ matrix.tests }}
+        name: Logs-${{ inputs.os }}-functional
        path: /var/tmp/test_results/${{ matrix.tests }}.tar
        if-no-files-found: ignore
--- a/.github/workflows/zfs-linux.yml
+++ b/.github/workflows/zfs-linux.yml
@ -14,14 +14,14 @@ jobs:
        os: [20.04, 22.04]
    runs-on: ubuntu-${{ matrix.os }}
    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
      with:
        ref: ${{ github.event.pull_request.head.sha }}
    - name: Build modules
      run: .github/workflows/scripts/setup-dependencies.sh build
    - name: Prepare modules upload
      run: tar czf modules-${{ matrix.os }}.tgz *.deb .github tests/test-runner tests/ImageOS.txt
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v3
      with:
        name: modules-${{ matrix.os }}
        path: modules-${{ matrix.os }}.tgz
@ -44,7 +44,7 @@ jobs:
    runs-on: ubuntu-22.04
    needs: testings
    steps:
-    - uses: actions/download-artifact@v4
+    - uses: actions/download-artifact@v3
    - name: Generating summary
      run: |
        tar xzf modules-22.04/modules-22.04.tgz .github tests
@ -58,7 +58,7 @@ jobs:
      run: .github/workflows/scripts/generate-summary.sh 3
    - name: Summary for errors #4
      run: .github/workflows/scripts/generate-summary.sh 4
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v3
      with:
        name: Summary Files
        path: Summary/
--- a/.gitignore
+++ b/.gitignore
@ -83,7 +83,6 @@
 modules.order
 Makefile
 Makefile.in
-changelog
 *.patch
 *.orig
 *.tmp
--- a/.mailmap
+++ b/.mailmap
@ -30,7 +30,6 @@ Andreas Dilger <adilger@dilger.ca>
 Andrew Walker <awalker@ixsystems.com>
 Benedikt Neuffer <github@itfriend.de>
 Chengfei Zhu <chengfeix.zhu@intel.com>
-ChenHao Lu <18302010006@fudan.edu.cn>
 Chris Lindee <chris.lindee+github@gmail.com>
 Colm Buckley <colm@tuatha.org>
 Crag Wang <crag0715@gmail.com>
@ -44,7 +43,6 @@ Glenn Washburn <development@efficientek.com>
 Gordan Bobic <gordan.bobic@gmail.com>
 Gregory Bartholomew <gregory.lee.bartholomew@gmail.com>
 hedong zhang <h_d_zhang@163.com>
-Ilkka Sovanto <github@ilkka.kapsi.fi>
 InsanePrawn <Insane.Prawny@gmail.com>
 Jason Cohen <jwittlincohen@gmail.com>
 Jason Harmening <jason.harmening@gmail.com>
@ -59,7 +57,6 @@ KernelOfTruth <kerneloftruth@gmail.com>
 Liu Hua <liu.hua130@zte.com.cn>
 Liu Qing <winglq@gmail.com>
 loli10K <ezomori.nozomu@gmail.com>
-Mart Frauenlob <allkind@fastest.cc>
 Matthias Blankertz <matthias@blankertz.org>
 Michael Gmelin <grembo@FreeBSD.org>
 Olivier Mazouffre <olivier.mazouffre@ims-bordeaux.fr>
@ -76,12 +73,6 @@ WHR <msl0000023508@gmail.com>
 Yanping Gao <yanping.gao@xtaotech.com>
 Youzhong Yang <youzhong@gmail.com>

-# Signed-off-by: overriding Author:
-Ryan <errornointernet@envs.net> <error.nointernet@gmail.com>
-Qiuhao Chen <chenqiuhao1997@gmail.com> <haohao0924@126.com>
-Yuxin Wang <yuxinwang9999@gmail.com> <Bi11gates9999@gmail.com>
-Zhenlei Huang <zlei@FreeBSD.org> <zlei.huang@gmail.com>
-
 # Commits from strange places, long ago
 Brian Behlendorf <behlendorf1@llnl.gov> <behlendo@7e1ea52c-4ff2-0310-8f11-9dd32ca42a1c>
 Brian Behlendorf <behlendorf1@llnl.gov> <behlendo@fedora-17-amd64.(none)>
@ -98,7 +89,6 @@ Alek Pinchuk <apinchuk@axcient.com> <alek-p@users.noreply.github.com>
 Alexander Lobakin <alobakin@pm.me> <solbjorn@users.noreply.github.com>
 Alexey Smirnoff <fling@member.fsf.org> <fling-@users.noreply.github.com>
 Allen Holl <allen.m.holl@gmail.com> <65494904+allen-4@users.noreply.github.com>
-Alphan Yılmaz <alphanyilmaz@gmail.com> <a1ea321@users.noreply.github.com>
 Ameer Hamza <ahamza@ixsystems.com> <106930537+ixhamza@users.noreply.github.com>
 Andrew J. Hesford <ajh@sideband.org> <48421688+ahesford@users.noreply.github.com>>
 Andrew Sun <me@andrewsun.com> <as-com@users.noreply.github.com>
@ -106,22 +96,18 @@ Aron Xu <happyaron.xu@gmail.com> <happyaron@users.noreply.github.com>
 Arun KV <arun.kv@datacore.com> <65647132+arun-kv@users.noreply.github.com>
 Ben Wolsieffer <benwolsieffer@gmail.com> <lopsided98@users.noreply.github.com>
 bernie1995 <bernie.pikes@gmail.com> <42413912+bernie1995@users.noreply.github.com>
-Bojan Novković <bnovkov@FreeBSD.org> <72801811+bnovkov@users.noreply.github.com>
 Boris Protopopov <boris.protopopov@actifio.com> <bprotopopov@users.noreply.github.com>
 Brad Forschinger <github@bnjf.id.au> <bnjf@users.noreply.github.com>
 Brandon Thetford <brandon@dodecatec.com> <dodexahedron@users.noreply.github.com>
 buzzingwires <buzzingwires@outlook.com> <131118055+buzzingwires@users.noreply.github.com>
 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>
 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>
 Daniel Kobras <d.kobras@science-computing.de> <sckobras@users.noreply.github.com>
 Daniel Reichelt <hacking@nachtgeist.net> <nachtgeist@users.noreply.github.com>
 David Quigley <david.quigley@intel.com> <dpquigl@users.noreply.github.com>
-Dennis R. Friedrichsen <dennis.r.friedrichsen@gmail.com> <31087738+dennisfriedrichsen@users.noreply.github.com>
-Dex Wood <slash2314@gmail.com> <slash2314@users.noreply.github.com>
 DHE <git@dehacked.net> <DeHackEd@users.noreply.github.com>
 Dmitri John Ledkov <dimitri.ledkov@canonical.com> <19779+xnox@users.noreply.github.com>
 Dries Michiels <driesm.michiels@gmail.com> <32487486+driesmp@users.noreply.github.com>
@ -142,7 +128,6 @@ Harry Mallon <hjmallon@gmail.com> <1816667+hjmallon@users.noreply.github.com>
 Hiếu Lê <leorize+oss@disroot.org> <alaviss@users.noreply.github.com>
 Jake Howard <git@theorangeone.net> <RealOrangeOne@users.noreply.github.com>
 James Cowgill <james.cowgill@mips.com> <jcowgill@users.noreply.github.com>
-Jaron Kent-Dobias <jaron@kent-dobias.com> <kentdobias@users.noreply.github.com>
 Jason King <jason.king@joyent.com> <jasonbking@users.noreply.github.com>
 Jeff Dike <jdike@akamai.com> <52420226+jdike@users.noreply.github.com>
 Jitendra Patidar <jitendra.patidar@nutanix.com> <53164267+jsai20@users.noreply.github.com>
@ -152,9 +137,7 @@ John L. Hammond <john.hammond@intel.com> <35266395+jhammond-intel@users.noreply.
 John-Mark Gurney <jmg@funkthat.com> <jmgurney@users.noreply.github.com>
 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>
-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>
 Krzysztof Piecuch <piecuch@kpiecuch.pl> <3964215+pikrzysztof@users.noreply.github.com>
@ -165,11 +148,9 @@ Lorenz Hüdepohl <dev@stellardeath.org> <lhuedepohl@users.noreply.github.com>
 Luís Henriques <henrix@camandro.org> <73643340+lumigch@users.noreply.github.com>
 Marcin Skarbek <git@skarbek.name> <mskarbek@users.noreply.github.com>
 Matt Fiddaman <github@m.fiddaman.uk> <81489167+matt-fidd@users.noreply.github.com>
-Maxim Filimonov <che@bein.link> <part1zano@users.noreply.github.com>
 Max Zettlmeißl <max@zettlmeissl.de> <6818198+maxz@users.noreply.github.com>
 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>
 Nick Mattis <nickm970@gmail.com> <nmattis@users.noreply.github.com>
 omni <omni+vagant@hack.org> <79493359+omnivagant@users.noreply.github.com>
@ -183,7 +164,6 @@ Ping Huang <huangping@smartx.com> <101400146+hpingfs@users.noreply.github.com>
 Piotr P. Stefaniak <pstef@freebsd.org> <pstef@users.noreply.github.com>
 Richard Allen <belperite@gmail.com> <33836503+belperite@users.noreply.github.com>
 Rich Ercolani <rincebrain@gmail.com> <214141+rincebrain@users.noreply.github.com>
-Rick Macklem <rmacklem@uoguelph.ca> <64620010+rmacklem@users.noreply.github.com>
 Rob Wing <rob.wing@klarasystems.com> <98866084+rob-wing@users.noreply.github.com>
 Roman Strashkin <roman.strashkin@nexenta.com> <Ramzec@users.noreply.github.com>
 Ryan Hirasaki <ryanhirasaki@gmail.com> <4690732+RyanHir@users.noreply.github.com>
@ -194,17 +174,13 @@ Scott Colby <scott@scolby.com> <scolby33@users.noreply.github.com>
 Sean Eric Fagan <kithrup@mac.com> <kithrup@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>
-Thomas Bertschinger <bertschinger@lanl.gov> <101425190+bertschinger@users.noreply.github.com>
 Thomas Geppert <geppi@digitx.de> <geppi@users.noreply.github.com>
 Tim Crawford <tcrawford@datto.com> <crawfxrd@users.noreply.github.com>
-Todd Seidelmann <18294602+seidelma@users.noreply.github.com>
 Tom Matthews <tom@axiom-partners.com> <tomtastic@users.noreply.github.com>
 Tony Perkins <tperkins@datto.com> <62951051+tony-zfs@users.noreply.github.com>
 Torsten Wörtwein <twoertwein@gmail.com> <twoertwein@users.noreply.github.com>
 Tulsi Jain <tulsi.jain@delphix.com> <TulsiJain@users.noreply.github.com>
 Václav Skála <skala@vshosting.cz> <33496485+vaclavskala@users.noreply.github.com>
-Vaibhav Bhanawat <vaibhav.bhanawat@delphix.com> <88050553+vaibhav-delphix@users.noreply.github.com>
 Violet Purcell <vimproved@inventati.org> <66446404+vimproved@users.noreply.github.com>
 Vipin Kumar Verma <vipin.verma@hpe.com> <75025470+vermavipinkumar@users.noreply.github.com>
 Wolfgang Bumiller <w.bumiller@proxmox.com> <Blub@users.noreply.github.com>
--- a/48
+++ b/48
@ -46,7 +46,6 @@ CONTRIBUTORS:
    Alex Zhuravlev <alexey.zhuravlev@intel.com>
    Allan Jude <allanjude@freebsd.org>
    Allen Holl <allen.m.holl@gmail.com>
-    Alphan Yılmaz <alphanyilmaz@gmail.com>
    alteriks <alteriks@gmail.com>
    Alyssa Ross <hi@alyssa.is>
    Ameer Hamza <ahamza@ixsystems.com>
@ -89,18 +88,15 @@ CONTRIBUTORS:
    Bassu <bassu@phi9.com>
    Ben Allen <bsallen@alcf.anl.gov>
    Ben Cordero <bencord0@condi.me>
-    Benda Xu <orv@debian.org>
    Benedikt Neuffer <github@itfriend.de>
    Benjamin Albrecht <git@albrecht.io>
    Benjamin Gentil <benjgentil.pro@gmail.com>
-    Benjamin Sherman <benjamin@holyarmy.org>
    Ben McGough <bmcgough@fredhutch.org>
    Ben Rubson <ben.rubson@gmail.com>
    Ben Wolsieffer <benwolsieffer@gmail.com>
    bernie1995 <bernie.pikes@gmail.com>
    Bill McGonigle <bill-github.com-public1@bfccomputing.com>
    Bill Pijewski <wdp@joyent.com>
-    Bojan Novković <bnovkov@FreeBSD.org>
    Boris Protopopov <boris.protopopov@nexenta.com>
    Brad Forschinger <github@bnjf.id.au>
    Brad Lewis <brad.lewis@delphix.com>
@ -115,7 +111,6 @@ CONTRIBUTORS:
    bzzz77 <bzzz.tomas@gmail.com>
    cable2999 <cable2999@users.noreply.github.com>
    Caleb James DeLisle <calebdelisle@lavabit.com>
-    Cameron Harr <harr1@llnl.gov>
    Cao Xuewen <cao.xuewen@zte.com.cn>
    Carlo Landmeter <clandmeter@gmail.com>
    Carlos Alberto Lopez Perez <clopez@igalia.com>
@ -125,15 +120,12 @@ CONTRIBUTORS:
    Chen Can <chen.can2@zte.com.cn>
    Chengfei Zhu <chengfeix.zhu@intel.com>
    Chen Haiquan <oc@yunify.com>
-    ChenHao Lu <18302010006@fudan.edu.cn>
    Chip Parker <aparker@enthought.com>
    Chris Burroughs <chris.burroughs@gmail.com>
-    Chris Davidson <christopher.davidson@gmail.com>
    Chris Dunlap <cdunlap@llnl.gov>
    Chris Dunlop <chris@onthe.net.au>
    Chris Lindee <chris.lindee+github@gmail.com>
    Chris McDonough <chrism@plope.com>
-    Chris Peredun <chris.peredun@ixsystems.com>
    Chris Siden <chris.siden@delphix.com>
    Chris Siebenmann <cks.github@cs.toronto.edu>
    Christer Ekholm <che@chrekh.se>
@ -152,7 +144,6 @@ CONTRIBUTORS:
    Clint Armstrong <clint@clintarmstrong.net>
    Coleman Kane <ckane@colemankane.org>
    Colin Ian King <colin.king@canonical.com>
-    Colin Percival <cperciva@tarsnap.com>
    Colm Buckley <colm@tuatha.org>
    Crag Wang <crag0715@gmail.com>
    Craig Loomis <cloomis@astro.princeton.edu>
@ -165,12 +156,10 @@ CONTRIBUTORS:
    Damiano Albani <damiano.albani@gmail.com>
    Damian Szuberski <szuberskidamian@gmail.com>
    Damian Wojsław <damian@wojslaw.pl>
-    Daniel Berlin <dberlin@dberlin.org>
    Daniel Hiepler <d-git@coderdu.de>
    Daniel Hoffman <dj.hoffman@delphix.com>
    Daniel Kobras <d.kobras@science-computing.de>
    Daniel Kolesa <daniel@octaforge.org>
-    Daniel Perry <dtperry@amazon.com>
    Daniel Reichelt <hacking@nachtgeist.net>
    Daniel Stevenson <bot@dstev.net>
    Daniel Verite <daniel@verite.pro>
@ -187,11 +176,8 @@ CONTRIBUTORS:
    David Quigley <david.quigley@intel.com>
    Debabrata Banerjee <dbanerje@akamai.com>
    D. Ebdrup <debdrup@freebsd.org>
-    Dennis R. Friedrichsen <dennis.r.friedrichsen@gmail.com>
    Denys Rtveliashvili <denys@rtveliashvili.name>
    Derek Dai <daiderek@gmail.com>
-    Derek Schrock <dereks@lifeofadishwasher.com>
-    Dex Wood <slash2314@gmail.com>
    DHE <git@dehacked.net>
    Didier Roche <didrocks@ubuntu.com>
    Dimitri John Ledkov <xnox@ubuntu.com>
@ -249,12 +235,9 @@ CONTRIBUTORS:
    Gionatan Danti <g.danti@assyoma.it>
    Giuseppe Di Natale <guss80@gmail.com>
    Glenn Washburn <development@efficientek.com>
-    glibg10b <glibg10b@users.noreply.github.com>
-    gofaster <felix.gofaster@gmail.com>
    Gordan Bobic <gordan@redsleeve.org>
    Gordon Bergling <gbergling@googlemail.com>
    Gordon Ross <gwr@nexenta.com>
-    Gordon Tetlow <gordon@freebsd.org>
    Graham Christensen <graham@grahamc.com>
    Graham Perrin <grahamperrin@gmail.com>
    Gregor Kopka <gregor@kopka.net>
@ -282,7 +265,6 @@ CONTRIBUTORS:
    Igor Kozhukhov <ikozhukhov@gmail.com>
    Igor Lvovsky <ilvovsky@gmail.com>
    ilbsmart <wgqimut@gmail.com>
-    Ilkka Sovanto <github@ilkka.kapsi.fi>
    illiliti <illiliti@protonmail.com>
    ilovezfs <ilovezfs@icloud.com>
    InsanePrawn <Insane.Prawny@gmail.com>
@ -298,11 +280,9 @@ CONTRIBUTORS:
    Jan Engelhardt <jengelh@inai.de>
    Jan Kryl <jan.kryl@nexenta.com>
    Jan Sanislo <oystr@cs.washington.edu>
-    Jaron Kent-Dobias <jaron@kent-dobias.com>
    Jason Cohen <jwittlincohen@gmail.com>
    Jason Harmening <jason.harmening@gmail.com>
    Jason King <jason.brian.king@gmail.com>
-    Jason Lee <jasonlee@lanl.gov>
    Jason Zaman <jasonzaman@gmail.com>
    Javen Wu <wu.javen@gmail.com>
    Jean-Baptiste Lallement <jean-baptiste@ubuntu.com>
@ -333,7 +313,6 @@ CONTRIBUTORS:
    Jonathon Fernyhough <jonathon@m2x.dev>
    Jorgen Lundman <lundman@lundman.net>
    Josef 'Jeff' Sipek <josef.sipek@nexenta.com>
-    Jose Luis Duran <jlduran@gmail.com>
    Josh Soref <jsoref@users.noreply.github.com>
    Joshua M. Clulow <josh@sysmgr.org>
    José Luis Salvador Rufo <salvador.joseluis@gmail.com>
@ -357,10 +336,8 @@ CONTRIBUTORS:
    Kash Pande <kash@tripleback.net>
    Kay Pedersen <christianpe96@gmail.com>
    Keith M Wesolowski <wesolows@foobazco.org>
-    Kent Ross <k@mad.cash>
    KernelOfTruth <kerneloftruth@gmail.com>
    Kevin Bowling <kevin.bowling@kev009.com>
-    Kevin Greene <kevin.greene@delphix.com>
    Kevin Jin <lostking2008@hotmail.com>
    Kevin P. Fleming <kevin@km6g.us>
    Kevin Tanguy <kevin.tanguy@ovh.net>
@ -412,10 +389,8 @@ CONTRIBUTORS:
    Mark Shellenbaum <Mark.Shellenbaum@Oracle.COM>
    marku89 <mar42@kola.li>
    Mark Wright <markwright@internode.on.net>
-    Mart Frauenlob <allkind@fastest.cc>
    Martin Matuska <mm@FreeBSD.org>
    Martin Rüegg <martin.rueegg@metaworx.ch>
-    Martin Wagner <martin.wagner.dev@gmail.com>
    Massimo Maggi <me@massimo-maggi.eu>
    Mateusz Guzik <mjguzik@gmail.com>
    Mateusz Piotrowski <0mp@FreeBSD.org>
@ -430,7 +405,6 @@ CONTRIBUTORS:
    Matus Kral <matuskral@me.com>
    Mauricio Faria de Oliveira <mfo@canonical.com>
    Max Grossman <max.grossman@delphix.com>
-    Maxim Filimonov <che@bein.link>
    Maximilian Mehnert <maximilian.mehnert@gmx.de>
    Max Zettlmeißl <max@zettlmeissl.de>
    Md Islam <mdnahian@outlook.com>
@ -443,7 +417,6 @@ CONTRIBUTORS:
    Michael Niewöhner <foss@mniewoehner.de>
    Michael Zhivich <mzhivich@akamai.com>
    Michal Vasilek <michal@vasilek.cz>
-    MigeljanImeri <ImeriMigel@gmail.com>
    Mike Gerdts <mike.gerdts@joyent.com>
    Mike Harsch <mike@harschsystems.com>
    Mike Leddy <mike.leddy@gmail.com>
@ -475,7 +448,6 @@ CONTRIBUTORS:
    Olaf Faaland <faaland1@llnl.gov>
    Oleg Drokin <green@linuxhacker.ru>
    Oleg Stepura <oleg@stepura.com>
-    Olivier Certner <olce.freebsd@certner.fr>
    Olivier Mazouffre <olivier.mazouffre@ims-bordeaux.fr>
    omni <omni+vagant@hack.org>
    Orivej Desh <orivej@gmx.fr>
@ -494,7 +466,6 @@ CONTRIBUTORS:
    Peng <peng.hse@xtaotech.com>
    Peter Ashford <ashford@accs.com>
    Peter Dave Hello <hsu@peterdavehello.org>
-    Peter Doherty <peterd@acranox.org>
    Peter Levine <plevine457@gmail.com>
    Peter Wirdemo <peter.wirdemo@gmail.com>
    Petros Koutoupis <petros@petroskoutoupis.com>
@ -508,8 +479,6 @@ CONTRIBUTORS:
    Prasad Joshi <prasadjoshi124@gmail.com>
    privb0x23 <privb0x23@users.noreply.github.com>
    P.SCH <p88@yahoo.com>
-    Qiuhao Chen <chenqiuhao1997@gmail.com>
-    Quartz <yyhran@163.com>
    Quentin Zdanis <zdanisq@gmail.com>
    Rafael Kitover <rkitover@gmail.com>
    RageLtMan <sempervictus@users.noreply.github.com>
@ -522,15 +491,11 @@ CONTRIBUTORS:
    Riccardo Schirone <rschirone91@gmail.com>
    Richard Allen <belperite@gmail.com>
    Richard Elling <Richard.Elling@RichardElling.com>
-    Richard Kojedzinszky <richard@kojedz.in>
    Richard Laager <rlaager@wiktel.com>
    Richard Lowe <richlowe@richlowe.net>
    Richard Sharpe <rsharpe@samba.org>
    Richard Yao <ryao@gentoo.org>
    Rich Ercolani <rincebrain@gmail.com>
-    Rick Macklem <rmacklem@uoguelph.ca>
-    rilysh <nightquick@proton.me>
-    Robert Evans <evansr@google.com>
    Robert Novak <sailnfool@gmail.com>
    Roberto Ricci <ricci@disroot.org>
    Rob Norris <robn@despairlabs.com>
@ -540,14 +505,11 @@ CONTRIBUTORS:
    Roman Strashkin <roman.strashkin@nexenta.com>
    Ross Williams <ross@ross-williams.net>
    Ruben Kerkhof <ruben@rubenkerkhof.com>
-    Ryan <errornointernet@envs.net>
    Ryan Hirasaki <ryanhirasaki@gmail.com>
    Ryan Lahfa <masterancpp@gmail.com>
    Ryan Libby <rlibby@FreeBSD.org>
    Ryan Moeller <freqlabs@FreeBSD.org>
-    Sam Atkinson <samatk@amazon.com>
    Sam Hathaway <github.com@munkynet.org>
-    Sam James <sam@gentoo.org>
    Sam Lunt <samuel.j.lunt@gmail.com>
    Samuel VERSCHELDE <stormi-github@ylix.fr>
    Samuel Wycliffe <samuelwycliffe@gmail.com>
@ -565,12 +527,9 @@ CONTRIBUTORS:
    Sen Haerens <sen@senhaerens.be>
    Serapheim Dimitropoulos <serapheim@delphix.com>
    Seth Forshee <seth.forshee@canonical.com>
-    Seth Troisi <sethtroisi@google.com>
    Shaan Nobee <sniper111@gmail.com>
    Shampavman <sham.pavman@nexenta.com>
    Shaun Tancheff <shaun@aeonazure.com>
-    Shawn Bayern <sbayern@law.fsu.edu>
-    Shengqi Chen <harry-chen@outlook.com>
    Shen Yan <shenyanxxxy@qq.com>
    Simon Guest <simon.guest@tesujimath.org>
    Simon Klinkert <simon.klinkert@gmail.com>
@ -578,7 +537,6 @@ CONTRIBUTORS:
    Spencer Kinny <spencerkinny1995@gmail.com>
    Srikanth N S <srikanth.nagasubbaraoseetharaman@hpe.com>
    Stanislav Seletskiy <s.seletskiy@gmail.com>
-    Stefan Lendl <s.lendl@proxmox.com>
    Steffen Müthing <steffen.muething@iwr.uni-heidelberg.de>
    Stephen Blinick <stephen.blinick@delphix.com>
    sterlingjensen <sterlingjensen@users.noreply.github.com>
@ -599,7 +557,6 @@ CONTRIBUTORS:
    Teodor Spæren <teodor_spaeren@riseup.net>
    TerraTech <TerraTech@users.noreply.github.com>
    Thijs Cramer <thijs.cramer@gmail.com>
-    Thomas Bertschinger <bertschinger@lanl.gov>
    Thomas Geppert <geppi@digitx.de>
    Thomas Lamprecht <guggentom@hotmail.de>
    Till Maas <opensource@till.name>
@ -612,7 +569,6 @@ CONTRIBUTORS:
    Tim Schumacher <timschumi@gmx.de>
    Tino Reichardt <milky-zfs@mcmilk.de>
    Tobin Harding <me@tobin.cc>
-    Todd Seidelmann <seidelma@users.noreply.github.com>
    Tom Caputi <tcaputi@datto.com>
    Tom Matthews <tom@axiom-partners.com>
    Tomohiro Kusumi <kusumi.tomohiro@gmail.com>
@ -630,7 +586,6 @@ CONTRIBUTORS:
    Turbo Fredriksson <turbo@bayour.com>
    Tyler J. Stachecki <stachecki.tyler@gmail.com>
    Umer Saleem <usaleem@ixsystems.com>
-    Vaibhav Bhanawat <vaibhav.bhanawat@delphix.com>
    Valmiky Arquissandas <kayvlim@gmail.com>
    Val Packett <val@packett.cool>
    Vince van Oosten <techhazard@codeforyouand.me>
@ -659,13 +614,10 @@ CONTRIBUTORS:
    yuina822 <ayuichi@club.kyutech.ac.jp>
    YunQiang Su <syq@debian.org>
    Yuri Pankov <yuri.pankov@gmail.com>
-    Yuxin Wang <yuxinwang9999@gmail.com>
    Yuxuan Shui <yshuiv7@gmail.com>
    Zachary Bedell <zac@thebedells.org>
    Zach Dykstra <dykstra.zachary@gmail.com>
    zgock <zgock@nuc.base.zgock-lab.net>
-    Zhao Yongming <zym@apache.org>
-    Zhenlei Huang <zlei@FreeBSD.org>
    Zhu Chuang <chuang@melty.land>
    Érico Nogueira <erico.erc@gmail.com>
    Đoàn Trần Công Danh <congdanhqx@gmail.com>
--- a/4
+++ b/4
@ -1,10 +1,10 @@
 Meta:          1
 Name:          zfs
 Branch:        1.0
-Version:       2.2.6
+Version:       2.2.0
 Release:       1
 Release-Tags:  relext
 License:       CDDL
 Author:        OpenZFS
-Linux-Maximum: 6.10
+Linux-Maximum: 6.5
 Linux-Minimum: 3.10
--- a/README.md
+++ b/README.md
@ -32,4 +32,4 @@ For more details see the NOTICE, LICENSE and COPYRIGHT files; `UCRL-CODE-235197`

 # Supported Kernels
  * The `META` file contains the officially recognized supported Linux kernel versions.
-  * Supported FreeBSD versions are any supported branches and releases starting from 12.4-RELEASE.
+  * Supported FreeBSD versions are any supported branches and releases starting from 12.2-RELEASE.
--- a/cmd/arc_summary
+++ b/cmd/arc_summary
@ -711,7 +711,7 @@ def section_archits(kstats_dict):
    pd_total = int(arc_stats['prefetch_data_hits']) +\
        int(arc_stats['prefetch_data_iohits']) +\
        int(arc_stats['prefetch_data_misses'])
-    prt_2('ARC prefetch data accesses:', f_perc(pd_total, all_accesses),
+    prt_2('ARC prefetch metadata accesses:', f_perc(pd_total, all_accesses),
          f_hits(pd_total))
    pd_todo = (('Prefetch data hits:', arc_stats['prefetch_data_hits']),
               ('Prefetch data I/O hits:', arc_stats['prefetch_data_iohits']),
@ -793,27 +793,18 @@ def section_dmu(kstats_dict):

    zfetch_stats = isolate_section('zfetchstats', kstats_dict)

-    zfetch_access_total = int(zfetch_stats['hits']) +\
-        int(zfetch_stats['future']) + int(zfetch_stats['stride']) +\
-        int(zfetch_stats['past']) + int(zfetch_stats['misses'])
+    zfetch_access_total = int(zfetch_stats['hits'])+int(zfetch_stats['misses'])

    prt_1('DMU predictive prefetcher calls:', f_hits(zfetch_access_total))
    prt_i2('Stream hits:',
           f_perc(zfetch_stats['hits'], zfetch_access_total),
           f_hits(zfetch_stats['hits']))
-    future = int(zfetch_stats['future']) + int(zfetch_stats['stride'])
-    prt_i2('Hits ahead of stream:', f_perc(future, zfetch_access_total),
-           f_hits(future))
-    prt_i2('Hits behind stream:',
-           f_perc(zfetch_stats['past'], zfetch_access_total),
-           f_hits(zfetch_stats['past']))
    prt_i2('Stream misses:',
           f_perc(zfetch_stats['misses'], zfetch_access_total),
           f_hits(zfetch_stats['misses']))
    prt_i2('Streams limit reached:',
           f_perc(zfetch_stats['max_streams'], zfetch_stats['misses']),
           f_hits(zfetch_stats['max_streams']))
-    prt_i1('Stream strides:', f_hits(zfetch_stats['stride']))
    prt_i1('Prefetches issued', f_hits(zfetch_stats['io_issued']))
    print()

--- a/cmd/arcstat.in
+++ b/cmd/arcstat.in
@ -157,16 +157,6 @@ cols = {
    "free":       [5, 1024, "ARC free memory"],
    "avail":      [5, 1024, "ARC available memory"],
    "waste":      [5, 1024, "Wasted memory due to round up to pagesize"],
-    "ztotal":     [6, 1000, "zfetch total prefetcher calls per second"],
-    "zhits":      [5, 1000, "zfetch stream hits per second"],
-    "zahead":     [6, 1000, "zfetch hits ahead of streams per second"],
-    "zpast":      [5, 1000, "zfetch hits behind streams per second"],
-    "zmisses":    [7, 1000, "zfetch stream misses per second"],
-    "zmax":       [4, 1000, "zfetch limit reached per second"],
-    "zfuture":    [7, 1000, "zfetch stream future per second"],
-    "zstride":    [7, 1000, "zfetch stream strides per second"],
-    "zissued":    [7, 1000, "zfetch prefetches issued per second"],
-    "zactive":    [7, 1000, "zfetch prefetches active per second"],
 }

 v = {}
@ -174,8 +164,6 @@ hdr = ["time", "read", "ddread", "ddh%", "dmread", "dmh%", "pread", "ph%",
       "size", "c", "avail"]
 xhdr = ["time", "mfu", "mru", "mfug", "mrug", "unc", "eskip", "mtxmis",
        "dread", "pread", "read"]
-zhdr = ["time", "ztotal", "zhits", "zahead", "zpast", "zmisses", "zmax",
-        "zfuture", "zstride", "zissued", "zactive"]
 sint = 1               # Default interval is 1 second
 count = 1              # Default count is 1
 hdr_intr = 20          # Print header every 20 lines of output
@ -200,8 +188,6 @@ if sys.platform.startswith('freebsd'):

        k = [ctl for ctl in sysctl.filter('kstat.zfs.misc.arcstats')
             if ctl.type != sysctl.CTLTYPE_NODE]
-        k += [ctl for ctl in sysctl.filter('kstat.zfs.misc.zfetchstats')
-             if ctl.type != sysctl.CTLTYPE_NODE]

        if not k:
            sys.exit(1)
@ -213,28 +199,19 @@ if sys.platform.startswith('freebsd'):
                continue

            name, value = s.name, s.value
-
-            if "arcstats" in name:
            # Trims 'kstat.zfs.misc.arcstats' from the name
            kstat[name[24:]] = int(value)
-            else:
-                kstat["zfetch_" + name[27:]] = int(value)

 elif sys.platform.startswith('linux'):
    def kstat_update():
        global kstat

-        k1 = [line.strip() for line in open('/proc/spl/kstat/zfs/arcstats')]
+        k = [line.strip() for line in open('/proc/spl/kstat/zfs/arcstats')]

-        k2 = ["zfetch_" + line.strip() for line in
-             open('/proc/spl/kstat/zfs/zfetchstats')]
-
-        if k1 is None or k2 is None:
+        if not k:
            sys.exit(1)

-        del k1[0:2]
-        del k2[0:2]
-        k = k1 + k2
+        del k[0:2]
        kstat = {}

        for s in k:
@ -262,7 +239,6 @@ def usage():
    sys.stderr.write("\t -v : List all possible field headers and definitions"
                     "\n")
    sys.stderr.write("\t -x : Print extended stats\n")
-    sys.stderr.write("\t -z : Print zfetch stats\n")
    sys.stderr.write("\t -f : Specify specific fields to print (see -v)\n")
    sys.stderr.write("\t -o : Redirect output to the specified file\n")
    sys.stderr.write("\t -s : Override default field separator with custom "
@ -381,7 +357,6 @@ def init():
    global count
    global hdr
    global xhdr
-    global zhdr
    global opfile
    global sep
    global out
@ -393,17 +368,15 @@ def init():
    xflag = False
    hflag = False
    vflag = False
-    zflag = False
    i = 1

    try:
        opts, args = getopt.getopt(
            sys.argv[1:],
-            "axzo:hvs:f:p",
+            "axo:hvs:f:p",
            [
                "all",
                "extended",
-                "zfetch",
                "outfile",
                "help",
                "verbose",
@ -437,15 +410,13 @@ def init():
            i += 1
        if opt in ('-p', '--parsable'):
            pretty_print = False
-        if opt in ('-z', '--zfetch'):
-            zflag = True
        i += 1

    argv = sys.argv[i:]
    sint = int(argv[0]) if argv else sint
    count = int(argv[1]) if len(argv) > 1 else (0 if len(argv) > 0 else 1)

-    if hflag or (xflag and zflag) or ((zflag or xflag) and desired_cols):
+    if hflag or (xflag and desired_cols):
        usage()

    if vflag:
@ -454,9 +425,6 @@ def init():
    if xflag:
        hdr = xhdr

-    if zflag:
-        hdr = zhdr
-
    update_hdr_intr()

    # check if L2ARC exists
@ -601,17 +569,6 @@ def calculate():
    v["el2mru"] = d["evict_l2_eligible_mru"] // sint
    v["el2inel"] = d["evict_l2_ineligible"] // sint
    v["mtxmis"] = d["mutex_miss"] // sint
-    v["ztotal"] = (d["zfetch_hits"] + d["zfetch_future"] + d["zfetch_stride"] +
-                   d["zfetch_past"] + d["zfetch_misses"]) // sint
-    v["zhits"] = d["zfetch_hits"] // sint
-    v["zahead"] = (d["zfetch_future"] + d["zfetch_stride"]) // sint
-    v["zpast"] = d["zfetch_past"] // sint
-    v["zmisses"] = d["zfetch_misses"] // sint
-    v["zmax"] = d["zfetch_max_streams"] // sint
-    v["zfuture"] = d["zfetch_future"] // sint
-    v["zstride"] = d["zfetch_stride"] // sint
-    v["zissued"] = d["zfetch_io_issued"] // sint
-    v["zactive"] = d["zfetch_io_active"] // sint

    if l2exist:
        v["l2hits"] = d["l2_hits"] // sint
--- a/cmd/zdb/zdb.c
+++ b/cmd/zdb/zdb.c
@ -34,7 +34,6 @@
 * Copyright (c) 2021 Allan Jude
 * Copyright (c) 2021 Toomas Soome <tsoome@me.com>
 * Copyright (c) 2023, Klara Inc.
- * Copyright (c) 2023, Rob Norris <robn@despairlabs.com>
 */

 #include <stdio.h>
@ -48,7 +47,6 @@
 #include <sys/spa_impl.h>
 #include <sys/dmu.h>
 #include <sys/zap.h>
-#include <sys/zap_impl.h>
 #include <sys/fs/zfs.h>
 #include <sys/zfs_znode.h>
 #include <sys/zfs_sa.h>
@ -82,12 +80,8 @@
 #include <sys/dsl_scan.h>
 #include <sys/btree.h>
 #include <sys/brt.h>
-#include <sys/brt_impl.h>
 #include <zfs_comutil.h>
 #include <sys/zstd/zstd.h>
-#if (__GLIBC__ && !__UCLIBC__)
-#include <execinfo.h> /* for backtrace() */
-#endif

 #include <libnvpair.h>
 #include <libzutil.h>
@ -905,8 +899,6 @@ usage(void)
 	    "don't print label contents\n");
 	(void) fprintf(stderr, "        -t --txg=INTEGER             "
 	    "highest txg to use when searching for uberblocks\n");
-	(void) fprintf(stderr, "        -T --brt-stats               "
-	    "BRT statistics\n");
 	(void) fprintf(stderr, "        -u --uberblock               "
 	    "uberblock\n");
 	(void) fprintf(stderr, "        -U --cachefile=PATH          "
@ -930,41 +922,11 @@ usage(void)
 static void
 dump_debug_buffer(void)
 {
-	ssize_t ret __attribute__((unused));
-
-	if (!dump_opt['G'])
-		return;
-	/*
-	 * We use write() instead of printf() so that this function
-	 * is safe to call from a signal handler.
-	 */
-	ret = write(STDOUT_FILENO, "\n", 1);
+	if (dump_opt['G']) {
+		(void) printf("\n");
+		(void) fflush(stdout);
 		zfs_dbgmsg_print("zdb");
-}
-
-#define	BACKTRACE_SZ	100
-
-static void sig_handler(int signo)
-{
-	struct sigaction action;
-#if (__GLIBC__ && !__UCLIBC__) /* backtrace() is a GNU extension */
-	int nptrs;
-	void *buffer[BACKTRACE_SZ];
-
-	nptrs = backtrace(buffer, BACKTRACE_SZ);
-	backtrace_symbols_fd(buffer, nptrs, STDERR_FILENO);
-#endif
-	dump_debug_buffer();
-
-	/*
-	 * Restore default action and re-raise signal so SIGSEGV and
-	 * SIGABRT can trigger a core dump.
-	 */
-	action.sa_handler = SIG_DFL;
-	sigemptyset(&action.sa_mask);
-	action.sa_flags = 0;
-	(void) sigaction(signo, &action, NULL);
-	raise(signo);
+	}
 }

 /*
@ -1037,15 +999,6 @@ zdb_nicenum(uint64_t num, char *buf, size_t buflen)
 		nicenum(num, buf, buflen);
 }

-static void
-zdb_nicebytes(uint64_t bytes, char *buf, size_t buflen)
-{
-	if (dump_opt['P'])
-		(void) snprintf(buf, buflen, "%llu", (longlong_t)bytes);
-	else
-		zfs_nicebytes(bytes, buf, buflen);
-}
-
 static const char histo_stars[] = "****************************************";
 static const uint64_t histo_width = sizeof (histo_stars) - 1;

@ -1233,33 +1186,16 @@ dump_zap(objset_t *os, uint64_t object, void *data, size_t size)
 	for (zap_cursor_init(&zc, os, object);
 	    zap_cursor_retrieve(&zc, &attr) == 0;
 	    zap_cursor_advance(&zc)) {
-		boolean_t key64 =
-		    !!(zap_getflags(zc.zc_zap) & ZAP_FLAG_UINT64_KEY);
-
-		if (key64)
-			(void) printf("\t\t0x%010lx = ",
-			    *(uint64_t *)attr.za_name);
-		else
 		(void) printf("\t\t%s = ", attr.za_name);
-
 		if (attr.za_num_integers == 0) {
 			(void) printf("\n");
 			continue;
 		}
 		prop = umem_zalloc(attr.za_num_integers *
 		    attr.za_integer_length, UMEM_NOFAIL);
-
-		if (key64)
-			(void) zap_lookup_uint64(os, object,
-			    (const uint64_t *)attr.za_name, 1,
-			    attr.za_integer_length, attr.za_num_integers,
-			    prop);
-		else
 		(void) zap_lookup(os, object, attr.za_name,
-			    attr.za_integer_length, attr.za_num_integers,
-			    prop);
-
-		if (attr.za_integer_length == 1 && !key64) {
+		    attr.za_integer_length, attr.za_num_integers, prop);
+		if (attr.za_integer_length == 1) {
 			if (strcmp(attr.za_name,
 			    DSL_CRYPTO_KEY_MASTER_KEY) == 0 ||
 			    strcmp(attr.za_name,
@ -1278,10 +1214,6 @@ dump_zap(objset_t *os, uint64_t object, void *data, size_t size)
 		} else {
 			for (i = 0; i < attr.za_num_integers; i++) {
 				switch (attr.za_integer_length) {
-				case 1:
-					(void) printf("%u ",
-					    ((uint8_t *)prop)[i]);
-					break;
 				case 2:
 					(void) printf("%u ",
 					    ((uint16_t *)prop)[i]);
@ -2149,76 +2081,6 @@ dump_all_ddts(spa_t *spa)
 	dump_dedup_ratio(&dds_total);
 }

-static void
-dump_brt(spa_t *spa)
-{
-	if (!spa_feature_is_enabled(spa, SPA_FEATURE_BLOCK_CLONING)) {
-		printf("BRT: unsupported on this pool\n");
-		return;
-	}
-
-	if (!spa_feature_is_active(spa, SPA_FEATURE_BLOCK_CLONING)) {
-		printf("BRT: empty\n");
-		return;
-	}
-
-	brt_t *brt = spa->spa_brt;
-	VERIFY(brt);
-
-	char count[32], used[32], saved[32];
-	zdb_nicebytes(brt_get_used(spa), used, sizeof (used));
-	zdb_nicebytes(brt_get_saved(spa), saved, sizeof (saved));
-	uint64_t ratio = brt_get_ratio(spa);
-	printf("BRT: used %s; saved %s; ratio %llu.%02llux\n", used, saved,
-	    (u_longlong_t)(ratio / 100), (u_longlong_t)(ratio % 100));
-
-	if (dump_opt['T'] < 2)
-		return;
-
-	for (uint64_t vdevid = 0; vdevid < brt->brt_nvdevs; vdevid++) {
-		brt_vdev_t *brtvd = &brt->brt_vdevs[vdevid];
-		if (brtvd == NULL)
-			continue;
-
-		if (!brtvd->bv_initiated) {
-			printf("BRT: vdev %" PRIu64 ": empty\n", vdevid);
-			continue;
-		}
-
-		zdb_nicenum(brtvd->bv_totalcount, count, sizeof (count));
-		zdb_nicebytes(brtvd->bv_usedspace, used, sizeof (used));
-		zdb_nicebytes(brtvd->bv_savedspace, saved, sizeof (saved));
-		printf("BRT: vdev %" PRIu64 ": refcnt %s; used %s; saved %s\n",
-		    vdevid, count, used, saved);
-	}
-
-	if (dump_opt['T'] < 3)
-		return;
-
-	char dva[64];
-	printf("\n%-16s %-10s\n", "DVA", "REFCNT");
-
-	for (uint64_t vdevid = 0; vdevid < brt->brt_nvdevs; vdevid++) {
-		brt_vdev_t *brtvd = &brt->brt_vdevs[vdevid];
-		if (brtvd == NULL || !brtvd->bv_initiated)
-			continue;
-
-		zap_cursor_t zc;
-		zap_attribute_t za;
-		for (zap_cursor_init(&zc, brt->brt_mos, brtvd->bv_mos_entries);
-		    zap_cursor_retrieve(&zc, &za) == 0;
-		    zap_cursor_advance(&zc)) {
-			uint64_t offset = *(uint64_t *)za.za_name;
-			uint64_t refcnt = za.za_first_integer;
-
-			snprintf(dva, sizeof (dva), "%" PRIu64 ":%llx", vdevid,
-			    (u_longlong_t)offset);
-			printf("%-16s %-10llu\n", dva, (u_longlong_t)refcnt);
-		}
-		zap_cursor_fini(&zc);
-	}
-}
-
 static void
 dump_dtl_seg(void *arg, uint64_t start, uint64_t size)
 {
@ -2415,7 +2277,7 @@ static void
 snprintf_zstd_header(spa_t *spa, char *blkbuf, size_t buflen,
    const blkptr_t *bp)
 {
-	static abd_t *pabd = NULL;
+	abd_t *pabd;
 	void *buf;
 	zio_t *zio;
 	zfs_zstdhdr_t zstd_hdr;
@ -2446,7 +2308,6 @@ snprintf_zstd_header(spa_t *spa, char *blkbuf, size_t buflen,
 		return;
 	}

-	if (!pabd)
 	pabd = abd_alloc_for_io(SPA_MAXBLOCKSIZE, B_FALSE);
 	zio = zio_root(spa, NULL, NULL, 0);

@ -5272,7 +5133,7 @@ dump_label(const char *dev)
 	    sizeof (cksum_record_t), offsetof(cksum_record_t, link));

 	psize = statbuf.st_size;
-	psize = P2ALIGN_TYPED(psize, sizeof (vdev_label_t), uint64_t);
+	psize = P2ALIGN(psize, (uint64_t)sizeof (vdev_label_t));
 	ashift = SPA_MINBLOCKSHIFT;

 	/*
@ -8096,17 +7957,6 @@ dump_mos_leaks(spa_t *spa)
 		}
 	}

-	if (spa->spa_brt != NULL) {
-		brt_t *brt = spa->spa_brt;
-		for (uint64_t vdevid = 0; vdevid < brt->brt_nvdevs; vdevid++) {
-			brt_vdev_t *brtvd = &brt->brt_vdevs[vdevid];
-			if (brtvd != NULL && brtvd->bv_initiated) {
-				mos_obj_refd(brtvd->bv_mos_brtvdev);
-				mos_obj_refd(brtvd->bv_mos_entries);
-			}
-		}
-	}
-
 	/*
 	 * Visit all allocated objects and make sure they are referenced.
 	 */
@ -8243,9 +8093,6 @@ dump_zpool(spa_t *spa)
 	if (dump_opt['D'])
 		dump_all_ddts(spa);

-	if (dump_opt['T'])
-		dump_brt(spa);
-
 	if (dump_opt['d'] > 2 || dump_opt['m'])
 		dump_metaslabs(spa);
 	if (dump_opt['M'])
@ -8557,14 +8404,6 @@ zdb_decompress_block(abd_t *pabd, void *buf, void *lbuf, uint64_t lsize,
 	*cfuncp++ = ZIO_COMPRESS_LZ4;
 	*cfuncp++ = ZIO_COMPRESS_LZJB;
 	mask |= ZIO_COMPRESS_MASK(LZ4) | ZIO_COMPRESS_MASK(LZJB);
-	/*
-	 * Every gzip level has the same decompressor, no need to
-	 * run it 9 times per bruteforce attempt.
-	 */
-	mask |= ZIO_COMPRESS_MASK(GZIP_2) | ZIO_COMPRESS_MASK(GZIP_3);
-	mask |= ZIO_COMPRESS_MASK(GZIP_4) | ZIO_COMPRESS_MASK(GZIP_5);
-	mask |= ZIO_COMPRESS_MASK(GZIP_6) | ZIO_COMPRESS_MASK(GZIP_7);
-	mask |= ZIO_COMPRESS_MASK(GZIP_8) | ZIO_COMPRESS_MASK(GZIP_9);
 	for (int c = 0; c < ZIO_COMPRESS_FUNCTIONS; c++)
 		if (((1ULL << c) & mask) == 0)
 			*cfuncp++ = c;
@ -8989,27 +8828,9 @@ main(int argc, char **argv)
 	char *spa_config_path_env, *objset_str;
 	boolean_t target_is_spa = B_TRUE, dataset_lookup = B_FALSE;
 	nvlist_t *cfg = NULL;
-	struct sigaction action;

 	dprintf_setup(&argc, argv);

-	/*
-	 * Set up signal handlers, so if we crash due to bad on-disk data we
-	 * can get more info. Unlike ztest, we don't bail out if we can't set
-	 * up signal handlers, because zdb is very useful without them.
-	 */
-	action.sa_handler = sig_handler;
-	sigemptyset(&action.sa_mask);
-	action.sa_flags = 0;
-	if (sigaction(SIGSEGV, &action, NULL) < 0) {
-		(void) fprintf(stderr, "zdb: cannot catch SIGSEGV: %s\n",
-		    strerror(errno));
-	}
-	if (sigaction(SIGABRT, &action, NULL) < 0) {
-		(void) fprintf(stderr, "zdb: cannot catch SIGABRT: %s\n",
-		    strerror(errno));
-	}
-
 	/*
 	 * If there is an environment variable SPA_CONFIG_PATH it overrides
 	 * default spa_config_path setting. If -U flag is specified it will
@ -9058,7 +8879,6 @@ main(int argc, char **argv)
 		{"io-stats",		no_argument,		NULL, 's'},
 		{"simulate-dedup",	no_argument,		NULL, 'S'},
 		{"txg",			required_argument,	NULL, 't'},
-		{"brt-stats",		no_argument,		NULL, 'T'},
 		{"uberblock",		no_argument,		NULL, 'u'},
 		{"cachefile",		required_argument,	NULL, 'U'},
 		{"verbose",		no_argument,		NULL, 'v'},
@ -9072,7 +8892,7 @@ main(int argc, char **argv)
 	};

 	while ((c = getopt_long(argc, argv,
-	    "AbBcCdDeEFGhiI:kK:lLmMNo:Op:PqrRsSt:TuU:vVx:XYyZ",
+	    "AbBcCdDeEFGhiI:kK:lLmMNo:Op:PqrRsSt:uU:vVx:XYyZ",
 	    long_options, NULL)) != -1) {
 		switch (c) {
 		case 'b':
@ -9094,7 +8914,6 @@ main(int argc, char **argv)
 		case 'R':
 		case 's':
 		case 'S':
-		case 'T':
 		case 'u':
 		case 'y':
 		case 'Z':
@ -9257,6 +9076,22 @@ main(int argc, char **argv)
 	if (dump_opt['l'])
 		return (dump_label(argv[0]));

+	if (dump_opt['O']) {
+		if (argc != 2)
+			usage();
+		dump_opt['v'] = verbose + 3;
+		return (dump_path(argv[0], argv[1], NULL));
+	}
+	if (dump_opt['r']) {
+		target_is_spa = B_FALSE;
+		if (argc != 3)
+			usage();
+		dump_opt['v'] = verbose;
+		error = dump_path(argv[0], argv[1], &object);
+		if (error != 0)
+			fatal("internal error: %s", strerror(error));
+	}
+
 	if (dump_opt['X'] || dump_opt['F'])
 		rewind = ZPOOL_DO_REWIND |
 		    (dump_opt['X'] ? ZPOOL_EXTREME_REWIND : 0);
@ -9357,29 +9192,6 @@ main(int argc, char **argv)
 		searchdirs = NULL;
 	}

-	/*
-	 * We need to make sure to process -O option or call
-	 * dump_path after the -e option has been processed,
-	 * which imports the pool to the namespace if it's
-	 * not in the cachefile.
-	 */
-	if (dump_opt['O']) {
-		if (argc != 2)
-			usage();
-		dump_opt['v'] = verbose + 3;
-		return (dump_path(argv[0], argv[1], NULL));
-	}
-
-	if (dump_opt['r']) {
-		target_is_spa = B_FALSE;
-		if (argc != 3)
-			usage();
-		dump_opt['v'] = verbose;
-		error = dump_path(argv[0], argv[1], &object);
-		if (error != 0)
-			fatal("internal error: %s", strerror(error));
-	}
-
 	/*
 	 * import_checkpointed_state makes the assumption that the
 	 * target pool that we pass it is already part of the spa
--- a/cmd/zdb/zdb_il.c
+++ b/cmd/zdb/zdb_il.c
@ -168,7 +168,7 @@ zil_prt_rec_write(zilog_t *zilog, int txtype, const void *arg)
 	    (u_longlong_t)lr->lr_foid, (u_longlong_t)lr->lr_offset,
 	    (u_longlong_t)lr->lr_length);

-	if (txtype == TX_WRITE2 || verbose < 4)
+	if (txtype == TX_WRITE2 || verbose < 5)
 		return;

 	if (lr->lr_common.lrc_reclen == sizeof (lr_write_t)) {
@ -178,8 +178,6 @@ zil_prt_rec_write(zilog_t *zilog, int txtype, const void *arg)
 		    "will claim" : "won't claim");
 		print_log_bp(bp, tab_prefix);

-		if (verbose < 5)
-			return;
 		if (BP_IS_HOLE(bp)) {
 			(void) printf("\t\t\tLSIZE 0x%llx\n",
 			    (u_longlong_t)BP_GET_LSIZE(bp));
@ -204,9 +202,6 @@ zil_prt_rec_write(zilog_t *zilog, int txtype, const void *arg)
 		if (error)
 			goto out;
 	} else {
-		if (verbose < 5)
-			return;
-
 		/* data is stored after the end of the lr_write record */
 		data = abd_alloc(lr->lr_length, B_FALSE);
 		abd_copy_from_buf(data, lr + 1, lr->lr_length);
@ -222,28 +217,6 @@ out:
 	abd_free(data);
 }

-static void
-zil_prt_rec_write_enc(zilog_t *zilog, int txtype, const void *arg)
-{
-	(void) txtype;
-	const lr_write_t *lr = arg;
-	const blkptr_t *bp = &lr->lr_blkptr;
-	int verbose = MAX(dump_opt['d'], dump_opt['i']);
-
-	(void) printf("%s(encrypted)\n", tab_prefix);
-
-	if (verbose < 4)
-		return;
-
-	if (lr->lr_common.lrc_reclen == sizeof (lr_write_t)) {
-		(void) printf("%shas blkptr, %s\n", tab_prefix,
-		    !BP_IS_HOLE(bp) &&
-		    bp->blk_birth >= spa_min_claim_txg(zilog->zl_spa) ?
-		    "will claim" : "won't claim");
-		print_log_bp(bp, tab_prefix);
-	}
-}
-
 static void
 zil_prt_rec_truncate(zilog_t *zilog, int txtype, const void *arg)
 {
@ -339,34 +312,11 @@ zil_prt_rec_clone_range(zilog_t *zilog, int txtype, const void *arg)
 {
 	(void) zilog, (void) txtype;
 	const lr_clone_range_t *lr = arg;
-	int verbose = MAX(dump_opt['d'], dump_opt['i']);

 	(void) printf("%sfoid %llu, offset %llx, length %llx, blksize %llx\n",
 	    tab_prefix, (u_longlong_t)lr->lr_foid, (u_longlong_t)lr->lr_offset,
 	    (u_longlong_t)lr->lr_length, (u_longlong_t)lr->lr_blksz);

-	if (verbose < 4)
-		return;
-
-	for (unsigned int i = 0; i < lr->lr_nbps; i++) {
-		(void) printf("%s[%u/%llu] ", tab_prefix, i + 1,
-		    (u_longlong_t)lr->lr_nbps);
-		print_log_bp(&lr->lr_bps[i], "");
-	}
-}
-
-static void
-zil_prt_rec_clone_range_enc(zilog_t *zilog, int txtype, const void *arg)
-{
-	(void) zilog, (void) txtype;
-	const lr_clone_range_t *lr = arg;
-	int verbose = MAX(dump_opt['d'], dump_opt['i']);
-
-	(void) printf("%s(encrypted)\n", tab_prefix);
-
-	if (verbose < 4)
-		return;
-
 	for (unsigned int i = 0; i < lr->lr_nbps; i++) {
 		(void) printf("%s[%u/%llu] ", tab_prefix, i + 1,
 		    (u_longlong_t)lr->lr_nbps);
@ -377,7 +327,6 @@ zil_prt_rec_clone_range_enc(zilog_t *zilog, int txtype, const void *arg)
 typedef void (*zil_prt_rec_func_t)(zilog_t *, int, const void *);
 typedef struct zil_rec_info {
 	zil_prt_rec_func_t	zri_print;
-	zil_prt_rec_func_t	zri_print_enc;
 	const char		*zri_name;
 	uint64_t		zri_count;
 } zil_rec_info_t;
@ -392,9 +341,7 @@ static zil_rec_info_t zil_rec_info[TX_MAX_TYPE] = {
 	{.zri_print = zil_prt_rec_remove,   .zri_name = "TX_RMDIR           "},
 	{.zri_print = zil_prt_rec_link,	    .zri_name = "TX_LINK            "},
 	{.zri_print = zil_prt_rec_rename,   .zri_name = "TX_RENAME          "},
-	{.zri_print = zil_prt_rec_write,
-	    .zri_print_enc = zil_prt_rec_write_enc,
-	    .zri_name = "TX_WRITE           "},
+	{.zri_print = zil_prt_rec_write,    .zri_name = "TX_WRITE           "},
 	{.zri_print = zil_prt_rec_truncate, .zri_name = "TX_TRUNCATE        "},
 	{.zri_print = zil_prt_rec_setattr,  .zri_name = "TX_SETATTR         "},
 	{.zri_print = zil_prt_rec_acl,	    .zri_name = "TX_ACL_V0          "},
@ -411,7 +358,6 @@ static zil_rec_info_t zil_rec_info[TX_MAX_TYPE] = {
 	{.zri_print = zil_prt_rec_rename,   .zri_name = "TX_RENAME_EXCHANGE "},
 	{.zri_print = zil_prt_rec_rename,   .zri_name = "TX_RENAME_WHITEOUT "},
 	{.zri_print = zil_prt_rec_clone_range,
-	    .zri_print_enc = zil_prt_rec_clone_range_enc,
 	    .zri_name = "TX_CLONE_RANGE     "},
 };

@ -438,8 +384,6 @@ print_log_record(zilog_t *zilog, const lr_t *lr, void *arg, uint64_t claim_txg)
 	if (txtype && verbose >= 3) {
 		if (!zilog->zl_os->os_encrypted) {
 			zil_rec_info[txtype].zri_print(zilog, txtype, lr);
-		} else if (zil_rec_info[txtype].zri_print_enc) {
-			zil_rec_info[txtype].zri_print_enc(zilog, txtype, lr);
 		} else {
 			(void) printf("%s(encrypted)\n", tab_prefix);
 		}
--- a/cmd/zed/agents/fmd_api.c
+++ b/cmd/zed/agents/fmd_api.c
@ -22,7 +22,6 @@
 * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
 *
 * Copyright (c) 2016, Intel Corporation.
- * Copyright (c) 2023, Klara Inc.
 */

 /*
@ -232,6 +231,28 @@ fmd_prop_get_int32(fmd_hdl_t *hdl, const char *name)
 	if (strcmp(name, "spare_on_remove") == 0)
 		return (1);

+	if (strcmp(name, "io_N") == 0 || strcmp(name, "checksum_N") == 0)
+		return (10);	/* N = 10 events */
+
+	return (0);
+}
+
+int64_t
+fmd_prop_get_int64(fmd_hdl_t *hdl, const char *name)
+{
+	(void) hdl;
+
+	/*
+	 * These can be looked up in mp->modinfo->fmdi_props
+	 * For now we just hard code for phase 2. In the
+	 * future, there can be a ZED based override.
+	 */
+	if (strcmp(name, "remove_timeout") == 0)
+		return (15ULL * 1000ULL * 1000ULL * 1000ULL);	/* 15 sec */
+
+	if (strcmp(name, "io_T") == 0 || strcmp(name, "checksum_T") == 0)
+		return (1000ULL * 1000ULL * 1000ULL * 600ULL);	/* 10 min */
+
 	return (0);
 }

@ -514,19 +535,6 @@ fmd_serd_exists(fmd_hdl_t *hdl, const char *name)
 	return (fmd_serd_eng_lookup(&mp->mod_serds, name) != NULL);
 }

-int
-fmd_serd_active(fmd_hdl_t *hdl, const char *name)
-{
-	fmd_module_t *mp = (fmd_module_t *)hdl;
-	fmd_serd_eng_t *sgp;
-
-	if ((sgp = fmd_serd_eng_lookup(&mp->mod_serds, name)) == NULL) {
-		zed_log_msg(LOG_ERR, "serd engine '%s' does not exist", name);
-		return (0);
-	}
-	return (fmd_serd_eng_fired(sgp) || !fmd_serd_eng_empty(sgp));
-}
-
 void
 fmd_serd_reset(fmd_hdl_t *hdl, const char *name)
 {
@ -535,10 +543,12 @@ fmd_serd_reset(fmd_hdl_t *hdl, const char *name)

 	if ((sgp = fmd_serd_eng_lookup(&mp->mod_serds, name)) == NULL) {
 		zed_log_msg(LOG_ERR, "serd engine '%s' does not exist", name);
-	} else {
-		fmd_serd_eng_reset(sgp);
-		fmd_hdl_debug(hdl, "serd_reset %s", name);
+		return;
 	}
+
+	fmd_serd_eng_reset(sgp);
+
+	fmd_hdl_debug(hdl, "serd_reset %s", name);
 }

 int
@ -546,21 +556,16 @@ fmd_serd_record(fmd_hdl_t *hdl, const char *name, fmd_event_t *ep)
 {
 	fmd_module_t *mp = (fmd_module_t *)hdl;
 	fmd_serd_eng_t *sgp;
+	int err;

 	if ((sgp = fmd_serd_eng_lookup(&mp->mod_serds, name)) == NULL) {
 		zed_log_msg(LOG_ERR, "failed to add record to SERD engine '%s'",
 		    name);
 		return (0);
 	}
-	return (fmd_serd_eng_record(sgp, ep->ev_hrt));
-}
+	err = fmd_serd_eng_record(sgp, ep->ev_hrt);

-void
-fmd_serd_gc(fmd_hdl_t *hdl)
-{
-	fmd_module_t *mp = (fmd_module_t *)hdl;
-
-	fmd_serd_hash_apply(&mp->mod_serds, fmd_serd_eng_gc, NULL);
+	return (err);
 }

 /* FMD Timers */
@ -574,7 +579,7 @@ _timer_notify(union sigval sv)
 	const fmd_hdl_ops_t *ops = mp->mod_info->fmdi_ops;
 	struct itimerspec its;

-	fmd_hdl_debug(hdl, "%s timer fired (%p)", mp->mod_name, ftp->ft_tid);
+	fmd_hdl_debug(hdl, "timer fired (%p)", ftp->ft_tid);

 	/* disarm the timer */
 	memset(&its, 0, sizeof (struct itimerspec));
--- a/cmd/zed/agents/fmd_api.h
+++ b/cmd/zed/agents/fmd_api.h
@ -151,6 +151,7 @@ extern void fmd_hdl_vdebug(fmd_hdl_t *, const char *, va_list);
 extern void fmd_hdl_debug(fmd_hdl_t *, const char *, ...);

 extern int32_t fmd_prop_get_int32(fmd_hdl_t *, const char *);
+extern int64_t fmd_prop_get_int64(fmd_hdl_t *, const char *);

 #define	FMD_STAT_NOALLOC	0x0	/* fmd should use caller's memory */
 #define	FMD_STAT_ALLOC		0x1	/* fmd should allocate stats memory */
@ -194,12 +195,10 @@ extern size_t fmd_buf_size(fmd_hdl_t *, fmd_case_t *, const char *);
 extern void fmd_serd_create(fmd_hdl_t *, const char *, uint_t, hrtime_t);
 extern void fmd_serd_destroy(fmd_hdl_t *, const char *);
 extern int fmd_serd_exists(fmd_hdl_t *, const char *);
-extern int fmd_serd_active(fmd_hdl_t *, const char *);
 extern void fmd_serd_reset(fmd_hdl_t *, const char *);
 extern int fmd_serd_record(fmd_hdl_t *, const char *, fmd_event_t *);
 extern int fmd_serd_fired(fmd_hdl_t *, const char *);
 extern int fmd_serd_empty(fmd_hdl_t *, const char *);
-extern void fmd_serd_gc(fmd_hdl_t *);

 extern id_t fmd_timer_install(fmd_hdl_t *, void *, fmd_event_t *, hrtime_t);
 extern void fmd_timer_remove(fmd_hdl_t *, id_t);
--- a/cmd/zed/agents/fmd_serd.c
+++ b/cmd/zed/agents/fmd_serd.c
@ -310,9 +310,8 @@ fmd_serd_eng_reset(fmd_serd_eng_t *sgp)
 }

 void
-fmd_serd_eng_gc(fmd_serd_eng_t *sgp, void *arg)
+fmd_serd_eng_gc(fmd_serd_eng_t *sgp)
 {
-	(void) arg;
 	fmd_serd_elem_t *sep, *nep;
 	hrtime_t hrt;

--- a/cmd/zed/agents/fmd_serd.h
+++ b/cmd/zed/agents/fmd_serd.h
@ -77,7 +77,7 @@ extern int fmd_serd_eng_fired(fmd_serd_eng_t *);
 extern int fmd_serd_eng_empty(fmd_serd_eng_t *);

 extern void fmd_serd_eng_reset(fmd_serd_eng_t *);
-extern void fmd_serd_eng_gc(fmd_serd_eng_t *, void *);
+extern void fmd_serd_eng_gc(fmd_serd_eng_t *);

 #ifdef	__cplusplus
 }
--- a/cmd/zed/agents/zfs_diagnosis.c
+++ b/cmd/zed/agents/zfs_diagnosis.c
@ -23,7 +23,6 @@
 * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 * Copyright 2015 Nexenta Systems, Inc.  All rights reserved.
 * Copyright (c) 2016, Intel Corporation.
- * Copyright (c) 2023, Klara Inc.
 */

 #include <stddef.h>
@ -48,16 +47,11 @@
 #define	DEFAULT_CHECKSUM_T	600	/* seconds */
 #define	DEFAULT_IO_N		10	/* events */
 #define	DEFAULT_IO_T		600	/* seconds */
-#define	DEFAULT_SLOW_IO_N	10	/* events */
-#define	DEFAULT_SLOW_IO_T	30	/* seconds */
-
-#define	CASE_GC_TIMEOUT_SECS	43200	/* 12 hours */

 /*
- * Our serd engines are named in the following format:
- *     'zfs_<pool_guid>_<vdev_guid>_{checksum,io,slow_io}'
- * This #define reserves enough space for two 64-bit hex values plus the
- * length of the longest string.
+ * Our serd engines are named 'zfs_<pool_guid>_<vdev_guid>_{checksum,io}'.  This
+ * #define reserves enough space for two 64-bit hex values plus the length of
+ * the longest string.
 */
 #define	MAX_SERDLEN	(16 * 2 + sizeof ("zfs___checksum"))

@ -74,7 +68,6 @@ typedef struct zfs_case_data {
 	int		zc_pool_state;
 	char		zc_serd_checksum[MAX_SERDLEN];
 	char		zc_serd_io[MAX_SERDLEN];
-	char		zc_serd_slow_io[MAX_SERDLEN];
 	int		zc_has_remove_timer;
 } zfs_case_data_t;

@ -121,8 +114,7 @@ zfs_de_stats_t zfs_stats = {
 	{ "resource_drops", FMD_TYPE_UINT64, "resource related ereports" }
 };

-/* wait 15 seconds after a removal */
-static hrtime_t zfs_remove_timeout = SEC2NSEC(15);
+static hrtime_t zfs_remove_timeout;

 uu_list_pool_t *zfs_case_pool;
 uu_list_t *zfs_cases;
@ -132,8 +124,6 @@ uu_list_t *zfs_cases;
 #define	ZFS_MAKE_EREPORT(type)	\
    FM_EREPORT_CLASS "." ZFS_ERROR_CLASS "." type

-static void zfs_purge_cases(fmd_hdl_t *hdl);
-
 /*
 * Write out the persistent representation of an active case.
 */
@ -180,42 +170,6 @@ zfs_case_unserialize(fmd_hdl_t *hdl, fmd_case_t *cp)
 	return (zcp);
 }

-/*
- * count other unique slow-io cases in a pool
- */
-static uint_t
-zfs_other_slow_cases(fmd_hdl_t *hdl, const zfs_case_data_t *zfs_case)
-{
-	zfs_case_t *zcp;
-	uint_t cases = 0;
-	static hrtime_t next_check = 0;
-
-	/*
-	 * Note that plumbing in some external GC would require adding locking,
-	 * since most of this module code is not thread safe and assumes there
-	 * is only one thread running against the module. So we perform GC here
-	 * inline periodically so that future delay induced faults will be
-	 * possible once the issue causing multiple vdev delays is resolved.
-	 */
-	if (gethrestime_sec() > next_check) {
-		/* Periodically purge old SERD entries and stale cases */
-		fmd_serd_gc(hdl);
-		zfs_purge_cases(hdl);
-		next_check = gethrestime_sec() + CASE_GC_TIMEOUT_SECS;
-	}
-
-	for (zcp = uu_list_first(zfs_cases); zcp != NULL;
-	    zcp = uu_list_next(zfs_cases, zcp)) {
-		if (zcp->zc_data.zc_pool_guid == zfs_case->zc_pool_guid &&
-		    zcp->zc_data.zc_vdev_guid != zfs_case->zc_vdev_guid &&
-		    zcp->zc_data.zc_serd_slow_io[0] != '\0' &&
-		    fmd_serd_active(hdl, zcp->zc_data.zc_serd_slow_io)) {
-			cases++;
-		}
-	}
-	return (cases);
-}
-
 /*
 * Iterate over any active cases.  If any cases are associated with a pool or
 * vdev which is no longer present on the system, close the associated case.
@ -422,14 +376,6 @@ zfs_serd_name(char *buf, uint64_t pool_guid, uint64_t vdev_guid,
 	    (long long unsigned int)vdev_guid, type);
 }

-static void
-zfs_case_retire(fmd_hdl_t *hdl, zfs_case_t *zcp)
-{
-	fmd_hdl_debug(hdl, "retiring case");
-
-	fmd_case_close(hdl, zcp->zc_case);
-}
-
 /*
 * Solve a given ZFS case.  This first checks to make sure the diagnosis is
 * still valid, as well as cleaning up any pending timer associated with the
@ -686,7 +632,9 @@ zfs_fm_recv(fmd_hdl_t *hdl, fmd_event_t *ep, nvlist_t *nvl, const char *class)
 		if (strcmp(class,
 		    ZFS_MAKE_EREPORT(FM_EREPORT_ZFS_DATA)) == 0 ||
 		    strcmp(class,
-		    ZFS_MAKE_EREPORT(FM_EREPORT_ZFS_CONFIG_CACHE_WRITE)) == 0) {
+		    ZFS_MAKE_EREPORT(FM_EREPORT_ZFS_CONFIG_CACHE_WRITE)) == 0 ||
+		    strcmp(class,
+		    ZFS_MAKE_EREPORT(FM_EREPORT_ZFS_DELAY)) == 0) {
 			zfs_stats.resource_drops.fmds_value.ui64++;
 			return;
 		}
@ -754,9 +702,6 @@ zfs_fm_recv(fmd_hdl_t *hdl, fmd_event_t *ep, nvlist_t *nvl, const char *class)
 			if (zcp->zc_data.zc_serd_checksum[0] != '\0')
 				fmd_serd_reset(hdl,
 				    zcp->zc_data.zc_serd_checksum);
-			if (zcp->zc_data.zc_serd_slow_io[0] != '\0')
-				fmd_serd_reset(hdl,
-				    zcp->zc_data.zc_serd_slow_io);
 		} else if (fmd_nvl_class_match(hdl, nvl,
 		    ZFS_MAKE_RSRC(FM_RESOURCE_STATECHANGE))) {
 			uint64_t state = 0;
@ -785,10 +730,6 @@ zfs_fm_recv(fmd_hdl_t *hdl, fmd_event_t *ep, nvlist_t *nvl, const char *class)
 	if (fmd_case_solved(hdl, zcp->zc_case))
 		return;

-	if (vdev_guid)
-		fmd_hdl_debug(hdl, "error event '%s', vdev %llu", class,
-		    vdev_guid);
-	else
 	fmd_hdl_debug(hdl, "error event '%s'", class);

 	/*
@ -838,8 +779,6 @@ zfs_fm_recv(fmd_hdl_t *hdl, fmd_event_t *ep, nvlist_t *nvl, const char *class)
 	    fmd_nvl_class_match(hdl, nvl,
 	    ZFS_MAKE_EREPORT(FM_EREPORT_ZFS_IO_FAILURE)) ||
 	    fmd_nvl_class_match(hdl, nvl,
-	    ZFS_MAKE_EREPORT(FM_EREPORT_ZFS_DELAY)) ||
-	    fmd_nvl_class_match(hdl, nvl,
 	    ZFS_MAKE_EREPORT(FM_EREPORT_ZFS_PROBE_FAILURE))) {
 		const char *failmode = NULL;
 		boolean_t checkremove = B_FALSE;
@ -875,51 +814,6 @@ zfs_fm_recv(fmd_hdl_t *hdl, fmd_event_t *ep, nvlist_t *nvl, const char *class)
 			}
 			if (fmd_serd_record(hdl, zcp->zc_data.zc_serd_io, ep))
 				checkremove = B_TRUE;
-		} else if (fmd_nvl_class_match(hdl, nvl,
-		    ZFS_MAKE_EREPORT(FM_EREPORT_ZFS_DELAY))) {
-			uint64_t slow_io_n, slow_io_t;
-
-			/*
-			 * Create a slow io SERD engine when the VDEV has the
-			 * 'vdev_slow_io_n' and 'vdev_slow_io_n' properties.
-			 */
-			if (zcp->zc_data.zc_serd_slow_io[0] == '\0' &&
-			    nvlist_lookup_uint64(nvl,
-			    FM_EREPORT_PAYLOAD_ZFS_VDEV_SLOW_IO_N,
-			    &slow_io_n) == 0 &&
-			    nvlist_lookup_uint64(nvl,
-			    FM_EREPORT_PAYLOAD_ZFS_VDEV_SLOW_IO_T,
-			    &slow_io_t) == 0) {
-				zfs_serd_name(zcp->zc_data.zc_serd_slow_io,
-				    pool_guid, vdev_guid, "slow_io");
-				fmd_serd_create(hdl,
-				    zcp->zc_data.zc_serd_slow_io,
-				    slow_io_n,
-				    SEC2NSEC(slow_io_t));
-				zfs_case_serialize(zcp);
-			}
-			/* Pass event to SERD engine and see if this triggers */
-			if (zcp->zc_data.zc_serd_slow_io[0] != '\0' &&
-			    fmd_serd_record(hdl, zcp->zc_data.zc_serd_slow_io,
-			    ep)) {
-				/*
-				 * Ignore a slow io diagnosis when other
-				 * VDEVs in the pool show signs of being slow.
-				 */
-				if (zfs_other_slow_cases(hdl, &zcp->zc_data)) {
-					zfs_case_retire(hdl, zcp);
-					fmd_hdl_debug(hdl, "pool %llu has "
-					    "multiple slow io cases -- skip "
-					    "degrading vdev %llu",
-					    (u_longlong_t)
-					    zcp->zc_data.zc_pool_guid,
-					    (u_longlong_t)
-					    zcp->zc_data.zc_vdev_guid);
-				} else {
-					zfs_case_solve(hdl, zcp,
-					    "fault.fs.zfs.vdev.slow_io");
-				}
-			}
 		} else if (fmd_nvl_class_match(hdl, nvl,
 		    ZFS_MAKE_EREPORT(FM_EREPORT_ZFS_CHECKSUM))) {
 			/*
@ -1030,8 +924,6 @@ zfs_fm_close(fmd_hdl_t *hdl, fmd_case_t *cs)
 		fmd_serd_destroy(hdl, zcp->zc_data.zc_serd_checksum);
 	if (zcp->zc_data.zc_serd_io[0] != '\0')
 		fmd_serd_destroy(hdl, zcp->zc_data.zc_serd_io);
-	if (zcp->zc_data.zc_serd_slow_io[0] != '\0')
-		fmd_serd_destroy(hdl, zcp->zc_data.zc_serd_slow_io);
 	if (zcp->zc_data.zc_has_remove_timer)
 		fmd_timer_remove(hdl, zcp->zc_remove_timer);

@ -1040,15 +932,30 @@ zfs_fm_close(fmd_hdl_t *hdl, fmd_case_t *cs)
 	fmd_hdl_free(hdl, zcp, sizeof (zfs_case_t));
 }

+/*
+ * We use the fmd gc entry point to look for old cases that no longer apply.
+ * This allows us to keep our set of case data small in a long running system.
+ */
+static void
+zfs_fm_gc(fmd_hdl_t *hdl)
+{
+	zfs_purge_cases(hdl);
+}
+
 static const fmd_hdl_ops_t fmd_ops = {
 	zfs_fm_recv,	/* fmdo_recv */
 	zfs_fm_timeout,	/* fmdo_timeout */
 	zfs_fm_close,	/* fmdo_close */
 	NULL,		/* fmdo_stats */
-	NULL,	/* fmdo_gc */
+	zfs_fm_gc,	/* fmdo_gc */
 };

 static const fmd_prop_t fmd_props[] = {
+	{ "checksum_N", FMD_TYPE_UINT32, "10" },
+	{ "checksum_T", FMD_TYPE_TIME, "10min" },
+	{ "io_N", FMD_TYPE_UINT32, "10" },
+	{ "io_T", FMD_TYPE_TIME, "10min" },
+	{ "remove_timeout", FMD_TYPE_TIME, "15sec" },
 	{ NULL, 0, NULL }
 };

@ -1089,6 +996,8 @@ _zfs_diagnosis_init(fmd_hdl_t *hdl)

 	(void) fmd_stat_create(hdl, FMD_STAT_NOALLOC, sizeof (zfs_stats) /
 	    sizeof (fmd_stat_t), (fmd_stat_t *)&zfs_stats);
+
+	zfs_remove_timeout = fmd_prop_get_int64(hdl, "remove_timeout");
 }

 void
--- a/cmd/zed/agents/zfs_mod.c
+++ b/cmd/zed/agents/zfs_mod.c
@ -24,7 +24,6 @@
 * Copyright 2014 Nexenta Systems, Inc. All rights reserved.
 * Copyright (c) 2016, 2017, Intel Corporation.
 * Copyright (c) 2017 Open-E, Inc. All Rights Reserved.
- * Copyright (c) 2023, Klara Inc.
 */

 /*
@ -147,17 +146,6 @@ zfs_unavail_pool(zpool_handle_t *zhp, void *data)
 	return (0);
 }

-/*
- * Write an array of strings to the zed log
- */
-static void lines_to_zed_log_msg(char **lines, int lines_cnt)
-{
-	int i;
-	for (i = 0; i < lines_cnt; i++) {
-		zed_log_msg(LOG_INFO, "%s", lines[i]);
-	}
-}
-
 /*
 * Two stage replace on Linux
 * since we get disk notifications
@ -205,21 +193,14 @@ zfs_process_add(zpool_handle_t *zhp, nvlist_t *vdev, boolean_t labeled)
 	uint64_t is_spare = 0;
 	const char *physpath = NULL, *new_devid = NULL, *enc_sysfs_path = NULL;
 	char rawpath[PATH_MAX], fullpath[PATH_MAX];
-	char pathbuf[PATH_MAX];
+	char devpath[PATH_MAX];
 	int ret;
 	int online_flag = ZFS_ONLINE_CHECKREMOVE | ZFS_ONLINE_UNSPARE;
 	boolean_t is_sd = B_FALSE;
 	boolean_t is_mpath_wholedisk = B_FALSE;
 	uint_t c;
 	vdev_stat_t *vs;
-	char **lines = NULL;
-	int lines_cnt = 0;

-	/*
-	 * Get the persistent path, typically under the '/dev/disk/by-id' or
-	 * '/dev/disk/by-vdev' directories.  Note that this path can change
-	 * when a vdev is replaced with a new disk.
-	 */
 	if (nvlist_lookup_string(vdev, ZPOOL_CONFIG_PATH, &path) != 0)
 		return;

@ -233,12 +214,8 @@ zfs_process_add(zpool_handle_t *zhp, nvlist_t *vdev, boolean_t labeled)
 	}

 	(void) nvlist_lookup_string(vdev, ZPOOL_CONFIG_PHYS_PATH, &physpath);
-
-	update_vdev_config_dev_sysfs_path(vdev, path,
-	    ZPOOL_CONFIG_VDEV_ENC_SYSFS_PATH);
 	(void) nvlist_lookup_string(vdev, ZPOOL_CONFIG_VDEV_ENC_SYSFS_PATH,
 	    &enc_sysfs_path);
-
 	(void) nvlist_lookup_uint64(vdev, ZPOOL_CONFIG_WHOLE_DISK, &wholedisk);
 	(void) nvlist_lookup_uint64(vdev, ZPOOL_CONFIG_OFFLINE, &offline);
 	(void) nvlist_lookup_uint64(vdev, ZPOOL_CONFIG_FAULTED, &faulted);
@ -380,17 +357,15 @@ zfs_process_add(zpool_handle_t *zhp, nvlist_t *vdev, boolean_t labeled)
 	(void) snprintf(rawpath, sizeof (rawpath), "%s%s",
 	    is_sd ? DEV_BYVDEV_PATH : DEV_BYPATH_PATH, physpath);

-	if (realpath(rawpath, pathbuf) == NULL && !is_mpath_wholedisk) {
+	if (realpath(rawpath, devpath) == NULL && !is_mpath_wholedisk) {
 		zed_log_msg(LOG_INFO, "  realpath: %s failed (%s)",
 		    rawpath, strerror(errno));

-		int err = zpool_vdev_online(zhp, fullpath,
-		    ZFS_ONLINE_FORCEFAULT, &newstate);
+		(void) zpool_vdev_online(zhp, fullpath, ZFS_ONLINE_FORCEFAULT,
+		    &newstate);

-		zed_log_msg(LOG_INFO, "  zpool_vdev_online: %s FORCEFAULT (%s) "
-		    "err %d, new state %d",
-		    fullpath, libzfs_error_description(g_zfshdl), err,
-		    err ? (int)newstate : 0);
+		zed_log_msg(LOG_INFO, "  zpool_vdev_online: %s FORCEFAULT (%s)",
+		    fullpath, libzfs_error_description(g_zfshdl));
 		return;
 	}

@ -408,22 +383,6 @@ zfs_process_add(zpool_handle_t *zhp, nvlist_t *vdev, boolean_t labeled)

 	if (is_mpath_wholedisk) {
 		/* Don't label device mapper or multipath disks. */
-		zed_log_msg(LOG_INFO,
-		    "  it's a multipath wholedisk, don't label");
-		if (zpool_prepare_disk(zhp, vdev, "autoreplace", &lines,
-		    &lines_cnt) != 0) {
-			zed_log_msg(LOG_INFO,
-			    "  zpool_prepare_disk: could not "
-			    "prepare '%s' (%s)", fullpath,
-			    libzfs_error_description(g_zfshdl));
-			if (lines_cnt > 0) {
-				zed_log_msg(LOG_INFO,
-				    "  zfs_prepare_disk output:");
-				lines_to_zed_log_msg(lines, lines_cnt);
-			}
-			libzfs_free_str_array(lines, lines_cnt);
-			return;
-		}
 	} else if (!labeled) {
 		/*
 		 * we're auto-replacing a raw disk, so label it first
@ -440,24 +399,16 @@ zfs_process_add(zpool_handle_t *zhp, nvlist_t *vdev, boolean_t labeled)
 		 * to trigger a ZFS fault for the device (and any hot spare
 		 * replacement).
 		 */
-		leafname = strrchr(pathbuf, '/') + 1;
+		leafname = strrchr(devpath, '/') + 1;

 		/*
 		 * If this is a request to label a whole disk, then attempt to
 		 * write out the label.
 		 */
-		if (zpool_prepare_and_label_disk(g_zfshdl, zhp, leafname,
-		    vdev, "autoreplace", &lines, &lines_cnt) != 0) {
-			zed_log_msg(LOG_WARNING,
-			    "  zpool_prepare_and_label_disk: could not "
+		if (zpool_label_disk(g_zfshdl, zhp, leafname) != 0) {
+			zed_log_msg(LOG_INFO, "  zpool_label_disk: could not "
 			    "label '%s' (%s)", leafname,
 			    libzfs_error_description(g_zfshdl));
-			if (lines_cnt > 0) {
-				zed_log_msg(LOG_INFO,
-				"  zfs_prepare_disk output:");
-				lines_to_zed_log_msg(lines, lines_cnt);
-			}
-			libzfs_free_str_array(lines, lines_cnt);

 			(void) zpool_vdev_online(zhp, fullpath,
 			    ZFS_ONLINE_FORCEFAULT, &newstate);
@ -480,7 +431,7 @@ zfs_process_add(zpool_handle_t *zhp, nvlist_t *vdev, boolean_t labeled)
 		    sizeof (device->pd_physpath));
 		list_insert_tail(&g_device_list, device);

-		zed_log_msg(LOG_NOTICE, "  zpool_label_disk: async '%s' (%llu)",
+		zed_log_msg(LOG_INFO, "  zpool_label_disk: async '%s' (%llu)",
 		    leafname, (u_longlong_t)guid);

 		return;	/* resumes at EC_DEV_ADD.ESC_DISK for partition */
@ -503,8 +454,8 @@ zfs_process_add(zpool_handle_t *zhp, nvlist_t *vdev, boolean_t labeled)
 		}
 		if (!found) {
 			/* unexpected partition slice encountered */
-			zed_log_msg(LOG_WARNING, "labeled disk %s was "
-			    "unexpected here", fullpath);
+			zed_log_msg(LOG_INFO, "labeled disk %s unexpected here",
+			    fullpath);
 			(void) zpool_vdev_online(zhp, fullpath,
 			    ZFS_ONLINE_FORCEFAULT, &newstate);
 			return;
@ -513,20 +464,9 @@ zfs_process_add(zpool_handle_t *zhp, nvlist_t *vdev, boolean_t labeled)
 		zed_log_msg(LOG_INFO, "  zpool_label_disk: resume '%s' (%llu)",
 		    physpath, (u_longlong_t)guid);

-		/*
-		 * Paths that begin with '/dev/disk/by-id/' will change and so
-		 * they must be updated before calling zpool_vdev_attach().
-		 */
-		if (strncmp(path, DEV_BYID_PATH, strlen(DEV_BYID_PATH)) == 0) {
-			(void) snprintf(pathbuf, sizeof (pathbuf), "%s%s",
+		(void) snprintf(devpath, sizeof (devpath), "%s%s",
 		    DEV_BYID_PATH, new_devid);
-			zed_log_msg(LOG_INFO, "  zpool_label_disk: path '%s' "
-			    "replaced by '%s'", path, pathbuf);
-			path = pathbuf;
 	}
-	}
-
-	libzfs_free_str_array(lines, lines_cnt);

 	/*
 	 * Construct the root vdev to pass to zpool_vdev_attach().  While adding
@ -566,11 +506,9 @@ zfs_process_add(zpool_handle_t *zhp, nvlist_t *vdev, boolean_t labeled)
 	 * Wait for udev to verify the links exist, then auto-replace
 	 * the leaf disk at same physical location.
 	 */
-	if (zpool_label_disk_wait(path, DISK_LABEL_WAIT) != 0) {
-		zed_log_msg(LOG_WARNING, "zfs_mod: pool '%s', after labeling "
-		    "replacement disk, the expected disk partition link '%s' "
-		    "is missing after waiting %u ms",
-		    zpool_get_name(zhp), path, DISK_LABEL_WAIT);
+	if (zpool_label_disk_wait(path, 3000) != 0) {
+		zed_log_msg(LOG_WARNING, "zfs_mod: expected replacement "
+		    "disk %s is missing", path);
 		nvlist_free(nvroot);
 		return;
 	}
@ -585,7 +523,7 @@ zfs_process_add(zpool_handle_t *zhp, nvlist_t *vdev, boolean_t labeled)
 		    B_TRUE, B_FALSE);
 	}

-	zed_log_msg(LOG_WARNING, "  zpool_vdev_replace: %s with %s (%s)",
+	zed_log_msg(LOG_INFO, "  zpool_vdev_replace: %s with %s (%s)",
 	    fullpath, path, (ret == 0) ? "no errors" :
 	    libzfs_error_description(g_zfshdl));

@ -683,7 +621,7 @@ zfs_iter_vdev(zpool_handle_t *zhp, nvlist_t *nvl, void *data)
 		    dp->dd_prop, path);
 		dp->dd_found = B_TRUE;

-		/* pass the new devid for use by auto-replacing code */
+		/* pass the new devid for use by replacing code */
 		if (dp->dd_new_devid != NULL) {
 			(void) nvlist_add_string(nvl, "new_devid",
 			    dp->dd_new_devid);
--- a/cmd/zed/agents/zfs_retire.c
+++ b/cmd/zed/agents/zfs_retire.c
@ -523,9 +523,6 @@ zfs_retire_recv(fmd_hdl_t *hdl, fmd_event_t *ep, nvlist_t *nvl,
 		} else if (fmd_nvl_class_match(hdl, fault,
 		    "fault.fs.zfs.vdev.checksum")) {
 			degrade_device = B_TRUE;
-		} else if (fmd_nvl_class_match(hdl, fault,
-		    "fault.fs.zfs.vdev.slow_io")) {
-			degrade_device = B_TRUE;
 		} else if (fmd_nvl_class_match(hdl, fault,
 		    "fault.fs.zfs.device")) {
 			fault_device = B_FALSE;
--- a/cmd/zed/zed.d/statechange-slot_off.sh
+++ b/cmd/zed/zed.d/statechange-slot_off.sh
@ -5,7 +5,7 @@
 #
 # Bad SCSI disks can often "disappear and reappear" causing all sorts of chaos
 # as they flip between FAULTED and ONLINE.  If
-# ZED_POWER_OFF_ENCLOSURE_SLOT_ON_FAULT is set in zed.rc, and the disk gets
+# ZED_POWER_OFF_ENCLOUSRE_SLOT_ON_FAULT is set in zed.rc, and the disk gets
 # FAULTED, then power down the slot via sysfs:
 #
 # /sys/class/enclosure/<enclosure>/<slot>/power_status
@ -19,7 +19,7 @@
 # Exit codes:
 #   0: slot successfully powered off
 #   1: enclosure not available
-#   2: ZED_POWER_OFF_ENCLOSURE_SLOT_ON_FAULT disabled
+#   2: ZED_POWER_OFF_ENCLOUSRE_SLOT_ON_FAULT disabled
 #   3: vdev was not FAULTED
 #   4: The enclosure sysfs path passed from ZFS does not exist
 #   5: Enclosure slot didn't actually turn off after we told it to
@ -32,7 +32,7 @@ if [ ! -d /sys/class/enclosure ] ; then
 	exit 1
 fi

-if [ "${ZED_POWER_OFF_ENCLOSURE_SLOT_ON_FAULT}" != "1" ] ; then
+if [ "${ZED_POWER_OFF_ENCLOUSRE_SLOT_ON_FAULT}" != "1" ] ; then
 	exit 2
 fi

--- a/cmd/zed/zed.d/zed-functions.sh
+++ b/cmd/zed/zed.d/zed-functions.sh
@ -205,10 +205,6 @@ zed_notify()
    [ "${rv}" -eq 0 ] && num_success=$((num_success + 1))
    [ "${rv}" -eq 1 ] && num_failure=$((num_failure + 1))

-    zed_notify_ntfy "${subject}" "${pathname}"; rv=$?
-    [ "${rv}" -eq 0 ] && num_success=$((num_success + 1))
-    [ "${rv}" -eq 1 ] && num_failure=$((num_failure + 1))
-
    [ "${num_success}" -gt 0 ] && return 0
    [ "${num_failure}" -gt 0 ] && return 1
    return 2
@ -531,100 +527,6 @@ zed_notify_pushover()
 }


-# zed_notify_ntfy (subject, pathname)
-#
-# Send a notification via Ntfy.sh <https://ntfy.sh/>.
-# The ntfy topic (ZED_NTFY_TOPIC) identifies the topic that the notification
-# will be sent to Ntfy.sh server. The ntfy url (ZED_NTFY_URL) defines the
-# self-hosted or provided hosted ntfy service location. The ntfy access token
-# <https://docs.ntfy.sh/publish/#access-tokens> (ZED_NTFY_ACCESS_TOKEN) reprsents an
-# access token that could be used if a topic is read/write protected. If a
-# topic can be written to publicaly, a ZED_NTFY_ACCESS_TOKEN is not required.
-#
-# Requires curl and sed executables to be installed in the standard PATH.
-#
-# References
-#   https://docs.ntfy.sh
-#
-# Arguments
-#   subject: notification subject
-#   pathname: pathname containing the notification message (OPTIONAL)
-#
-# Globals
-#   ZED_NTFY_TOPIC
-#   ZED_NTFY_ACCESS_TOKEN (OPTIONAL)
-#   ZED_NTFY_URL
-#
-# Return
-#   0: notification sent
-#   1: notification failed
-#   2: not configured
-#
-zed_notify_ntfy()
-{
-    local subject="$1"
-    local pathname="${2:-"/dev/null"}"
-    local msg_body
-    local msg_out
-    local msg_err
-
-    [ -n "${ZED_NTFY_TOPIC}" ] || return 2
-    local url="${ZED_NTFY_URL:-"https://ntfy.sh"}/${ZED_NTFY_TOPIC}"
-
-    if [ ! -r "${pathname}" ]; then
-        zed_log_err "ntfy cannot read \"${pathname}\""
-        return 1
-    fi
-
-    zed_check_cmd "curl" "sed" || return 1
-
-    # Read the message body in.
-    #
-    msg_body="$(cat "${pathname}")"
-
-    if [ -z "${msg_body}" ]
-    then
-        msg_body=$subject
-        subject=""
-    fi
-
-    # Send the POST request and check for errors.
-    #
-    if [ -n "${ZED_NTFY_ACCESS_TOKEN}" ]; then
-        msg_out="$( \
-        curl \
-        -u ":${ZED_NTFY_ACCESS_TOKEN}" \
-        -H "Title: ${subject}" \
-        -d "${msg_body}" \
-        -H "Priority: high" \
-        "${url}" \
-        2>/dev/null \
-        )"; rv=$?
-    else
-        msg_out="$( \
-        curl \
-        -H "Title: ${subject}" \
-        -d "${msg_body}" \
-        -H "Priority: high" \
-        "${url}" \
-        2>/dev/null \
-        )"; rv=$?
-    fi
-    if [ "${rv}" -ne 0 ]; then
-        zed_log_err "curl exit=${rv}"
-        return 1
-    fi
-    msg_err="$(echo "${msg_out}" \
-        | sed -n -e 's/.*"errors" *:.*\[\(.*\)\].*/\1/p')"
-    if [ -n "${msg_err}" ]; then
-        zed_log_err "ntfy \"${msg_err}"\"
-        return 1
-    fi
-    return 0
-}
-
-
-
 # zed_rate_limit (tag, [interval])
 #
 # Check whether an event of a given type [tag] has already occurred within the
--- a/cmd/zed/zed.d/zed.rc
+++ b/cmd/zed/zed.d/zed.rc
@ -146,26 +146,4 @@ ZED_SYSLOG_SUBCLASS_EXCLUDE="history_event"
 # Power off the drive's slot in the enclosure if it becomes FAULTED.  This can
 # help silence misbehaving drives.  This assumes your drive enclosure fully
 # supports slot power control via sysfs.
-#ZED_POWER_OFF_ENCLOSURE_SLOT_ON_FAULT=1
-
-##
-# Ntfy topic
-# This defines which topic will receive the ntfy notification.
-#  <https://docs.ntfy.sh/publish/>
-# Disabled by default; uncomment to enable.
-#ZED_NTFY_TOPIC=""
-
-##
-# Ntfy access token (optional for public topics)
-# This defines an access token which can be used
-# to allow you to authenticate when sending to topics
-# <https://docs.ntfy.sh/publish/#access-tokens>
-# Disabled by default; uncomment to enable.
-#ZED_NTFY_ACCESS_TOKEN=""
-
-##
-# Ntfy Service URL
-# This defines which service the ntfy call will be directed toward
-#  <https://docs.ntfy.sh/install/>
-# https://ntfy.sh by default; uncomment to enable an alternative service url.
-#ZED_NTFY_URL="https://ntfy.sh"
+#ZED_POWER_OFF_ENCLOUSRE_SLOT_ON_FAULT=1
--- a/cmd/zed/zed_event.c
+++ b/cmd/zed/zed_event.c
@ -35,7 +35,6 @@
 #include "zed_strings.h"

 #include "agents/zfs_agents.h"
-#include <libzutil.h>

 #define	MAXBUF	4096

@ -923,25 +922,6 @@ _zed_event_add_time_strings(uint64_t eid, zed_strings_t *zsp, int64_t etime[])
 	}
 }

-
-static void
-_zed_event_update_enc_sysfs_path(nvlist_t *nvl)
-{
-	const char *vdev_path;
-
-	if (nvlist_lookup_string(nvl, FM_EREPORT_PAYLOAD_ZFS_VDEV_PATH,
-	    &vdev_path) != 0) {
-		return; /* some other kind of event, ignore it */
-	}
-
-	if (vdev_path == NULL) {
-		return;
-	}
-
-	update_vdev_config_dev_sysfs_path(nvl, vdev_path,
-	    FM_EREPORT_PAYLOAD_ZFS_VDEV_ENC_SYSFS_PATH);
-}
-
 /*
 * Service the next zevent, blocking until one is available.
 */
@ -989,17 +969,6 @@ zed_event_service(struct zed_conf *zcp)
 		zed_log_msg(LOG_WARNING,
 		    "Failed to lookup zevent class (eid=%llu)", eid);
 	} else {
-		/*
-		 * Special case: If we can dynamically detect an enclosure sysfs
-		 * path, then use that value rather than the one stored in the
-		 * vd->vdev_enc_sysfs_path.  There have been rare cases where
-		 * vd->vdev_enc_sysfs_path becomes outdated.  However, there
-		 * will be other times when we can not dynamically detect the
-		 * sysfs path (like if a disk disappears) and have to rely on
-		 * the old value for things like turning on the fault LED.
-		 */
-		_zed_event_update_enc_sysfs_path(nvl);
-
 		/* let internal modules see this event first */
 		zfs_agent_post_event(class, NULL, nvl);

--- a/cmd/zfs/zfs_main.c
+++ b/cmd/zfs/zfs_main.c
@ -309,8 +309,7 @@ get_usage(zfs_help_t idx)
 		    "[filesystem|volume|snapshot] ...\n"));
 	case HELP_MOUNT:
 		return (gettext("\tmount\n"
-		    "\tmount [-flvO] [-o opts] <-a|-R filesystem|"
-		    "filesystem>\n"));
+		    "\tmount [-flvO] [-o opts] <-a | filesystem>\n"));
 	case HELP_PROMOTE:
 		return (gettext("\tpromote <clone-filesystem>\n"));
 	case HELP_RECEIVE:
@ -3673,25 +3672,15 @@ zfs_do_list(int argc, char **argv)

 			for (char *tok; (tok = strsep(&optarg, ",")); ) {
 				static const char *const type_subopts[] = {
-					"filesystem",
-					"fs",
-					"volume",
-					"vol",
-					"snapshot",
-					"snap",
+					"filesystem", "volume",
+					"snapshot", "snap",
 					"bookmark",
-					"all"
-				};
+					"all" };
 				static const int type_types[] = {
-					ZFS_TYPE_FILESYSTEM,
-					ZFS_TYPE_FILESYSTEM,
-					ZFS_TYPE_VOLUME,
-					ZFS_TYPE_VOLUME,
-					ZFS_TYPE_SNAPSHOT,
-					ZFS_TYPE_SNAPSHOT,
+					ZFS_TYPE_FILESYSTEM, ZFS_TYPE_VOLUME,
+					ZFS_TYPE_SNAPSHOT, ZFS_TYPE_SNAPSHOT,
 					ZFS_TYPE_BOOKMARK,
-					ZFS_TYPE_DATASET | ZFS_TYPE_BOOKMARK
-				};
+					ZFS_TYPE_DATASET | ZFS_TYPE_BOOKMARK };

 				for (c = 0; c < ARRAY_SIZE(type_subopts); ++c)
 					if (strcmp(tok, type_subopts[c]) == 0) {
@ -6751,8 +6740,6 @@ zfs_do_holds(int argc, char **argv)
 #define	MOUNT_TIME 1		/* seconds */

 typedef struct get_all_state {
-	char		**ga_datasets;
-	int		ga_count;
 	boolean_t	ga_verbose;
 	get_all_cb_t	*ga_cbp;
 } get_all_state_t;
@ -6799,35 +6786,19 @@ get_one_dataset(zfs_handle_t *zhp, void *data)
 	return (0);
 }

-static int
-get_recursive_datasets(zfs_handle_t *zhp, void *data)
-{
-	get_all_state_t *state = data;
-	int len = strlen(zfs_get_name(zhp));
-	for (int i = 0; i < state->ga_count; ++i) {
-		if (strcmp(state->ga_datasets[i], zfs_get_name(zhp)) == 0)
-			return (get_one_dataset(zhp, data));
-		else if ((strncmp(state->ga_datasets[i], zfs_get_name(zhp),
-		    len) == 0) && state->ga_datasets[i][len] == '/') {
-			(void) zfs_iter_filesystems_v2(zhp, 0,
-			    get_recursive_datasets, data);
-		}
-	}
-	zfs_close(zhp);
-	return (0);
-}
-
 static void
-get_all_datasets(get_all_state_t *state)
+get_all_datasets(get_all_cb_t *cbp, boolean_t verbose)
 {
-	if (state->ga_verbose)
-		set_progress_header(gettext("Reading ZFS config"));
-	if (state->ga_datasets == NULL)
-		(void) zfs_iter_root(g_zfs, get_one_dataset, state);
-	else
-		(void) zfs_iter_root(g_zfs, get_recursive_datasets, state);
+	get_all_state_t state = {
+	    .ga_verbose = verbose,
+	    .ga_cbp = cbp
+	};

-	if (state->ga_verbose)
+	if (verbose)
+		set_progress_header(gettext("Reading ZFS config"));
+	(void) zfs_iter_root(g_zfs, get_one_dataset, &state);
+
+	if (verbose)
 		finish_progress(gettext("done."));
 }

@ -7173,22 +7144,18 @@ static int
 share_mount(int op, int argc, char **argv)
 {
 	int do_all = 0;
-	int recursive = 0;
 	boolean_t verbose = B_FALSE;
 	int c, ret = 0;
 	char *options = NULL;
 	int flags = 0;

 	/* check options */
-	while ((c = getopt(argc, argv, op == OP_MOUNT ? ":aRlvo:Of" : "al"))
+	while ((c = getopt(argc, argv, op == OP_MOUNT ? ":alvo:Of" : "al"))
 	    != -1) {
 		switch (c) {
 		case 'a':
 			do_all = 1;
 			break;
-		case 'R':
-			recursive = 1;
-			break;
 		case 'v':
 			verbose = B_TRUE;
 			break;
@ -7230,7 +7197,7 @@ share_mount(int op, int argc, char **argv)
 	argv += optind;

 	/* check number of arguments */
-	if (do_all || recursive) {
+	if (do_all) {
 		enum sa_protocol protocol = SA_NO_PROTOCOL;

 		if (op == OP_SHARE && argc > 0) {
@ -7239,38 +7206,14 @@ share_mount(int op, int argc, char **argv)
 			argv++;
 		}

-		if (argc != 0 && do_all) {
+		if (argc != 0) {
 			(void) fprintf(stderr, gettext("too many arguments\n"));
 			usage(B_FALSE);
 		}

-		if (argc == 0 && recursive) {
-			(void) fprintf(stderr,
-			    gettext("no dataset provided\n"));
-			usage(B_FALSE);
-		}
-
 		start_progress_timer();
 		get_all_cb_t cb = { 0 };
-		get_all_state_t state = { 0 };
-		if (argc == 0) {
-			state.ga_datasets = NULL;
-			state.ga_count = -1;
-		} else {
-			zfs_handle_t *zhp;
-			for (int i = 0; i < argc; i++) {
-				zhp = zfs_open(g_zfs, argv[i],
-				    ZFS_TYPE_FILESYSTEM);
-				if (zhp == NULL)
-					usage(B_FALSE);
-				zfs_close(zhp);
-			}
-			state.ga_datasets = argv;
-			state.ga_count = argc;
-		}
-		state.ga_verbose = verbose;
-		state.ga_cbp = &cb;
-		get_all_datasets(&state);
+		get_all_datasets(&cb, verbose);

 		if (cb.cb_used == 0) {
 			free(options);
@ -7287,7 +7230,6 @@ share_mount(int op, int argc, char **argv)
 		pthread_mutex_init(&share_mount_state.sm_lock, NULL);

 		/* For a 'zfs share -a' operation start with a clean slate. */
-		if (op == OP_SHARE)
 		zfs_truncate_shares(NULL);

 		/*
--- a/cmd/zinject/zinject.c
+++ b/cmd/zinject/zinject.c
@ -1083,22 +1083,6 @@ main(int argc, char **argv)
 			libzfs_fini(g_zfs);
 			return (1);
 		}
-
-		if (record.zi_nlanes) {
-			switch (io_type) {
-			case ZIO_TYPE_READ:
-			case ZIO_TYPE_WRITE:
-			case ZIO_TYPES:
-				break;
-			default:
-				(void) fprintf(stderr, "I/O type for a delay "
-				    "must be 'read' or 'write'\n");
-				usage();
-				libzfs_fini(g_zfs);
-				return (1);
-			}
-		}
-
 		if (!error)
 			error = ENXIO;

--- a/cmd/zpool/compatibility.d/grub2
+++ b/cmd/zpool/compatibility.d/grub2
@ -1,9 +1,6 @@
 # Features which are supported by GRUB2
-allocation_classes
 async_destroy
-block_cloning
 bookmarks
-device_rebuild
 embedded_data
 empty_bpobj
 enabled_txg
@ -12,12 +9,6 @@ filesystem_limits
 hole_birth
 large_blocks
 livelist
-log_spacemap
 lz4_compress
-project_quota
-resilver_defer
 spacemap_histogram
-spacemap_v2
-userobj_accounting
-zilsaxattr
 zpool_checkpoint
--- a/cmd/zpool/compatibility.d/openzfsonosx-1.8.1
+++ b/cmd/zpool/compatibility.d/openzfsonosx-1.8.1
@ -6,6 +6,7 @@ edonr
 embedded_data
 empty_bpobj
 enabled_txg
+encryption
 extensible_dataset
 filesystem_limits
 hole_birth
--- a/cmd/zpool/os/freebsd/zpool_vdev_os.c
+++ b/cmd/zpool/os/freebsd/zpool_vdev_os.c
@ -124,24 +124,3 @@ check_file(const char *file, boolean_t force, boolean_t isspare)
 {
 	return (check_file_generic(file, force, isspare));
 }
-
-int
-zpool_power_current_state(zpool_handle_t *zhp, char *vdev)
-{
-
-	(void) zhp;
-	(void) vdev;
-	/* Enclosure slot power not supported on FreeBSD yet */
-	return (-1);
-}
-
-int
-zpool_power(zpool_handle_t *zhp, char *vdev, boolean_t turn_on)
-{
-
-	(void) zhp;
-	(void) vdev;
-	(void) turn_on;
-	/* Enclosure slot power not supported on FreeBSD yet */
-	return (ENOTSUP);
-}
--- a/cmd/zpool/os/linux/zpool_vdev_os.c
+++ b/cmd/zpool/os/linux/zpool_vdev_os.c
@ -416,258 +416,3 @@ check_file(const char *file, boolean_t force, boolean_t isspare)
 {
 	return (check_file_generic(file, force, isspare));
 }
-
-/*
- * Read from a sysfs file and return an allocated string.  Removes
- * the newline from the end of the string if there is one.
- *
- * Returns a string on success (which must be freed), or NULL on error.
- */
-static char *zpool_sysfs_gets(char *path)
-{
-	int fd;
-	struct stat statbuf;
-	char *buf = NULL;
-	ssize_t count = 0;
-	fd = open(path, O_RDONLY);
-	if (fd < 0)
-		return (NULL);
-
-	if (fstat(fd, &statbuf) != 0) {
-		close(fd);
-		return (NULL);
-	}
-
-	buf = calloc(statbuf.st_size + 1, sizeof (*buf));
-	if (buf == NULL) {
-		close(fd);
-		return (NULL);
-	}
-
-	/*
-	 * Note, we can read less bytes than st_size, and that's ok.  Sysfs
-	 * files will report their size is 4k even if they only return a small
-	 * string.
-	 */
-	count = read(fd, buf, statbuf.st_size);
-	if (count < 0) {
-		/* Error doing read() or we overran the buffer */
-		close(fd);
-		free(buf);
-		return (NULL);
-	}
-
-	/* Remove trailing newline */
-	if (count > 0 && buf[count - 1] == '\n')
-		buf[count - 1] = 0;
-
-	close(fd);
-
-	return (buf);
-}
-
-/*
- * Write a string to a sysfs file.
- *
- * Returns 0 on success, non-zero otherwise.
- */
-static int zpool_sysfs_puts(char *path, char *str)
-{
-	FILE *file;
-
-	file = fopen(path, "w");
-	if (!file) {
-		return (-1);
-	}
-
-	if (fputs(str, file) < 0) {
-		fclose(file);
-		return (-2);
-	}
-	fclose(file);
-	return (0);
-}
-
-/* Given a vdev nvlist_t, rescan its enclosure sysfs path */
-static void
-rescan_vdev_config_dev_sysfs_path(nvlist_t *vdev_nv)
-{
-	update_vdev_config_dev_sysfs_path(vdev_nv,
-	    fnvlist_lookup_string(vdev_nv, ZPOOL_CONFIG_PATH),
-	    ZPOOL_CONFIG_VDEV_ENC_SYSFS_PATH);
-}
-
-/*
- * Given a power string: "on", "off", "1", or "0", return 0 if it's an
- * off value, 1 if it's an on value, and -1 if the value is unrecognized.
- */
-static int zpool_power_parse_value(char *str)
-{
-	if ((strcmp(str, "off") == 0) || (strcmp(str, "0") == 0))
-		return (0);
-
-	if ((strcmp(str, "on") == 0) || (strcmp(str, "1") == 0))
-		return (1);
-
-	return (-1);
-}
-
-/*
- * Given a vdev string return an allocated string containing the sysfs path to
- * its power control file.  Also do a check if the power control file really
- * exists and has correct permissions.
- *
- * Example returned strings:
- *
- * /sys/class/enclosure/0:0:122:0/10/power_status
- * /sys/bus/pci/slots/10/power
- *
- * Returns allocated string on success (which must be freed), NULL on failure.
- */
-static char *
-zpool_power_sysfs_path(zpool_handle_t *zhp, char *vdev)
-{
-	const char *enc_sysfs_dir = NULL;
-	char *path = NULL;
-	nvlist_t *vdev_nv = zpool_find_vdev(zhp, vdev, NULL, NULL, NULL);
-
-	if (vdev_nv == NULL) {
-		return (NULL);
-	}
-
-	/* Make sure we're getting the updated enclosure sysfs path */
-	rescan_vdev_config_dev_sysfs_path(vdev_nv);
-
-	if (nvlist_lookup_string(vdev_nv, ZPOOL_CONFIG_VDEV_ENC_SYSFS_PATH,
-	    &enc_sysfs_dir) != 0) {
-		return (NULL);
-	}
-
-	if (asprintf(&path, "%s/power_status", enc_sysfs_dir) == -1)
-		return (NULL);
-
-	if (access(path, W_OK) != 0) {
-		free(path);
-		path = NULL;
-		/* No HDD 'power_control' file, maybe it's NVMe? */
-		if (asprintf(&path, "%s/power", enc_sysfs_dir) == -1) {
-			return (NULL);
-		}
-
-		if (access(path, R_OK | W_OK) != 0) {
-			/* Not NVMe either */
-			free(path);
-			return (NULL);
-		}
-	}
-
-	return (path);
-}
-
-/*
- * Given a path to a sysfs power control file, return B_TRUE if you should use
- * "on/off" words to control it, or B_FALSE otherwise ("0/1" to control).
- */
-static boolean_t
-zpool_power_use_word(char *sysfs_path)
-{
-	if (strcmp(&sysfs_path[strlen(sysfs_path) - strlen("power_status")],
-	    "power_status") == 0) {
-		return (B_TRUE);
-	}
-	return (B_FALSE);
-}
-
-/*
- * Check the sysfs power control value for a vdev.
- *
- * Returns:
- *  0 - Power is off
- *  1 - Power is on
- * -1 - Error or unsupported
- */
-int
-zpool_power_current_state(zpool_handle_t *zhp, char *vdev)
-{
-	char *val;
-	int rc;
-
-	char *path = zpool_power_sysfs_path(zhp, vdev);
-	if (path == NULL)
-		return (-1);
-
-	val = zpool_sysfs_gets(path);
-	if (val == NULL) {
-		free(path);
-		return (-1);
-	}
-
-	rc = zpool_power_parse_value(val);
-	free(val);
-	free(path);
-	return (rc);
-}
-
-/*
- * Turn on or off the slot to a device
- *
- * Device path is the full path to the device (like /dev/sda or /dev/sda1).
- *
- * Return code:
- * 0:		Success
- * ENOTSUP:	Power control not supported for OS
- * EBADSLT:	Couldn't read current power state
- * ENOENT:	No sysfs path to power control
- * EIO:	Couldn't write sysfs power value
- * EBADE:	Sysfs power value didn't change
- */
-int
-zpool_power(zpool_handle_t *zhp, char *vdev, boolean_t turn_on)
-{
-	char *sysfs_path;
-	const char *val;
-	int rc;
-	int timeout_ms;
-
-	rc = zpool_power_current_state(zhp, vdev);
-	if (rc == -1) {
-		return (EBADSLT);
-	}
-
-	/* Already correct value? */
-	if (rc == (int)turn_on)
-		return (0);
-
-	sysfs_path = zpool_power_sysfs_path(zhp, vdev);
-	if (sysfs_path == NULL)
-		return (ENOENT);
-
-	if (zpool_power_use_word(sysfs_path)) {
-		val = turn_on ? "on" : "off";
-	} else {
-		val = turn_on ? "1" : "0";
-	}
-
-	rc = zpool_sysfs_puts(sysfs_path, (char *)val);
-
-	free(sysfs_path);
-	if (rc != 0) {
-		return (EIO);
-	}
-
-	/*
-	 * Wait up to 30 seconds for sysfs power value to change after
-	 * writing it.
-	 */
-	timeout_ms = zpool_getenv_int("ZPOOL_POWER_ON_SLOT_TIMEOUT_MS", 30000);
-	for (int i = 0; i < MAX(1, timeout_ms / 200); i++) {
-		rc = zpool_power_current_state(zhp, vdev);
-		if (rc == (int)turn_on)
-			return (0);	/* success */
-
-		fsleep(0.200);	/* 200ms */
-	}
-
-	/* sysfs value never changed */
-	return (EBADE);
-}
--- a/cmd/zpool/zpool.d/ses
+++ b/cmd/zpool/zpool.d/ses
@ -33,18 +33,10 @@ for i in $scripts ; do
 	val=""
 	case $i in
 	enc)
-		if echo "$VDEV_ENC_SYSFS_PATH" | grep -q '/sys/bus/pci/slots' ; then
-			val="$VDEV_ENC_SYSFS_PATH"
-		else
-			val="$(ls """$VDEV_ENC_SYSFS_PATH/../../""" 2>/dev/null)"
-		fi
+		val=$(ls "$VDEV_ENC_SYSFS_PATH/../../" 2>/dev/null)
 		;;
 	slot)
-		if echo "$VDEV_ENC_SYSFS_PATH" | grep -q '/sys/bus/pci/slots' ; then
-			val="$(basename """$VDEV_ENC_SYSFS_PATH""")"
-		else
-			val="$(cat """$VDEV_ENC_SYSFS_PATH/slot""" 2>/dev/null)"
-		fi
+		val=$(cat "$VDEV_ENC_SYSFS_PATH/slot" 2>/dev/null)
 		;;
 	encdev)
 		val=$(ls "$VDEV_ENC_SYSFS_PATH/../device/scsi_generic" 2>/dev/null)
--- a/cmd/zpool/zpool_iter.c
+++ b/cmd/zpool/zpool_iter.c
@ -443,22 +443,37 @@ vdev_run_cmd(vdev_cmd_data_t *data, char *cmd)
 {
 	int rc;
 	char *argv[2] = {cmd};
-	char **env;
+	char *env[5] = {(char *)"PATH=/bin:/sbin:/usr/bin:/usr/sbin"};
 	char **lines = NULL;
 	int lines_cnt = 0;
 	int i;

-	env = zpool_vdev_script_alloc_env(data->pool, data->path, data->upath,
-	    data->vdev_enc_sysfs_path, NULL, NULL);
-	if (env == NULL)
+	/* Setup our custom environment variables */
+	rc = asprintf(&env[1], "VDEV_PATH=%s",
+	    data->path ? data->path : "");
+	if (rc == -1) {
+		env[1] = NULL;
 		goto out;
+	}
+
+	rc = asprintf(&env[2], "VDEV_UPATH=%s",
+	    data->upath ? data->upath : "");
+	if (rc == -1) {
+		env[2] = NULL;
+		goto out;
+	}
+
+	rc = asprintf(&env[3], "VDEV_ENC_SYSFS_PATH=%s",
+	    data->vdev_enc_sysfs_path ?
+	    data->vdev_enc_sysfs_path : "");
+	if (rc == -1) {
+		env[3] = NULL;
+		goto out;
+	}

 	/* Run the command */
 	rc = libzfs_run_process_get_stdout_nopath(cmd, argv, env, &lines,
 	    &lines_cnt);
-
-	zpool_vdev_script_free_env(env);
-
 	if (rc != 0)
 		goto out;

@ -470,6 +485,10 @@ vdev_run_cmd(vdev_cmd_data_t *data, char *cmd)
 out:
 	if (lines != NULL)
 		libzfs_free_str_array(lines, lines_cnt);
+
+	/* Start with i = 1 since env[0] was statically allocated */
+	for (i = 1; i < ARRAY_SIZE(env); i++)
+		free(env[i]);
 }

 /*
@ -554,10 +573,6 @@ for_each_vdev_run_cb(void *zhp_data, nvlist_t *nv, void *cb_vcdl)
 	if (nvlist_lookup_string(nv, ZPOOL_CONFIG_PATH, &path) != 0)
 		return (1);

-	/* Make sure we're getting the updated enclosure sysfs path */
-	update_vdev_config_dev_sysfs_path(nv, path,
-	    ZPOOL_CONFIG_VDEV_ENC_SYSFS_PATH);
-
 	nvlist_lookup_string(nv, ZPOOL_CONFIG_VDEV_ENC_SYSFS_PATH,
 	    &vdev_enc_sysfs_path);

--- a/cmd/zpool/zpool_main.c
+++ b/cmd/zpool/zpool_main.c
@ -22,7 +22,7 @@
 /*
 * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
 * Copyright 2011 Nexenta Systems, Inc. All rights reserved.
- * Copyright (c) 2011, 2024 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2020 by Delphix. All rights reserved.
 * Copyright (c) 2012 by Frederik Wessels. All rights reserved.
 * Copyright (c) 2012 by Cyril Plisko. All rights reserved.
 * Copyright (c) 2013 by Prasad Joshi (sTec). All rights reserved.
@ -131,13 +131,6 @@ static int zpool_do_help(int argc, char **argv);
 static zpool_compat_status_t zpool_do_load_compat(
    const char *, boolean_t *);

-enum zpool_options {
-	ZPOOL_OPTION_POWER = 1024,
-	ZPOOL_OPTION_ALLOW_INUSE,
-	ZPOOL_OPTION_ALLOW_REPLICATION_MISMATCH,
-	ZPOOL_OPTION_ALLOW_ASHIFT_MISMATCH
-};
-
 /*
 * These libumem hooks provide a reasonable set of defaults for the allocator's
 * debugging facilities.
@ -354,13 +347,13 @@ get_usage(zpool_help_t idx)
 {
 	switch (idx) {
 	case HELP_ADD:
-		return (gettext("\tadd [-afgLnP] [-o property=value] "
+		return (gettext("\tadd [-fgLnP] [-o property=value] "
 		    "<pool> <vdev> ...\n"));
 	case HELP_ATTACH:
 		return (gettext("\tattach [-fsw] [-o property=value] "
 		    "<pool> <device> <new-device>\n"));
 	case HELP_CLEAR:
-		return (gettext("\tclear [[--power]|[-nF]] <pool> [device]\n"));
+		return (gettext("\tclear [-nF] <pool> [device]\n"));
 	case HELP_CREATE:
 		return (gettext("\tcreate [-fnd] [-o property=value] ... \n"
 		    "\t    [-O file-system-property=value] ... \n"
@ -396,11 +389,9 @@ get_usage(zpool_help_t idx)
 		    "[-T d|u] [pool] ... \n"
 		    "\t    [interval [count]]\n"));
 	case HELP_OFFLINE:
-		return (gettext("\toffline [--power]|[[-f][-t]] <pool> "
-		    "<device> ...\n"));
+		return (gettext("\toffline [-f] [-t] <pool> <device> ...\n"));
 	case HELP_ONLINE:
-		return (gettext("\tonline [--power][-e] <pool> <device> "
-		    "...\n"));
+		return (gettext("\tonline [-e] <pool> <device> ...\n"));
 	case HELP_REPLACE:
 		return (gettext("\treplace [-fsw] [-o property=value] "
 		    "<pool> <device> [new-device]\n"));
@ -419,8 +410,8 @@ get_usage(zpool_help_t idx)
 		return (gettext("\ttrim [-dw] [-r <rate>] [-c | -s] <pool> "
 		    "[<device> ...]\n"));
 	case HELP_STATUS:
-		return (gettext("\tstatus [--power] [-c [script1,script2,...]] "
-		    "[-DegiLpPstvx] [-T d|u] [pool] ...\n"
+		return (gettext("\tstatus [-c [script1,script2,...]] "
+		    "[-igLpPstvxD]  [-T d|u] [pool] ... \n"
 		    "\t    [interval [count]]\n"));
 	case HELP_UPGRADE:
 		return (gettext("\tupgrade\n"
@ -525,77 +516,6 @@ print_vdev_prop_cb(int prop, void *cb)
 	return (ZPROP_CONT);
 }

-/*
- * Given a leaf vdev name like 'L5' return its VDEV_CONFIG_PATH like
- * '/dev/disk/by-vdev/L5'.
- */
-static const char *
-vdev_name_to_path(zpool_handle_t *zhp, char *vdev)
-{
-	nvlist_t *vdev_nv = zpool_find_vdev(zhp, vdev, NULL, NULL, NULL);
-	if (vdev_nv == NULL) {
-		return (NULL);
-	}
-	return (fnvlist_lookup_string(vdev_nv, ZPOOL_CONFIG_PATH));
-}
-
-static int
-zpool_power_on(zpool_handle_t *zhp, char *vdev)
-{
-	return (zpool_power(zhp, vdev, B_TRUE));
-}
-
-static int
-zpool_power_on_and_disk_wait(zpool_handle_t *zhp, char *vdev)
-{
-	int rc;
-
-	rc = zpool_power_on(zhp, vdev);
-	if (rc != 0)
-		return (rc);
-
-	zpool_disk_wait(vdev_name_to_path(zhp, vdev));
-
-	return (0);
-}
-
-static int
-zpool_power_on_pool_and_wait_for_devices(zpool_handle_t *zhp)
-{
-	nvlist_t *nv;
-	const char *path = NULL;
-	int rc;
-
-	/* Power up all the devices first */
-	FOR_EACH_REAL_LEAF_VDEV(zhp, nv) {
-		path = fnvlist_lookup_string(nv, ZPOOL_CONFIG_PATH);
-		if (path != NULL) {
-			rc = zpool_power_on(zhp, (char *)path);
-			if (rc != 0) {
-				return (rc);
-			}
-		}
-	}
-
-	/*
-	 * Wait for their devices to show up.  Since we powered them on
-	 * at roughly the same time, they should all come online around
-	 * the same time.
-	 */
-	FOR_EACH_REAL_LEAF_VDEV(zhp, nv) {
-		path = fnvlist_lookup_string(nv, ZPOOL_CONFIG_PATH);
-		zpool_disk_wait(path);
-	}
-
-	return (0);
-}
-
-static int
-zpool_power_off(zpool_handle_t *zhp, char *vdev)
-{
-	return (zpool_power(zhp, vdev, B_FALSE));
-}
-
 /*
 * Display usage message.  If we're inside a command, display only the usage for
 * that command.  Otherwise, iterate over the entire command table and display
@ -1016,9 +936,8 @@ add_prop_list_default(const char *propname, const char *propval,
 }

 /*
- * zpool add [-afgLnP] [-o property=value] <pool> <vdev> ...
+ * zpool add [-fgLnP] [-o property=value] <pool> <vdev> ...
 *
- *	-a	Disable the ashift validation checks
 *	-f	Force addition of devices, even if they appear in use
 *	-g	Display guid for individual vdev name.
 *	-L	Follow links when resolving vdev path name.
@ -1034,11 +953,8 @@ add_prop_list_default(const char *propname, const char *propval,
 int
 zpool_do_add(int argc, char **argv)
 {
-	boolean_t check_replication = B_TRUE;
-	boolean_t check_inuse = B_TRUE;
-	boolean_t dryrun = B_FALSE;
-	boolean_t check_ashift = B_TRUE;
 	boolean_t force = B_FALSE;
+	boolean_t dryrun = B_FALSE;
 	int name_flags = 0;
 	int c;
 	nvlist_t *nvroot;
@ -1049,18 +965,8 @@ zpool_do_add(int argc, char **argv)
 	nvlist_t *props = NULL;
 	char *propval;

-	struct option long_options[] = {
-		{"allow-in-use", no_argument, NULL, ZPOOL_OPTION_ALLOW_INUSE},
-		{"allow-replication-mismatch", no_argument, NULL,
-		    ZPOOL_OPTION_ALLOW_REPLICATION_MISMATCH},
-		{"allow-ashift-mismatch", no_argument, NULL,
-		    ZPOOL_OPTION_ALLOW_ASHIFT_MISMATCH},
-		{0, 0, 0, 0}
-	};
-
 	/* check options */
-	while ((c = getopt_long(argc, argv, "fgLno:P", long_options, NULL))
-	    != -1) {
+	while ((c = getopt(argc, argv, "fgLno:P")) != -1) {
 		switch (c) {
 		case 'f':
 			force = B_TRUE;
@ -1090,15 +996,6 @@ zpool_do_add(int argc, char **argv)
 		case 'P':
 			name_flags |= VDEV_NAME_PATH;
 			break;
-		case ZPOOL_OPTION_ALLOW_INUSE:
-			check_inuse = B_FALSE;
-			break;
-		case ZPOOL_OPTION_ALLOW_REPLICATION_MISMATCH:
-			check_replication = B_FALSE;
-			break;
-		case ZPOOL_OPTION_ALLOW_ASHIFT_MISMATCH:
-			check_ashift = B_FALSE;
-			break;
 		case '?':
 			(void) fprintf(stderr, gettext("invalid option '%c'\n"),
 			    optopt);
@ -1119,19 +1016,6 @@ zpool_do_add(int argc, char **argv)
 		usage(B_FALSE);
 	}

-	if (force) {
-		if (!check_inuse || !check_replication || !check_ashift) {
-			(void) fprintf(stderr, gettext("'-f' option is not "
-			    "allowed with '--allow-replication-mismatch', "
-			    "'--allow-ashift-mismatch', or "
-			    "'--allow-in-use'\n"));
-			usage(B_FALSE);
-		}
-		check_inuse = B_FALSE;
-		check_replication = B_FALSE;
-		check_ashift = B_FALSE;
-	}
-
 	poolname = argv[0];

 	argc--;
@ -1162,8 +1046,8 @@ zpool_do_add(int argc, char **argv)
 	}

 	/* pass off to make_root_vdev for processing */
-	nvroot = make_root_vdev(zhp, props, !check_inuse,
-	    check_replication, B_FALSE, dryrun, argc, argv);
+	nvroot = make_root_vdev(zhp, props, force, !force, B_FALSE, dryrun,
+	    argc, argv);
 	if (nvroot == NULL) {
 		zpool_close(zhp);
 		return (1);
@ -1267,7 +1151,7 @@ zpool_do_add(int argc, char **argv)

 		ret = 0;
 	} else {
-		ret = (zpool_add(zhp, nvroot, check_ashift) != 0);
+		ret = (zpool_add(zhp, nvroot) != 0);
 	}

 	nvlist_free(props);
@ -2204,13 +2088,11 @@ typedef struct status_cbdata {
 	boolean_t	cb_explain;
 	boolean_t	cb_first;
 	boolean_t	cb_dedup_stats;
-	boolean_t	cb_print_unhealthy;
 	boolean_t	cb_print_status;
 	boolean_t	cb_print_slow_ios;
 	boolean_t	cb_print_vdev_init;
 	boolean_t	cb_print_vdev_trim;
 	vdev_cmd_data_list_t	*vcdl;
-	boolean_t	cb_print_power;
 } status_cbdata_t;

 /* Return 1 if string is NULL, empty, or whitespace; return 0 otherwise. */
@ -2289,6 +2171,7 @@ print_status_initialize(vdev_stat_t *vs, boolean_t verbose)
 		    !vs->vs_scan_removing) {
 			char zbuf[1024];
 			char tbuf[256];
+			struct tm zaction_ts;

 			time_t t = vs->vs_initialize_action_time;
 			int initialize_pct = 100;
@ -2298,8 +2181,8 @@ print_status_initialize(vdev_stat_t *vs, boolean_t verbose)
 				    100 / (vs->vs_initialize_bytes_est + 1));
 			}

-			(void) ctime_r(&t, tbuf);
-			tbuf[24] = 0;
+			(void) localtime_r(&t, &zaction_ts);
+			(void) strftime(tbuf, sizeof (tbuf), "%c", &zaction_ts);

 			switch (vs->vs_initialize_state) {
 			case VDEV_INITIALIZE_SUSPENDED:
@ -2339,6 +2222,7 @@ print_status_trim(vdev_stat_t *vs, boolean_t verbose)
 		    !vs->vs_scan_removing) {
 			char zbuf[1024];
 			char tbuf[256];
+			struct tm zaction_ts;

 			time_t t = vs->vs_trim_action_time;
 			int trim_pct = 100;
@ -2347,8 +2231,8 @@ print_status_trim(vdev_stat_t *vs, boolean_t verbose)
 				    100 / (vs->vs_trim_bytes_est + 1));
 			}

-			(void) ctime_r(&t, tbuf);
-			tbuf[24] = 0;
+			(void) localtime_r(&t, &zaction_ts);
+			(void) strftime(tbuf, sizeof (tbuf), "%c", &zaction_ts);

 			switch (vs->vs_trim_state) {
 			case VDEV_TRIM_SUSPENDED:
@ -2399,35 +2283,6 @@ health_str_to_color(const char *health)
 	return (NULL);
 }

-/*
- * Called for each leaf vdev.  Returns 0 if the vdev is healthy.
- * A vdev is unhealthy if any of the following are true:
- * 1) there are read, write, or checksum errors,
- * 2) its state is not ONLINE, or
- * 3) slow IO reporting was requested (-s) and there are slow IOs.
- */
-static int
-vdev_health_check_cb(void *hdl_data, nvlist_t *nv, void *data)
-{
-	status_cbdata_t *cb = data;
-	vdev_stat_t *vs;
-	uint_t vsc;
-	(void) hdl_data;
-
-	if (nvlist_lookup_uint64_array(nv, ZPOOL_CONFIG_VDEV_STATS,
-	    (uint64_t **)&vs, &vsc) != 0)
-		return (1);
-
-	if (vs->vs_checksum_errors || vs->vs_read_errors ||
-	    vs->vs_write_errors || vs->vs_state != VDEV_STATE_HEALTHY)
-		return (1);
-
-	if (cb->cb_print_slow_ios && vs->vs_slow_ios)
-		return (1);
-
-	return (0);
-}
-
 /*
 * Print out configuration state as requested by status_callback.
 */
@ -2446,8 +2301,7 @@ print_status_config(zpool_handle_t *zhp, status_cbdata_t *cb, const char *name,
 	const char *state;
 	const char *type;
 	const char *path = NULL;
-	const char *rcolor = NULL, *wcolor = NULL, *ccolor = NULL,
-	    *scolor = NULL;
+	const char *rcolor = NULL, *wcolor = NULL, *ccolor = NULL;

 	if (nvlist_lookup_nvlist_array(nv, ZPOOL_CONFIG_CHILDREN,
 	    &child, &children) != 0)
@ -2474,15 +2328,6 @@ print_status_config(zpool_handle_t *zhp, status_cbdata_t *cb, const char *name,
 			state = gettext("AVAIL");
 	}

-	/*
-	 * If '-e' is specified then top-level vdevs and their children
-	 * can be pruned if all of their leaves are healthy.
-	 */
-	if (cb->cb_print_unhealthy && depth > 0 &&
-	    for_each_vdev_in_nvlist(nv, vdev_health_check_cb, cb) == 0) {
-		return;
-	}
-
 	printf_color(health_str_to_color(state),
 	    "\t%*s%-*s  %-8s", depth, "", cb->cb_namewidth - depth,
 	    name, state);
@ -2497,9 +2342,6 @@ print_status_config(zpool_handle_t *zhp, status_cbdata_t *cb, const char *name,
 		if (vs->vs_checksum_errors)
 			ccolor = ANSI_RED;

-		if (vs->vs_slow_ios)
-			scolor = ANSI_BLUE;
-
 		if (cb->cb_literal) {
 			fputc(' ', stdout);
 			printf_color(rcolor, "%5llu",
@ -2532,30 +2374,9 @@ print_status_config(zpool_handle_t *zhp, status_cbdata_t *cb, const char *name,
 			}

 			if (cb->cb_literal)
-				printf_color(scolor, " %5llu",
-				    (u_longlong_t)vs->vs_slow_ios);
+				printf(" %5llu", (u_longlong_t)vs->vs_slow_ios);
 			else
-				printf_color(scolor, " %5s", rbuf);
-		}
-		if (cb->cb_print_power) {
-			if (children == 0)  {
-				/* Only leaf vdevs have physical slots */
-				switch (zpool_power_current_state(zhp, (char *)
-				    fnvlist_lookup_string(nv,
-				    ZPOOL_CONFIG_PATH))) {
-				case 0:
-					printf_color(ANSI_RED, " %5s",
-					    gettext("off"));
-					break;
-				case 1:
-					printf(" %5s", gettext("on"));
-					break;
-				default:
-					printf(" %5s", "-");
-				}
-			} else {
-				printf(" %5s", "-");
-			}
+				printf(" %5s", rbuf);
 		}
 	}

@ -2610,13 +2431,7 @@ print_status_config(zpool_handle_t *zhp, status_cbdata_t *cb, const char *name,
 			break;

 		case VDEV_AUX_ERR_EXCEEDED:
-			if (vs->vs_read_errors + vs->vs_write_errors +
-			    vs->vs_checksum_errors == 0 && children == 0 &&
-			    vs->vs_slow_ios > 0) {
-				(void) printf(gettext("too many slow I/Os"));
-			} else {
 			(void) printf(gettext("too many errors"));
-			}
 			break;

 		case VDEV_AUX_IO_FAILURE:
@ -3443,10 +3258,10 @@ do_import(nvlist_t *config, const char *newname, const char *mntopts,
 		ms_status = zpool_enable_datasets(zhp, mntopts, 0);
 		if (ms_status == EZFS_SHAREFAILED) {
 			(void) fprintf(stderr, gettext("Import was "
-			    "successful, but unable to share some datasets\n"));
+			    "successful, but unable to share some datasets"));
 		} else if (ms_status == EZFS_MOUNTFAILED) {
 			(void) fprintf(stderr, gettext("Import was "
-			    "successful, but unable to mount some datasets\n"));
+			    "successful, but unable to mount some datasets"));
 		}
 	}

@ -5613,6 +5428,19 @@ get_interval_count_filter_guids(int *argc, char **argv, float *interval,
 	    interval, count);
 }

+/*
+ * Floating point sleep().  Allows you to pass in a floating point value for
+ * seconds.
+ */
+static void
+fsleep(float sec)
+{
+	struct timespec req;
+	req.tv_sec = floor(sec);
+	req.tv_nsec = (sec - (float)req.tv_sec) * NANOSEC;
+	nanosleep(&req, NULL);
+}
+
 /*
 * Terminal height, in rows. Returns -1 if stdout is not connected to a TTY or
 * if we were unable to determine its size.
@ -7112,10 +6940,9 @@ zpool_do_split(int argc, char **argv)
 }


+
 /*
- * zpool online [--power] <pool> <device> ...
- *
- * --power: Power on the enclosure slot to the drive (if possible)
+ * zpool online <pool> <device> ...
 */
 int
 zpool_do_online(int argc, char **argv)
@ -7126,21 +6953,13 @@ zpool_do_online(int argc, char **argv)
 	int ret = 0;
 	vdev_state_t newstate;
 	int flags = 0;
-	boolean_t is_power_on = B_FALSE;
-	struct option long_options[] = {
-		{"power", no_argument, NULL, ZPOOL_OPTION_POWER},
-		{0, 0, 0, 0}
-	};

 	/* check options */
-	while ((c = getopt_long(argc, argv, "e", long_options, NULL)) != -1) {
+	while ((c = getopt(argc, argv, "e")) != -1) {
 		switch (c) {
 		case 'e':
 			flags |= ZFS_ONLINE_EXPAND;
 			break;
-		case ZPOOL_OPTION_POWER:
-			is_power_on = B_TRUE;
-			break;
 		case '?':
 			(void) fprintf(stderr, gettext("invalid option '%c'\n"),
 			    optopt);
@ -7148,9 +6967,6 @@ zpool_do_online(int argc, char **argv)
 		}
 	}

-	if (libzfs_envvar_is_set("ZPOOL_AUTO_POWER_ON_SLOT"))
-		is_power_on = B_TRUE;
-
 	argc -= optind;
 	argv += optind;

@ -7172,18 +6988,6 @@ zpool_do_online(int argc, char **argv)
 	for (i = 1; i < argc; i++) {
 		vdev_state_t oldstate;
 		boolean_t avail_spare, l2cache;
-		int rc;
-
-		if (is_power_on) {
-			rc = zpool_power_on_and_disk_wait(zhp, argv[i]);
-			if (rc == ENOTSUP) {
-				(void) fprintf(stderr,
-				    gettext("Power control not supported\n"));
-			}
-			if (rc != 0)
-				return (rc);
-		}
-
 		nvlist_t *tgt = zpool_find_vdev(zhp, argv[i], &avail_spare,
 		    &l2cache, NULL);
 		if (tgt == NULL) {
@ -7229,15 +7033,12 @@ zpool_do_online(int argc, char **argv)
 }

 /*
- * zpool offline [-ft]|[--power] <pool> <device> ...
- *
+ * zpool offline [-ft] <pool> <device> ...
 *
 *	-f	Force the device into a faulted state.
 *
 *	-t	Only take the device off-line temporarily.  The offline/faulted
 *		state will not be persistent across reboots.
- *
- *	--power Power off the enclosure slot to the drive (if possible)
 */
 int
 zpool_do_offline(int argc, char **argv)
@ -7248,15 +7049,9 @@ zpool_do_offline(int argc, char **argv)
 	int ret = 0;
 	boolean_t istmp = B_FALSE;
 	boolean_t fault = B_FALSE;
-	boolean_t is_power_off = B_FALSE;
-
-	struct option long_options[] = {
-		{"power", no_argument, NULL, ZPOOL_OPTION_POWER},
-		{0, 0, 0, 0}
-	};

 	/* check options */
-	while ((c = getopt_long(argc, argv, "ft", long_options, NULL)) != -1) {
+	while ((c = getopt(argc, argv, "ft")) != -1) {
 		switch (c) {
 		case 'f':
 			fault = B_TRUE;
@ -7264,9 +7059,6 @@ zpool_do_offline(int argc, char **argv)
 		case 't':
 			istmp = B_TRUE;
 			break;
-		case ZPOOL_OPTION_POWER:
-			is_power_off = B_TRUE;
-			break;
 		case '?':
 			(void) fprintf(stderr, gettext("invalid option '%c'\n"),
 			    optopt);
@ -7274,20 +7066,6 @@ zpool_do_offline(int argc, char **argv)
 		}
 	}

-	if (is_power_off && fault) {
-		(void) fprintf(stderr,
-		    gettext("-0 and -f cannot be used together\n"));
-		usage(B_FALSE);
-		return (1);
-	}
-
-	if (is_power_off && istmp) {
-		(void) fprintf(stderr,
-		    gettext("-0 and -t cannot be used together\n"));
-		usage(B_FALSE);
-		return (1);
-	}
-
 	argc -= optind;
 	argv += optind;

@ -7307,22 +7085,8 @@ zpool_do_offline(int argc, char **argv)
 		return (1);

 	for (i = 1; i < argc; i++) {
+		if (fault) {
 			uint64_t guid = zpool_vdev_path_to_guid(zhp, argv[i]);
-		if (is_power_off) {
-			/*
-			 * Note: we have to power off first, then set REMOVED,
-			 * or else zpool_vdev_set_removed_state() returns
-			 * EAGAIN.
-			 */
-			ret = zpool_power_off(zhp, argv[i]);
-			if (ret != 0) {
-				(void) fprintf(stderr, "%s %s %d\n",
-				    gettext("unable to power off slot for"),
-				    argv[i], ret);
-			}
-			zpool_vdev_set_removed_state(zhp, guid, VDEV_AUX_NONE);
-
-		} else if (fault) {
 			vdev_aux_t aux;
 			if (istmp == B_FALSE) {
 				/* Force the fault to persist across imports */
@ -7345,7 +7109,7 @@ zpool_do_offline(int argc, char **argv)
 }

 /*
- * zpool clear [-nF]|[--power] <pool> [device]
+ * zpool clear <pool> [device]
 *
 * Clear all errors associated with a pool or a particular device.
 */
@ -7357,20 +7121,13 @@ zpool_do_clear(int argc, char **argv)
 	boolean_t dryrun = B_FALSE;
 	boolean_t do_rewind = B_FALSE;
 	boolean_t xtreme_rewind = B_FALSE;
-	boolean_t is_power_on = B_FALSE;
 	uint32_t rewind_policy = ZPOOL_NO_REWIND;
 	nvlist_t *policy = NULL;
 	zpool_handle_t *zhp;
 	char *pool, *device;

-	struct option long_options[] = {
-		{"power", no_argument, NULL, ZPOOL_OPTION_POWER},
-		{0, 0, 0, 0}
-	};
-
 	/* check options */
-	while ((c = getopt_long(argc, argv, "FnX", long_options,
-	    NULL)) != -1) {
+	while ((c = getopt(argc, argv, "FnX")) != -1) {
 		switch (c) {
 		case 'F':
 			do_rewind = B_TRUE;
@ -7381,9 +7138,6 @@ zpool_do_clear(int argc, char **argv)
 		case 'X':
 			xtreme_rewind = B_TRUE;
 			break;
-		case ZPOOL_OPTION_POWER:
-			is_power_on = B_TRUE;
-			break;
 		case '?':
 			(void) fprintf(stderr, gettext("invalid option '%c'\n"),
 			    optopt);
@ -7391,9 +7145,6 @@ zpool_do_clear(int argc, char **argv)
 		}
 	}

-	if (libzfs_envvar_is_set("ZPOOL_AUTO_POWER_ON_SLOT"))
-		is_power_on = B_TRUE;
-
 	argc -= optind;
 	argv += optind;

@ -7434,14 +7185,6 @@ zpool_do_clear(int argc, char **argv)
 		return (1);
 	}

-	if (is_power_on) {
-		if (device == NULL) {
-			zpool_power_on_pool_and_wait_for_devices(zhp);
-		} else {
-			zpool_power_on_and_disk_wait(zhp, device);
-		}
-	}
-
 	if (zpool_clear(zhp, device, policy) != 0)
 		ret = 1;

@ -8910,7 +8653,7 @@ status_callback(zpool_handle_t *zhp, void *data)
 		printf_color(ANSI_BOLD, gettext("action: "));
 		printf_color(ANSI_YELLOW, gettext("Make sure the pool's devices"
 		    " are connected, then reboot your system and\n\timport the "
-		    "pool or run 'zpool clear' to resume the pool.\n"));
+		    "pool.\n"));
 		break;

 	case ZPOOL_STATUS_IO_FAILURE_WAIT:
@ -9058,10 +8801,6 @@ status_callback(zpool_handle_t *zhp, void *data)
 			printf_color(ANSI_BOLD, " %5s", gettext("SLOW"));
 		}

-		if (cbp->cb_print_power) {
-			printf_color(ANSI_BOLD, " %5s", gettext("POWER"));
-		}
-
 		if (cbp->vcdl != NULL)
 			print_cmd_columns(cbp->vcdl, 0);

@ -9089,11 +8828,9 @@ status_callback(zpool_handle_t *zhp, void *data)
 				(void) printf(gettext(
 				    "errors: No known data errors\n"));
 			} else if (!cbp->cb_verbose) {
-				color_start(ANSI_RED);
 				(void) printf(gettext("errors: %llu data "
 				    "errors, use '-v' for a list\n"),
 				    (u_longlong_t)nerr);
-				color_end();
 			} else {
 				print_error_log(zhp);
 			}
@ -9110,23 +8847,21 @@ status_callback(zpool_handle_t *zhp, void *data)
 }

 /*
- * zpool status [-c [script1,script2,...]] [-DegiLpPstvx] [--power] [-T d|u] ...
- *              [pool] [interval [count]]
+ * zpool status [-c [script1,script2,...]] [-igLpPstvx] [-T d|u] [pool] ...
+ *              [interval [count]]
 *
 *	-c CMD	For each vdev, run command CMD
- *	-D	Display dedup status (undocumented)
- *	-e	Display only unhealthy vdevs
- *	-g	Display guid for individual vdev name.
 *	-i	Display vdev initialization status.
+ *	-g	Display guid for individual vdev name.
 *	-L	Follow links when resolving vdev path name.
 *	-p	Display values in parsable (exact) format.
 *	-P	Display full path for vdev name.
 *	-s	Display slow IOs column.
- *	-t	Display vdev TRIM status.
- *	-T	Display a timestamp in date(1) or Unix format
 *	-v	Display complete error logs
 *	-x	Display only pools with potential problems
- *	--power	Display vdev enclosure slot power status
+ *	-D	Display dedup status (undocumented)
+ *	-t	Display vdev TRIM status.
+ *	-T	Display a timestamp in date(1) or Unix format
 *
 * Describes the health status of all pools or some subset.
 */
@ -9140,14 +8875,8 @@ zpool_do_status(int argc, char **argv)
 	status_cbdata_t cb = { 0 };
 	char *cmd = NULL;

-	struct option long_options[] = {
-		{"power", no_argument, NULL, ZPOOL_OPTION_POWER},
-		{0, 0, 0, 0}
-	};
-
 	/* check options */
-	while ((c = getopt_long(argc, argv, "c:DegiLpPstT:vx", long_options,
-	    NULL)) != -1) {
+	while ((c = getopt(argc, argv, "c:igLpPsvxDtT:")) != -1) {
 		switch (c) {
 		case 'c':
 			if (cmd != NULL) {
@ -9173,18 +8902,12 @@ zpool_do_status(int argc, char **argv)
 			}
 			cmd = optarg;
 			break;
-		case 'D':
-			cb.cb_dedup_stats = B_TRUE;
-			break;
-		case 'e':
-			cb.cb_print_unhealthy = B_TRUE;
+		case 'i':
+			cb.cb_print_vdev_init = B_TRUE;
 			break;
 		case 'g':
 			cb.cb_name_flags |= VDEV_NAME_GUID;
 			break;
-		case 'i':
-			cb.cb_print_vdev_init = B_TRUE;
-			break;
 		case 'L':
 			cb.cb_name_flags |= VDEV_NAME_FOLLOW_LINKS;
 			break;
@ -9197,20 +8920,20 @@ zpool_do_status(int argc, char **argv)
 		case 's':
 			cb.cb_print_slow_ios = B_TRUE;
 			break;
-		case 't':
-			cb.cb_print_vdev_trim = B_TRUE;
-			break;
-		case 'T':
-			get_timestamp_arg(*optarg);
-			break;
 		case 'v':
 			cb.cb_verbose = B_TRUE;
 			break;
 		case 'x':
 			cb.cb_explain = B_TRUE;
 			break;
-		case ZPOOL_OPTION_POWER:
-			cb.cb_print_power = B_TRUE;
+		case 'D':
+			cb.cb_dedup_stats = B_TRUE;
+			break;
+		case 't':
+			cb.cb_print_vdev_trim = B_TRUE;
+			break;
+		case 'T':
+			get_timestamp_arg(*optarg);
 			break;
 		case '?':
 			if (optopt == 'c') {
@ -9248,6 +8971,7 @@ zpool_do_status(int argc, char **argv)

 		if (cb.vcdl != NULL)
 			free_vdev_cmd_data_list(cb.vcdl);
+
 		if (argc == 0 && cb.cb_count == 0)
 			(void) fprintf(stderr, gettext("no pools available\n"));
 		else if (cb.cb_explain && cb.cb_first && cb.cb_allpools)
@ -10683,10 +10407,11 @@ found:
 		}
 	} else {
 		/*
-		 * The first arg isn't the name of a valid pool.
+		 * The first arg isn't a pool name,
 		 */
-		fprintf(stderr, gettext("Cannot get properties of %s: "
-		    "no such pool available.\n"), argv[0]);
+		fprintf(stderr, gettext("missing pool name.\n"));
+		fprintf(stderr, "\n");
+		usage(B_FALSE);
 		return (1);
 	}

@ -11027,9 +10752,6 @@ print_wait_status_row(wait_data_t *wd, zpool_handle_t *zhp, int row)
 		col_widths[i] = MAX(strlen(headers[i]), 6) + 2;
 	}

-	if (timestamp_fmt != NODATE)
-		print_timestamp(timestamp_fmt);
-
 	/* Print header if appropriate */
 	int term_height = terminal_height();
 	boolean_t reprint_header = (!wd->wd_headers_once && term_height > 0 &&
@ -11097,6 +10819,9 @@ print_wait_status_row(wait_data_t *wd, zpool_handle_t *zhp, int row)
 	if (vdev_any_spare_replacing(nvroot))
 		bytes_rem[ZPOOL_WAIT_REPLACE] =  bytes_rem[ZPOOL_WAIT_RESILVER];

+	if (timestamp_fmt != NODATE)
+		print_timestamp(timestamp_fmt);
+
 	for (i = 0; i < ZPOOL_WAIT_NUM_ACTIVITIES; i++) {
 		char buf[64];
 		if (!wd->wd_enabled[i])
--- a/cmd/zpool/zpool_util.h
+++ b/cmd/zpool/zpool_util.h
@ -126,10 +126,6 @@ vdev_cmd_data_list_t *all_pools_for_each_vdev_run(int argc, char **argv,

 void free_vdev_cmd_data_list(vdev_cmd_data_list_t *vcdl);

-void free_vdev_cmd_data(vdev_cmd_data_t *data);
-
-int vdev_run_cmd_simple(char *path, char *cmd);
-
 int check_device(const char *path, boolean_t force,
    boolean_t isspare, boolean_t iswholedisk);
 boolean_t check_sector_size_database(char *path, int *sector_size);
@ -138,9 +134,6 @@ int check_file(const char *file, boolean_t force, boolean_t isspare);
 void after_zpool_upgrade(zpool_handle_t *zhp);
 int check_file_generic(const char *file, boolean_t force, boolean_t isspare);

-int zpool_power(zpool_handle_t *zhp, char *vdev, boolean_t turn_on);
-int zpool_power_current_state(zpool_handle_t *zhp, char *vdev);
-
 #ifdef	__cplusplus
 }
 #endif
--- a/cmd/zpool/zpool_vdev.c
+++ b/cmd/zpool/zpool_vdev.c
@ -372,10 +372,6 @@ make_leaf_vdev(nvlist_t *props, const char *arg, boolean_t is_primary)
 	verify(nvlist_add_string(vdev, ZPOOL_CONFIG_PATH, path) == 0);
 	verify(nvlist_add_string(vdev, ZPOOL_CONFIG_TYPE, type) == 0);

-	/* Lookup and add the enclosure sysfs path (if exists) */
-	update_vdev_config_dev_sysfs_path(vdev, path,
-	    ZPOOL_CONFIG_VDEV_ENC_SYSFS_PATH);
-
 	if (strcmp(type, VDEV_TYPE_DISK) == 0)
 		verify(nvlist_add_uint64(vdev, ZPOOL_CONFIG_WHOLE_DISK,
 		    (uint64_t)wholedisk) == 0);
@ -940,15 +936,6 @@ zero_label(const char *path)
 	return (0);
 }

-static void
-lines_to_stderr(char *lines[], int lines_cnt)
-{
-	int i;
-	for (i = 0; i < lines_cnt; i++) {
-		fprintf(stderr, "%s\n", lines[i]);
-	}
-}
-
 /*
 * Go through and find any whole disks in the vdev specification, labelling them
 * as appropriate.  When constructing the vdev spec, we were unable to open this
@ -960,7 +947,7 @@ lines_to_stderr(char *lines[], int lines_cnt)
 * need to get the devid after we label the disk.
 */
 static int
-make_disks(zpool_handle_t *zhp, nvlist_t *nv, boolean_t replacing)
+make_disks(zpool_handle_t *zhp, nvlist_t *nv)
 {
 	nvlist_t **child;
 	uint_t c, children;
@ -1045,8 +1032,6 @@ make_disks(zpool_handle_t *zhp, nvlist_t *nv, boolean_t replacing)
 		 */
 		if (!is_exclusive && !is_spare(NULL, udevpath)) {
 			char *devnode = strrchr(devpath, '/') + 1;
-			char **lines = NULL;
-			int lines_cnt = 0;

 			ret = strncmp(udevpath, UDISK_ROOT, strlen(UDISK_ROOT));
 			if (ret == 0) {
@ -1058,27 +1043,9 @@ make_disks(zpool_handle_t *zhp, nvlist_t *nv, boolean_t replacing)
 			/*
 			 * When labeling a pool the raw device node name
 			 * is provided as it appears under /dev/.
-			 *
-			 * Note that 'zhp' will be NULL when we're creating a
-			 * pool.
 			 */
-			if (zpool_prepare_and_label_disk(g_zfs, zhp, devnode,
-			    nv, zhp == NULL ? "create" :
-			    replacing ? "replace" : "add", &lines,
-			    &lines_cnt) != 0) {
-				(void) fprintf(stderr,
-				    gettext(
-				    "Error preparing/labeling disk.\n"));
-				if (lines_cnt > 0) {
-					(void) fprintf(stderr,
-					gettext("zfs_prepare_disk output:\n"));
-					lines_to_stderr(lines, lines_cnt);
-				}
-
-				libzfs_free_str_array(lines, lines_cnt);
+			if (zpool_label_disk(g_zfs, zhp, devnode) == -1)
 				return (-1);
-			}
-			libzfs_free_str_array(lines, lines_cnt);

 			/*
 			 * Wait for udev to signal the device is available
@ -1115,19 +1082,19 @@ make_disks(zpool_handle_t *zhp, nvlist_t *nv, boolean_t replacing)
 	}

 	for (c = 0; c < children; c++)
-		if ((ret = make_disks(zhp, child[c], replacing)) != 0)
+		if ((ret = make_disks(zhp, child[c])) != 0)
 			return (ret);

 	if (nvlist_lookup_nvlist_array(nv, ZPOOL_CONFIG_SPARES,
 	    &child, &children) == 0)
 		for (c = 0; c < children; c++)
-			if ((ret = make_disks(zhp, child[c], replacing)) != 0)
+			if ((ret = make_disks(zhp, child[c])) != 0)
 				return (ret);

 	if (nvlist_lookup_nvlist_array(nv, ZPOOL_CONFIG_L2CACHE,
 	    &child, &children) == 0)
 		for (c = 0; c < children; c++)
-			if ((ret = make_disks(zhp, child[c], replacing)) != 0)
+			if ((ret = make_disks(zhp, child[c])) != 0)
 				return (ret);

 	return (0);
@ -1785,7 +1752,7 @@ split_mirror_vdev(zpool_handle_t *zhp, char *newname, nvlist_t *props,
 			return (NULL);
 		}

-		if (!flags.dryrun && make_disks(zhp, newroot, B_FALSE) != 0) {
+		if (!flags.dryrun && make_disks(zhp, newroot) != 0) {
 			nvlist_free(newroot);
 			return (NULL);
 		}
@ -1906,7 +1873,7 @@ make_root_vdev(zpool_handle_t *zhp, nvlist_t *props, int force, int check_rep,
 	/*
 	 * Run through the vdev specification and label any whole disks found.
 	 */
-	if (!dryrun && make_disks(zhp, newroot, replacing) != 0) {
+	if (!dryrun && make_disks(zhp, newroot) != 0) {
 		nvlist_free(newroot);
 		return (NULL);
 	}
--- a/cmd/zstream/zstream_redup.c
+++ b/cmd/zstream/zstream_redup.c
@ -186,7 +186,7 @@ static void
 zfs_redup_stream(int infd, int outfd, boolean_t verbose)
 {
 	int bufsz = SPA_MAXBLOCKSIZE;
-	dmu_replay_record_t thedrr;
+	dmu_replay_record_t thedrr = { 0 };
 	dmu_replay_record_t *drr = &thedrr;
 	redup_table_t rdt;
 	zio_cksum_t stream_cksum;
@ -194,8 +194,6 @@ zfs_redup_stream(int infd, int outfd, boolean_t verbose)
 	uint64_t num_records = 0;
 	uint64_t num_write_byref_records = 0;

-	memset(&thedrr, 0, sizeof (dmu_replay_record_t));
-
 #ifdef _ILP32
 	uint64_t max_rde_size = SMALLEST_POSSIBLE_MAX_RDT_MB << 20;
 #else
--- a/cmd/ztest.c
+++ b/cmd/ztest.c
@ -20,7 +20,7 @@
 */
 /*
 * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2011, 2024 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2018 by Delphix. All rights reserved.
 * Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
 * Copyright (c) 2013 Steven Hartland. All rights reserved.
 * Copyright (c) 2014 Integros [integros.com]
@ -2448,7 +2448,7 @@ ztest_get_data(void *arg, uint64_t arg2, lr_write_t *lr, char *buf,
 		ASSERT3P(zio, !=, NULL);
 		size = doi.doi_data_block_size;
 		if (ISP2(size)) {
-			offset = P2ALIGN_TYPED(offset, size, uint64_t);
+			offset = P2ALIGN(offset, size);
 		} else {
 			ASSERT3U(offset, <, size);
 			offset = 0;
@ -3270,7 +3270,7 @@ ztest_vdev_add_remove(ztest_ds_t *zd, uint64_t id)
 		    "log" : NULL, ztest_opts.zo_raid_children, zs->zs_mirrors,
 		    1);

-		error = spa_vdev_add(spa, nvroot, B_FALSE);
+		error = spa_vdev_add(spa, nvroot);
 		fnvlist_free(nvroot);

 		switch (error) {
@ -3332,7 +3332,7 @@ ztest_vdev_class_add(ztest_ds_t *zd, uint64_t id)
 	nvroot = make_vdev_root(NULL, NULL, NULL, ztest_opts.zo_vdev_size, 0,
 	    class, ztest_opts.zo_raid_children, zs->zs_mirrors, 1);

-	error = spa_vdev_add(spa, nvroot, B_FALSE);
+	error = spa_vdev_add(spa, nvroot);
 	fnvlist_free(nvroot);

 	if (error == ENOSPC)
@ -3439,7 +3439,7 @@ ztest_vdev_aux_add_remove(ztest_ds_t *zd, uint64_t id)
 		 */
 		nvlist_t *nvroot = make_vdev_root(NULL, aux, NULL,
 		    (ztest_opts.zo_vdev_size * 5) / 4, 0, NULL, 0, 0, 1);
-		error = spa_vdev_add(spa, nvroot, B_FALSE);
+		error = spa_vdev_add(spa, nvroot);

 		switch (error) {
 		case 0:
@ -4668,8 +4668,7 @@ ztest_dmu_object_next_chunk(ztest_ds_t *zd, uint64_t id)
 	 */
 	mutex_enter(&os->os_obj_lock);
 	object = ztest_random(os->os_obj_next_chunk);
-	os->os_obj_next_chunk = P2ALIGN_TYPED(object, dnodes_per_chunk,
-	    uint64_t);
+	os->os_obj_next_chunk = P2ALIGN(object, dnodes_per_chunk);
 	mutex_exit(&os->os_obj_lock);
 }

@ -6285,8 +6284,7 @@ ztest_fault_inject(ztest_ds_t *zd, uint64_t id)
 		 * the end of the disk (vdev_psize) is aligned to
 		 * sizeof (vdev_label_t).
 		 */
-		uint64_t psize = P2ALIGN_TYPED(fsize, sizeof (vdev_label_t),
-		    uint64_t);
+		uint64_t psize = P2ALIGN(fsize, sizeof (vdev_label_t));
 		if ((leaf & 1) == 1 &&
 		    offset + sizeof (bad) > psize - VDEV_LABEL_END_SIZE)
 			continue;
@ -6602,8 +6600,8 @@ ztest_fletcher_incr(ztest_ds_t *zd, uint64_t id)
 				size_t inc = 64 * ztest_random(size / 67);
 				/* sometimes add few bytes to test non-simd */
 				if (ztest_random(100) < 10)
-					inc += P2ALIGN_TYPED(ztest_random(64),
-					    sizeof (uint32_t), uint64_t);
+					inc += P2ALIGN(ztest_random(64),
+					    sizeof (uint32_t));

 				if (inc > (size - pos))
 					inc = size - pos;
--- a/config/Rules.am
+++ b/config/Rules.am
@ -33,7 +33,6 @@ AM_CPPFLAGS += -D_REENTRANT
 AM_CPPFLAGS += -D_FILE_OFFSET_BITS=64
 AM_CPPFLAGS += -D_LARGEFILE64_SOURCE
 AM_CPPFLAGS += -DLIBEXECDIR=\"$(libexecdir)\"
-AM_CPPFLAGS += -DZFSEXECDIR=\"$(zfsexecdir)\"
 AM_CPPFLAGS += -DRUNSTATEDIR=\"$(runstatedir)\"
 AM_CPPFLAGS += -DSBINDIR=\"$(sbindir)\"
 AM_CPPFLAGS += -DSYSCONFDIR=\"$(sysconfdir)\"
@ -42,6 +41,21 @@ AM_CPPFLAGS += $(DEBUG_CPPFLAGS)
 AM_CPPFLAGS += $(CODE_COVERAGE_CPPFLAGS)
 AM_CPPFLAGS += -DTEXT_DOMAIN=\"zfs-@ac_system_l@-user\"

+AM_CPPFLAGS_NOCHECK  = -D"strtok(...)=strtok(__VA_ARGS__) __attribute__((deprecated(\"Use strtok_r(3) instead!\")))"
+AM_CPPFLAGS_NOCHECK += -D"__xpg_basename(...)=__xpg_basename(__VA_ARGS__) __attribute__((deprecated(\"basename(3) is underspecified. Use zfs_basename() instead!\")))"
+AM_CPPFLAGS_NOCHECK += -D"basename(...)=basename(__VA_ARGS__) __attribute__((deprecated(\"basename(3) is underspecified. Use zfs_basename() instead!\")))"
+AM_CPPFLAGS_NOCHECK += -D"dirname(...)=dirname(__VA_ARGS__) __attribute__((deprecated(\"dirname(3) is underspecified. Use zfs_dirnamelen() instead!\")))"
+AM_CPPFLAGS_NOCHECK += -D"bcopy(...)=__attribute__((deprecated(\"bcopy(3) is deprecated. Use memcpy(3)/memmove(3) instead!\"))) bcopy(__VA_ARGS__)"
+AM_CPPFLAGS_NOCHECK += -D"bcmp(...)=__attribute__((deprecated(\"bcmp(3) is deprecated. Use memcmp(3) instead!\"))) bcmp(__VA_ARGS__)"
+AM_CPPFLAGS_NOCHECK += -D"bzero(...)=__attribute__((deprecated(\"bzero(3) is deprecated. Use memset(3) instead!\"))) bzero(__VA_ARGS__)"
+AM_CPPFLAGS_NOCHECK += -D"asctime(...)=__attribute__((deprecated(\"Use strftime(3) instead!\"))) asctime(__VA_ARGS__)"
+AM_CPPFLAGS_NOCHECK += -D"asctime_r(...)=__attribute__((deprecated(\"Use strftime(3) instead!\"))) asctime_r(__VA_ARGS__)"
+AM_CPPFLAGS_NOCHECK += -D"gmtime(...)=__attribute__((deprecated(\"gmtime(3) isn't thread-safe. Use gmtime_r(3) instead!\"))) gmtime(__VA_ARGS__)"
+AM_CPPFLAGS_NOCHECK += -D"localtime(...)=__attribute__((deprecated(\"localtime(3) isn't thread-safe. Use localtime_r(3) instead!\"))) localtime(__VA_ARGS__)"
+AM_CPPFLAGS_NOCHECK += -D"strncpy(...)=__attribute__((deprecated(\"strncpy(3) is deprecated. Use strlcpy(3) instead!\"))) strncpy(__VA_ARGS__)"
+
+AM_CPPFLAGS += $(AM_CPPFLAGS_NOCHECK)
+
 if ASAN_ENABLED
 AM_CPPFLAGS += -DZFS_ASAN_ENABLED
 endif
--- a/config/Substfiles.am
+++ b/config/Substfiles.am
@ -18,7 +18,6 @@ subst_sed_cmd = \
 	-e 's|@ASAN_ENABLED[@]|$(ASAN_ENABLED)|g' \
 	-e 's|@DEFAULT_INIT_NFS_SERVER[@]|$(DEFAULT_INIT_NFS_SERVER)|g' \
 	-e 's|@DEFAULT_INIT_SHELL[@]|$(DEFAULT_INIT_SHELL)|g' \
-	-e 's|@IS_SYSV_RC[@]|$(IS_SYSV_RC)|g' \
 	-e 's|@LIBFETCH_DYNAMIC[@]|$(LIBFETCH_DYNAMIC)|g' \
 	-e 's|@LIBFETCH_SONAME[@]|$(LIBFETCH_SONAME)|g' \
 	-e 's|@PYTHON[@]|$(PYTHON)|g' \
@ -44,4 +43,4 @@ SUBSTFILES =
 CLEANFILES += $(SUBSTFILES)
 dist_noinst_DATA += $(SUBSTFILES:=.in)

-$(SUBSTFILES): $(call SUBST,%,)
+$(call SUBST,%,)
--- a/config/always-pyzfs.m4
+++ b/config/always-pyzfs.m4
@ -80,11 +80,10 @@ AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_PYZFS], [
 			[AC_MSG_ERROR("Python $PYTHON_VERSION unknown")]
 		)

+		AX_PYTHON_DEVEL([$PYTHON_REQUIRED_VERSION], [
 			AS_IF([test "x$enable_pyzfs" = xyes], [
-			AX_PYTHON_DEVEL([$PYTHON_REQUIRED_VERSION])
-		], [
-			AX_PYTHON_DEVEL([$PYTHON_REQUIRED_VERSION], [true])
-			AS_IF([test "x$ax_python_devel_found" = xno], [
+				AC_MSG_ERROR("Python $PYTHON_REQUIRED_VERSION development library is not installed")
+			], [test "x$enable_pyzfs" != xno], [
 				enable_pyzfs=no
 			])
 		])
--- a/config/ax_python_devel.m4
+++ b/config/ax_python_devel.m4
@ -4,13 +4,18 @@
 #
 # SYNOPSIS
 #
-#   AX_PYTHON_DEVEL([version[,optional]])
+#   AX_PYTHON_DEVEL([version], [action-if-not-found])
 #
 # DESCRIPTION
 #
 #   Note: Defines as a precious variable "PYTHON_VERSION". Don't override it
 #   in your configure.ac.
 #
+#   Note: this is a slightly modified version of the original AX_PYTHON_DEVEL
+#   macro which accepts an additional [action-if-not-found] argument. This
+#   allow to detect if Python development is available without aborting the
+#   configure phase with an hard error in case it is not.
+#
 #   This macro checks for Python and tries to get the include path to
 #   'Python.h'. It provides the $(PYTHON_CPPFLAGS) and $(PYTHON_LIBS) output
 #   variables. It also exports $(PYTHON_EXTRA_LIBS) and
@ -23,11 +28,6 @@
 #   version number. Don't use "PYTHON_VERSION" for this: that environment
 #   variable is declared as precious and thus reserved for the end-user.
 #
-#   By default this will fail if it does not detect a development version of
-#   python.  If you want it to continue, set optional to true, like
-#   AX_PYTHON_DEVEL([], [true]).  The ax_python_devel_found variable will be
-#   "no" if it fails.
-#
 #   This macro should work for all versions of Python >= 2.1.0. As an end
 #   user, you can disable the check for the python version by setting the
 #   PYTHON_NOVERSIONCHECK environment variable to something else than the
@ -45,6 +45,7 @@
 #   Copyright (c) 2009 Matteo Settenvini <matteo@member.fsf.org>
 #   Copyright (c) 2009 Horst Knorr <hk_classes@knoda.org>
 #   Copyright (c) 2013 Daniel Mullner <muellner@math.stanford.edu>
+#   Copyright (c) 2018 loli10K <ezomori.nozomu@gmail.com>
 #
 #   This program is free software: you can redistribute it and/or modify it
 #   under the terms of the GNU General Public License as published by the
@ -72,18 +73,10 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.

-#serial 36
+#serial 21

 AU_ALIAS([AC_PYTHON_DEVEL], [AX_PYTHON_DEVEL])
 AC_DEFUN([AX_PYTHON_DEVEL],[
-	# Get whether it's optional
-	if test -z "$2"; then
-	   ax_python_devel_optional=false
-	else
-	   ax_python_devel_optional=$2
-	fi
-	ax_python_devel_found=yes
-
 	#
 	# Allow the use of a (user set) custom python version
 	#
@ -94,15 +87,12 @@ AC_DEFUN([AX_PYTHON_DEVEL],[

 	AC_PATH_PROG([PYTHON],[python[$PYTHON_VERSION]])
 	if test -z "$PYTHON"; then
-	   AC_MSG_WARN([Cannot find python$PYTHON_VERSION in your system path])
-	   if ! $ax_python_devel_optional; then
-	      AC_MSG_ERROR([Giving up, python development not available])
-	   fi
-	   ax_python_devel_found=no
+		m4_ifvaln([$2],[$2],[
+			AC_MSG_ERROR([Cannot find python$PYTHON_VERSION in your system path])
 			PYTHON_VERSION=""
+		])
 	fi

-	if test $ax_python_devel_found = yes; then
 	#
 	# Check for a version of Python >= 2.1.0
 	#
@ -113,7 +103,7 @@ AC_DEFUN([AX_PYTHON_DEVEL],[
 	if test "$ac_supports_python_ver" != "True"; then
 		if test -z "$PYTHON_NOVERSIONCHECK"; then
 			AC_MSG_RESULT([no])
-			AC_MSG_WARN([
+			AC_MSG_FAILURE([
 This version of the AC@&t@_PYTHON_DEVEL macro
 doesn't work properly with versions of Python before
 2.1.0. You may need to re-run configure, setting the
@ -122,20 +112,13 @@ PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand.
 Moreover, to disable this check, set PYTHON_NOVERSIONCHECK
 to something else than an empty string.
 ])
-			if ! $ax_python_devel_optional; then
-			   AC_MSG_FAILURE([Giving up])
-			fi
-			ax_python_devel_found=no
-			PYTHON_VERSION=""
 		else
 			AC_MSG_RESULT([skip at user request])
 		fi
 	else
 		AC_MSG_RESULT([yes])
 	fi
-	fi

-	if test $ax_python_devel_found = yes; then
 	#
 	# If the macro parameter ``version'' is set, honour it.
 	# A Python shim class, VPy, is used to implement correct version comparisons via
@ -150,7 +133,7 @@ class VPy:
        return tuple(map(int, s.strip().replace("rc", ".").split(".")))
    def __init__(self):
        import sys
-        self.vpy = tuple(sys.version_info)[[:3]]
+        self.vpy = tuple(sys.version_info)
    def __eq__(self, s):
        return self.vpy == self.vtup(s)
    def __ne__(self, s):
@ -172,69 +155,25 @@ EOF
 			AC_MSG_RESULT([yes])
 		else
 			AC_MSG_RESULT([no])
-			AC_MSG_WARN([this package requires Python $1.
+			AC_MSG_ERROR([this package requires Python $1.
 If you have it installed, but it isn't the default Python
 interpreter in your system path, please pass the PYTHON_VERSION
 variable to configure. See ``configure --help'' for reference.
 ])
-			if ! $ax_python_devel_optional; then
-			   AC_MSG_ERROR([Giving up])
-			fi
-			ax_python_devel_found=no
 			PYTHON_VERSION=""
 		fi
 	fi
-	fi

-	if test $ax_python_devel_found = yes; then
-	   #
-	   # Check if you have distutils, else fail
-	   #
-	   AC_MSG_CHECKING([for the sysconfig Python package])
-	   ac_sysconfig_result=`$PYTHON -c "import sysconfig" 2>&1`
-	   if test $? -eq 0; then
-		AC_MSG_RESULT([yes])
-		IMPORT_SYSCONFIG="import sysconfig"
-	   else
-		AC_MSG_RESULT([no])
-
-		AC_MSG_CHECKING([for the distutils Python package])
-		ac_sysconfig_result=`$PYTHON -c "from distutils import sysconfig" 2>&1`
-		if test $? -eq 0; then
-			AC_MSG_RESULT([yes])
-			IMPORT_SYSCONFIG="from distutils import sysconfig"
-		else
-			AC_MSG_WARN([cannot import Python module "distutils".
-Please check your Python installation. The error was:
-$ac_sysconfig_result])
-			if ! $ax_python_devel_optional; then
-			   AC_MSG_ERROR([Giving up])
-			fi
-			ax_python_devel_found=no
-			PYTHON_VERSION=""
-		fi
-	   fi
-	fi
-
-	if test $ax_python_devel_found = yes; then
 	#
 	# Check for Python include path
 	#
+	#
 	AC_MSG_CHECKING([for Python include path])
 	if test -z "$PYTHON_CPPFLAGS"; then
-		if test "$IMPORT_SYSCONFIG" = "import sysconfig"; then
-			# sysconfig module has different functions
-			python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \
-				print (sysconfig.get_path ('include'));"`
-			plat_python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \
-				print (sysconfig.get_path ('platinclude'));"`
-		else
-			# old distutils way
-			python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \
-				print (sysconfig.get_python_inc ());"`
-			plat_python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \
-				print (sysconfig.get_python_inc (plat_specific=1));"`
-		fi
+		python_path=`$PYTHON -c "import sysconfig; \
+			print (sysconfig.get_path('include'));"`
+		plat_python_path=`$PYTHON -c "import sysconfig; \
+			print (sysconfig.get_path('platinclude'));"`
 		if test -n "${python_path}"; then
 			if test "${plat_python_path}" != "${python_path}"; then
 				python_path="-I$python_path -I$plat_python_path"
@ -269,7 +208,7 @@ EOD`
 				ac_python_version=$PYTHON_VERSION
 			else
 				ac_python_version=`$PYTHON -c "import sys; \
-					print ("%d.%d" % sys.version_info[[:2]])"`
+					print ('.'.join(sys.version.split('.')[[:2]]))"`
 			fi
 		fi

@ -281,7 +220,7 @@ EOD`
 		ac_python_libdir=`cat<<EOD | $PYTHON -

 # There should be only one
-$IMPORT_SYSCONFIG
+import sysconfig
 e = sysconfig.get_config_var('LIBDIR')
 if e is not None:
 	print (e)
@ -290,7 +229,7 @@ EOD`
 		# Now, for the library:
 		ac_python_library=`cat<<EOD | $PYTHON -

-$IMPORT_SYSCONFIG
+import sysconfig
 c = sysconfig.get_config_vars()
 if 'LDVERSION' in c:
 	print ('python'+c[['LDVERSION']])
@ -310,27 +249,21 @@ EOD`
 		else
 			# old way: use libpython from python_configdir
 			ac_python_libdir=`$PYTHON -c \
-			  "from sysconfig import get_python_lib as f; \
+			  "import sysconfig; \
 			  import os; \
-			  print (os.path.join(f(plat_specific=1, standard_lib=1), 'config'));"`
+			  print (os.path.join(sysconfig.get_path('platstdlib'), 'config'));"`
 			PYTHON_LIBS="-L$ac_python_libdir -lpython$ac_python_version"
 		fi

 		if test -z "PYTHON_LIBS"; then
-			AC_MSG_WARN([
+			m4_ifvaln([$2],[$2],[
+				AC_MSG_ERROR([
  Cannot determine location of your Python DSO. Please check it was installed with
  dynamic libraries enabled, or try setting PYTHON_LIBS by hand.
 				])
-			if ! $ax_python_devel_optional; then
-			   AC_MSG_ERROR([Giving up])
-			fi
-			ax_python_devel_found=no
-			PYTHON_VERSION=""
+			])
 		fi
 	fi
-	fi
-
-	if test $ax_python_devel_found = yes; then
 	AC_MSG_RESULT([$PYTHON_LIBS])
 	AC_SUBST([PYTHON_LIBS])

@ -339,65 +272,20 @@ EOD`
 	#
 	AC_MSG_CHECKING([for Python site-packages path])
 	if test -z "$PYTHON_SITE_PKG"; then
-		if test "$IMPORT_SYSCONFIG" = "import sysconfig"; then
-			PYTHON_SITE_PKG=`$PYTHON -c "
-$IMPORT_SYSCONFIG;
-if hasattr(sysconfig, 'get_default_scheme'):
-    scheme = sysconfig.get_default_scheme()
-else:
-    scheme = sysconfig._get_default_scheme()
-if scheme == 'posix_local':
-    # Debian's default scheme installs to /usr/local/ but we want to find headers in /usr/
-    scheme = 'posix_prefix'
-prefix = '$prefix'
-if prefix == 'NONE':
-    prefix = '$ac_default_prefix'
-sitedir = sysconfig.get_path('purelib', scheme, vars={'base': prefix})
-print(sitedir)"`
-		else
-			# distutils.sysconfig way
-			PYTHON_SITE_PKG=`$PYTHON -c "$IMPORT_SYSCONFIG; \
-				print (sysconfig.get_python_lib(0,0));"`
-		fi
+		PYTHON_SITE_PKG=`$PYTHON -c "import distutils.sysconfig; \
+			print (distutils.sysconfig.get_python_lib(0,0));" 2>/dev/null || \
+			$PYTHON -c "import sysconfig; \
+			print (sysconfig.get_path('purelib'));"`
 	fi
 	AC_MSG_RESULT([$PYTHON_SITE_PKG])
 	AC_SUBST([PYTHON_SITE_PKG])

-	   #
-	   # Check for platform-specific site packages
-	   #
-	   AC_MSG_CHECKING([for Python platform specific site-packages path])
-	   if test -z "$PYTHON_PLATFORM_SITE_PKG"; then
-		if test "$IMPORT_SYSCONFIG" = "import sysconfig"; then
-			PYTHON_PLATFORM_SITE_PKG=`$PYTHON -c "
-$IMPORT_SYSCONFIG;
-if hasattr(sysconfig, 'get_default_scheme'):
-    scheme = sysconfig.get_default_scheme()
-else:
-    scheme = sysconfig._get_default_scheme()
-if scheme == 'posix_local':
-    # Debian's default scheme installs to /usr/local/ but we want to find headers in /usr/
-    scheme = 'posix_prefix'
-prefix = '$prefix'
-if prefix == 'NONE':
-    prefix = '$ac_default_prefix'
-sitedir = sysconfig.get_path('platlib', scheme, vars={'platbase': prefix})
-print(sitedir)"`
-		else
-			# distutils.sysconfig way
-			PYTHON_PLATFORM_SITE_PKG=`$PYTHON -c "$IMPORT_SYSCONFIG; \
-				print (sysconfig.get_python_lib(1,0));"`
-		fi
-	   fi
-	   AC_MSG_RESULT([$PYTHON_PLATFORM_SITE_PKG])
-	   AC_SUBST([PYTHON_PLATFORM_SITE_PKG])
-
 	#
 	# libraries which must be linked in when embedding
 	#
 	AC_MSG_CHECKING(python extra libraries)
 	if test -z "$PYTHON_EXTRA_LIBS"; then
-	      PYTHON_EXTRA_LIBS=`$PYTHON -c "$IMPORT_SYSCONFIG; \
+	   PYTHON_EXTRA_LIBS=`$PYTHON -c "import sysconfig; \
                conf = sysconfig.get_config_var; \
                print (conf('LIBS') + ' ' + conf('SYSLIBS'))"`
 	fi
@ -409,11 +297,9 @@ print(sitedir)"`
 	#
 	AC_MSG_CHECKING(python extra linking flags)
 	if test -z "$PYTHON_EXTRA_LDFLAGS"; then
-		PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "$IMPORT_SYSCONFIG; \
+		PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import sysconfig; \
 			conf = sysconfig.get_config_var; \
 			print (conf('LINKFORSHARED'))"`
-		# Hack for macos, it sticks this in here.
-		PYTHON_EXTRA_LDFLAGS=`echo $PYTHON_EXTRA_LDFLAGS | sed 's/CoreFoundation.*$/CoreFoundation/'`
 	fi
 	AC_MSG_RESULT([$PYTHON_EXTRA_LDFLAGS])
 	AC_SUBST(PYTHON_EXTRA_LDFLAGS)
@ -426,7 +312,7 @@ print(sitedir)"`
 	ac_save_LIBS="$LIBS"
 	ac_save_LDFLAGS="$LDFLAGS"
 	ac_save_CPPFLAGS="$CPPFLAGS"
-	   LIBS="$ac_save_LIBS $PYTHON_LIBS $PYTHON_EXTRA_LIBS"
+	LIBS="$ac_save_LIBS $PYTHON_LIBS $PYTHON_EXTRA_LIBS $PYTHON_EXTRA_LIBS"
 	LDFLAGS="$ac_save_LDFLAGS $PYTHON_EXTRA_LDFLAGS"
 	CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS"
 	AC_LANG_PUSH([C])
@ -443,7 +329,8 @@ print(sitedir)"`
 	AC_MSG_RESULT([$pythonexists])

        if test ! "x$pythonexists" = "xyes"; then
-	      AC_MSG_WARN([
+		m4_ifvaln([$2],[$2],[
+			AC_MSG_FAILURE([
  Could not link test program to Python. Maybe the main Python library has been
  installed in some non-standard library path. If so, pass it to configure,
  via the LIBS environment variable.
@ -454,12 +341,8 @@ print(sitedir)"`
   for your distribution.  The exact name of this package varies among them.
  ============================================================================
 	   ])
-	      if ! $ax_python_devel_optional; then
-		 AC_MSG_ERROR([Giving up])
-	      fi
-	      ax_python_devel_found=no
 			PYTHON_VERSION=""
-	   fi
+		])
 	fi

 	#
--- a/config/find_system_library.m4
+++ b/config/find_system_library.m4
@ -90,8 +90,8 @@ AC_DEFUN([ZFS_AC_FIND_SYSTEM_LIBRARY], [
 	AC_DEFINE([HAVE_][$1], [1], [Define if you have [$5]])
 	$7
    ],[dnl ELSE
-	AC_SUBST([$1]_CFLAGS, [""])
-	AC_SUBST([$1]_LIBS, [""])
+	AC_SUBST([$1]_CFLAGS, [])
+	AC_SUBST([$1]_LIBS, [])
 	AC_MSG_WARN([cannot find [$5] via pkg-config or in the standard locations])
 	$8
    ])
--- a/config/kernel-acl.m4
+++ b/config/kernel-acl.m4
@ -172,7 +172,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_INODE_OPERATIONS_GET_ACL], [
 	ZFS_LINUX_TEST_SRC([inode_operations_get_acl], [
 		#include <linux/fs.h>

-		static struct posix_acl *get_acl_fn(struct inode *inode, int type)
+		struct posix_acl *get_acl_fn(struct inode *inode, int type)
 		    { return NULL; }

 		static const struct inode_operations
@ -184,7 +184,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_INODE_OPERATIONS_GET_ACL], [
 	ZFS_LINUX_TEST_SRC([inode_operations_get_acl_rcu], [
 		#include <linux/fs.h>

-		static struct posix_acl *get_acl_fn(struct inode *inode, int type,
+		struct posix_acl *get_acl_fn(struct inode *inode, int type,
 		    bool rcu) { return NULL; }

 		static const struct inode_operations
@ -196,7 +196,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_INODE_OPERATIONS_GET_ACL], [
 	ZFS_LINUX_TEST_SRC([inode_operations_get_inode_acl], [
 		#include <linux/fs.h>

-		static struct posix_acl *get_inode_acl_fn(struct inode *inode, int type,
+		struct posix_acl *get_inode_acl_fn(struct inode *inode, int type,
 		    bool rcu) { return NULL; }

 		static const struct inode_operations
@ -243,7 +243,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_INODE_OPERATIONS_SET_ACL], [
 	ZFS_LINUX_TEST_SRC([inode_operations_set_acl_mnt_idmap_dentry], [
 		#include <linux/fs.h>

-		static int set_acl_fn(struct mnt_idmap *idmap,
+		int set_acl_fn(struct mnt_idmap *idmap,
 		    struct dentry *dent, struct posix_acl *acl,
 		    int type) { return 0; }

@ -255,7 +255,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_INODE_OPERATIONS_SET_ACL], [
 	ZFS_LINUX_TEST_SRC([inode_operations_set_acl_userns_dentry], [
 		#include <linux/fs.h>

-		static int set_acl_fn(struct user_namespace *userns,
+		int set_acl_fn(struct user_namespace *userns,
 		    struct dentry *dent, struct posix_acl *acl,
 		    int type) { return 0; }

@ -267,7 +267,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_INODE_OPERATIONS_SET_ACL], [
 	ZFS_LINUX_TEST_SRC([inode_operations_set_acl_userns], [
 		#include <linux/fs.h>

-		static int set_acl_fn(struct user_namespace *userns,
+		int set_acl_fn(struct user_namespace *userns,
 		    struct inode *inode, struct posix_acl *acl,
 		    int type) { return 0; }

@ -279,7 +279,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_INODE_OPERATIONS_SET_ACL], [
 	ZFS_LINUX_TEST_SRC([inode_operations_set_acl], [
 		#include <linux/fs.h>

-		static int set_acl_fn(struct inode *inode, struct posix_acl *acl,
+		int set_acl_fn(struct inode *inode, struct posix_acl *acl,
 		    int type) { return 0; }

 		static const struct inode_operations
--- a/config/kernel-automount.m4
+++ b/config/kernel-automount.m4
@ -8,7 +8,7 @@ dnl #
 AC_DEFUN([ZFS_AC_KERNEL_SRC_AUTOMOUNT], [
 	ZFS_LINUX_TEST_SRC([dentry_operations_d_automount], [
 		#include <linux/dcache.h>
-		static struct vfsmount *d_automount(struct path *p) { return NULL; }
+		struct vfsmount *d_automount(struct path *p) { return NULL; }
 		struct dentry_operations dops __attribute__ ((unused)) = {
 			.d_automount = d_automount,
 		};
--- a/config/kernel-bio.m4
+++ b/config/kernel-bio.m4
@ -247,7 +247,7 @@ dnl #
 AC_DEFUN([ZFS_AC_KERNEL_SRC_BIO_END_IO_T_ARGS], [
 	ZFS_LINUX_TEST_SRC([bio_end_io_t_args], [
 		#include <linux/bio.h>
-		static void wanted_end_io(struct bio *bio) { return; }
+		void wanted_end_io(struct bio *bio) { return; }
 		bio_end_io_t *end_io __attribute__ ((unused)) = wanted_end_io;
 	], [])
 ])
--- a/config/kernel-blk-queue.m4
+++ b/config/kernel-blk-queue.m4
@ -25,8 +25,6 @@ AC_DEFUN([ZFS_AC_KERNEL_BLK_QUEUE_PLUG], [
 dnl #
 dnl # 2.6.32 - 4.11: statically allocated bdi in request_queue
 dnl # 4.12: dynamically allocated bdi in request_queue
-dnl # 6.11: bdi no longer available through request_queue, so get it from
-dnl #       the gendisk attached to the queue
 dnl #
 AC_DEFUN([ZFS_AC_KERNEL_SRC_BLK_QUEUE_BDI], [
 	ZFS_LINUX_TEST_SRC([blk_queue_bdi], [
@ -49,30 +47,6 @@ AC_DEFUN([ZFS_AC_KERNEL_BLK_QUEUE_BDI], [
 	])
 ])

-AC_DEFUN([ZFS_AC_KERNEL_SRC_BLK_QUEUE_DISK_BDI], [
-	ZFS_LINUX_TEST_SRC([blk_queue_disk_bdi], [
-		#include <linux/blkdev.h>
-		#include <linux/backing-dev.h>
-	], [
-		struct request_queue q;
-		struct gendisk disk;
-		struct backing_dev_info bdi __attribute__ ((unused));
-		q.disk = &disk;
-		q.disk->bdi = &bdi;
-	])
-])
-
-AC_DEFUN([ZFS_AC_KERNEL_BLK_QUEUE_DISK_BDI], [
-	AC_MSG_CHECKING([whether backing_dev_info is available through queue gendisk])
-	ZFS_LINUX_TEST_RESULT([blk_queue_disk_bdi], [
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_BLK_QUEUE_DISK_BDI, 1,
-		    [backing_dev_info is available through queue gendisk])
-	],[
-		AC_MSG_RESULT(no)
-	])
-])
-
 dnl #
 dnl # 5.9: added blk_queue_update_readahead(),
 dnl # 5.15: renamed to disk_update_readahead()
@ -358,7 +332,7 @@ AC_DEFUN([ZFS_AC_KERNEL_BLK_QUEUE_MAX_HW_SECTORS], [
 	ZFS_LINUX_TEST_RESULT([blk_queue_max_hw_sectors], [
 		AC_MSG_RESULT(yes)
 	],[
-		AC_MSG_RESULT(no)
+		ZFS_LINUX_TEST_ERROR([blk_queue_max_hw_sectors])
 	])
 ])

@ -381,7 +355,7 @@ AC_DEFUN([ZFS_AC_KERNEL_BLK_QUEUE_MAX_SEGMENTS], [
 	ZFS_LINUX_TEST_RESULT([blk_queue_max_segments], [
 		AC_MSG_RESULT(yes)
 	], [
-		AC_MSG_RESULT(no)
+		ZFS_LINUX_TEST_ERROR([blk_queue_max_segments])
 	])
 ])

@ -403,14 +377,6 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_BLK_MQ], [
 		(void) blk_mq_alloc_tag_set(&tag_set);
 		return BLK_STS_OK;
 	], [])
-	ZFS_LINUX_TEST_SRC([blk_mq_rq_hctx], [
-		#include <linux/blk-mq.h>
-		#include <linux/blkdev.h>
-	], [
-		struct request rq = {0};
-		struct blk_mq_hw_ctx *hctx = NULL;
-		rq.mq_hctx = hctx;
-	], [])
 ])

 AC_DEFUN([ZFS_AC_KERNEL_BLK_MQ], [
@ -418,13 +384,6 @@ AC_DEFUN([ZFS_AC_KERNEL_BLK_MQ], [
 	ZFS_LINUX_TEST_RESULT([blk_mq], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_BLK_MQ, 1, [block multiqueue is available])
-		AC_MSG_CHECKING([whether block multiqueue hardware context is cached in struct request])
-		ZFS_LINUX_TEST_RESULT([blk_mq_rq_hctx], [
-			AC_MSG_RESULT(yes)
-			AC_DEFINE(HAVE_BLK_MQ_RQ_HCTX, 1, [block multiqueue hardware context is cached in struct request])
-		], [
-			AC_MSG_RESULT(no)
-		])
 	], [
 		AC_MSG_RESULT(no)
 	])
@ -433,7 +392,6 @@ AC_DEFUN([ZFS_AC_KERNEL_BLK_MQ], [
 AC_DEFUN([ZFS_AC_KERNEL_SRC_BLK_QUEUE], [
 	ZFS_AC_KERNEL_SRC_BLK_QUEUE_PLUG
 	ZFS_AC_KERNEL_SRC_BLK_QUEUE_BDI
-	ZFS_AC_KERNEL_SRC_BLK_QUEUE_DISK_BDI
 	ZFS_AC_KERNEL_SRC_BLK_QUEUE_UPDATE_READAHEAD
 	ZFS_AC_KERNEL_SRC_BLK_QUEUE_DISCARD
 	ZFS_AC_KERNEL_SRC_BLK_QUEUE_SECURE_ERASE
@ -448,7 +406,6 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_BLK_QUEUE], [
 AC_DEFUN([ZFS_AC_KERNEL_BLK_QUEUE], [
 	ZFS_AC_KERNEL_BLK_QUEUE_PLUG
 	ZFS_AC_KERNEL_BLK_QUEUE_BDI
-	ZFS_AC_KERNEL_BLK_QUEUE_DISK_BDI
 	ZFS_AC_KERNEL_BLK_QUEUE_UPDATE_READAHEAD
 	ZFS_AC_KERNEL_BLK_QUEUE_DISCARD
 	ZFS_AC_KERNEL_BLK_QUEUE_SECURE_ERASE
--- a/config/kernel-blkdev.m4
+++ b/config/kernel-blkdev.m4
@ -35,45 +35,6 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_BLKDEV_GET_BY_PATH_4ARG], [
 	])
 ])

-dnl #
-dnl # 6.8.x API change
-dnl # bdev_open_by_path() replaces blkdev_get_by_path()
-dnl #
-AC_DEFUN([ZFS_AC_KERNEL_SRC_BLKDEV_BDEV_OPEN_BY_PATH], [
-	ZFS_LINUX_TEST_SRC([bdev_open_by_path], [
-		#include <linux/fs.h>
-		#include <linux/blkdev.h>
-	], [
-		struct bdev_handle *bdh __attribute__ ((unused)) = NULL;
-		const char *path = "path";
-		fmode_t mode = 0;
-		void *holder = NULL;
-		struct blk_holder_ops h;
-
-		bdh = bdev_open_by_path(path, mode, holder, &h);
-	])
-])
-
-dnl #
-dnl # 6.9.x API change
-dnl # bdev_file_open_by_path() replaced bdev_open_by_path(),
-dnl # and returns struct file*
-dnl #
-AC_DEFUN([ZFS_AC_KERNEL_SRC_BDEV_FILE_OPEN_BY_PATH], [
-	ZFS_LINUX_TEST_SRC([bdev_file_open_by_path], [
-		#include <linux/fs.h>
-		#include <linux/blkdev.h>
-	], [
-		struct file *file __attribute__ ((unused)) = NULL;
-		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, &h);
-	])
-])
-
 AC_DEFUN([ZFS_AC_KERNEL_BLKDEV_GET_BY_PATH], [
 	AC_MSG_CHECKING([whether blkdev_get_by_path() exists and takes 3 args])
 	ZFS_LINUX_TEST_RESULT([blkdev_get_by_path], [
@ -86,26 +47,9 @@ AC_DEFUN([ZFS_AC_KERNEL_BLKDEV_GET_BY_PATH], [
 				[blkdev_get_by_path() exists and takes 4 args])
 			AC_MSG_RESULT(yes)
 		], [
-			AC_MSG_RESULT(no)
-			AC_MSG_CHECKING([whether bdev_open_by_path() exists])
-			ZFS_LINUX_TEST_RESULT([bdev_open_by_path], [
-				AC_DEFINE(HAVE_BDEV_OPEN_BY_PATH, 1,
-					[bdev_open_by_path() exists])
-				AC_MSG_RESULT(yes)
-			], [
-				AC_MSG_RESULT(no)
-				AC_MSG_CHECKING([whether bdev_file_open_by_path() exists])
-				ZFS_LINUX_TEST_RESULT([bdev_file_open_by_path], [
-					AC_DEFINE(HAVE_BDEV_FILE_OPEN_BY_PATH, 1,
-						[bdev_file_open_by_path() exists])
-					AC_MSG_RESULT(yes)
-				], [
-					AC_MSG_RESULT(no)
 			ZFS_LINUX_TEST_ERROR([blkdev_get_by_path()])
 		])
 	])
-		])
-	])
 ])

 dnl #
@ -164,50 +108,18 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_BLKDEV_PUT_HOLDER], [
 	])
 ])

-dnl #
-dnl # 6.8.x API change
-dnl # bdev_release() replaces blkdev_put()
-dnl #
-AC_DEFUN([ZFS_AC_KERNEL_SRC_BLKDEV_BDEV_RELEASE], [
-	ZFS_LINUX_TEST_SRC([bdev_release], [
-		#include <linux/fs.h>
-		#include <linux/blkdev.h>
-	], [
-		struct bdev_handle *bdh = NULL;
-		bdev_release(bdh);
-	])
-])
-
-dnl #
-dnl # 6.9.x API change
-dnl #
-dnl # bdev_release() now private, but because bdev_file_open_by_path() returns
-dnl # struct file*, we can just use fput(). So the blkdev_put test no longer
-dnl # fails if not found.
-dnl #
-
 AC_DEFUN([ZFS_AC_KERNEL_BLKDEV_PUT], [
 	AC_MSG_CHECKING([whether blkdev_put() exists])
 	ZFS_LINUX_TEST_RESULT([blkdev_put], [
 		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_BLKDEV_PUT, 1, [blkdev_put() exists])
 	], [
-		AC_MSG_RESULT(no)
 		AC_MSG_CHECKING([whether blkdev_put() accepts void* as arg 2])
 		ZFS_LINUX_TEST_RESULT([blkdev_put_holder], [
 			AC_MSG_RESULT(yes)
 			AC_DEFINE(HAVE_BLKDEV_PUT_HOLDER, 1,
 				[blkdev_put() accepts void* as arg 2])
 		], [
-			AC_MSG_RESULT(no)
-			AC_MSG_CHECKING([whether bdev_release() exists])
-			ZFS_LINUX_TEST_RESULT([bdev_release], [
-				AC_MSG_RESULT(yes)
-				AC_DEFINE(HAVE_BDEV_RELEASE, 1,
-					[bdev_release() exists])
-			], [
-				AC_MSG_RESULT(no)
-			])
+			ZFS_LINUX_TEST_ERROR([blkdev_put()])
 		])
 	])
 ])
@ -534,30 +446,6 @@ AC_DEFUN([ZFS_AC_KERNEL_BLKDEV_BDEV_WHOLE], [
 	])
 ])

-dnl #
-dnl # 5.16 API change
-dnl # Added bdev_nr_bytes() helper.
-dnl #
-AC_DEFUN([ZFS_AC_KERNEL_SRC_BLKDEV_BDEV_NR_BYTES], [
-	ZFS_LINUX_TEST_SRC([bdev_nr_bytes], [
-		#include <linux/blkdev.h>
-	],[
-		struct block_device *bdev = NULL;
-		loff_t nr_bytes __attribute__ ((unused)) = 0;
-		nr_bytes = bdev_nr_bytes(bdev);
-	])
-])
-
-AC_DEFUN([ZFS_AC_KERNEL_BLKDEV_BDEV_NR_BYTES], [
-	AC_MSG_CHECKING([whether bdev_nr_bytes() is available])
-	ZFS_LINUX_TEST_RESULT([bdev_nr_bytes], [
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_BDEV_NR_BYTES, 1, [bdev_nr_bytes() is available])
-	],[
-		AC_MSG_RESULT(no)
-	])
-])
-
 dnl #
 dnl # 5.20 API change,
 dnl # Removed bdevname(), snprintf(.., %pg) should be used.
@ -585,29 +473,11 @@ AC_DEFUN([ZFS_AC_KERNEL_BLKDEV_BDEVNAME], [
 ])

 dnl #
-dnl # TRIM support: discard and secure erase. We make use of asynchronous
-dnl #               functions when available.
+dnl # 5.19 API: blkdev_issue_secure_erase()
+dnl # 3.10 API: blkdev_issue_discard(..., BLKDEV_DISCARD_SECURE)
 dnl #
-dnl # 3.10:
-dnl #   sync discard:  blkdev_issue_discard(..., 0)
-dnl #   sync erase:    blkdev_issue_discard(..., BLKDEV_DISCARD_SECURE)
-dnl #   async discard: [not available]
-dnl #   async erase:   [not available]
-dnl #
-dnl # 4.7:
-dnl #   sync discard:  blkdev_issue_discard(..., 0)
-dnl #   sync erase:    blkdev_issue_discard(..., BLKDEV_DISCARD_SECURE)
-dnl #   async discard: __blkdev_issue_discard(..., 0)
-dnl #   async erase:   __blkdev_issue_discard(..., BLKDEV_DISCARD_SECURE)
-dnl #
-dnl # 5.19:
-dnl #   sync discard:  blkdev_issue_discard(...)
-dnl #   sync erase:    blkdev_issue_secure_erase(...)
-dnl #   async discard: __blkdev_issue_discard(...)
-dnl #   async erase:   [not available]
-dnl #
-AC_DEFUN([ZFS_AC_KERNEL_SRC_BLKDEV_ISSUE_DISCARD], [
-	ZFS_LINUX_TEST_SRC([blkdev_issue_discard_noflags], [
+AC_DEFUN([ZFS_AC_KERNEL_SRC_BLKDEV_ISSUE_SECURE_ERASE], [
+	ZFS_LINUX_TEST_SRC([blkdev_issue_secure_erase], [
 		#include <linux/blkdev.h>
 	],[
 		struct block_device *bdev = NULL;
@ -615,9 +485,10 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_BLKDEV_ISSUE_DISCARD], [
 		sector_t nr_sects = 0;
 		int error __attribute__ ((unused));

-		error = blkdev_issue_discard(bdev,
+		error = blkdev_issue_secure_erase(bdev,
 		    sector, nr_sects, GFP_KERNEL);
 	])
+
 	ZFS_LINUX_TEST_SRC([blkdev_issue_discard_flags], [
 		#include <linux/blkdev.h>
 	],[
@ -630,77 +501,9 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_BLKDEV_ISSUE_DISCARD], [
 		error = blkdev_issue_discard(bdev,
 		    sector, nr_sects, GFP_KERNEL, flags);
 	])
-	ZFS_LINUX_TEST_SRC([blkdev_issue_discard_async_noflags], [
-		#include <linux/blkdev.h>
-	],[
-		struct block_device *bdev = NULL;
-		sector_t sector = 0;
-		sector_t nr_sects = 0;
-		struct bio *biop = NULL;
-		int error __attribute__ ((unused));
-
-		error = __blkdev_issue_discard(bdev,
-		    sector, nr_sects, GFP_KERNEL, &biop);
-	])
-	ZFS_LINUX_TEST_SRC([blkdev_issue_discard_async_flags], [
-		#include <linux/blkdev.h>
-	],[
-		struct block_device *bdev = NULL;
-		sector_t sector = 0;
-		sector_t nr_sects = 0;
-		unsigned long flags = 0;
-		struct bio *biop = NULL;
-		int error __attribute__ ((unused));
-
-		error = __blkdev_issue_discard(bdev,
-		    sector, nr_sects, GFP_KERNEL, flags, &biop);
-	])
-	ZFS_LINUX_TEST_SRC([blkdev_issue_secure_erase], [
-		#include <linux/blkdev.h>
-	],[
-		struct block_device *bdev = NULL;
-		sector_t sector = 0;
-		sector_t nr_sects = 0;
-		int error __attribute__ ((unused));
-
-		error = blkdev_issue_secure_erase(bdev,
-		    sector, nr_sects, GFP_KERNEL);
-	])
 ])

-AC_DEFUN([ZFS_AC_KERNEL_BLKDEV_ISSUE_DISCARD], [
-	AC_MSG_CHECKING([whether blkdev_issue_discard() is available])
-	ZFS_LINUX_TEST_RESULT([blkdev_issue_discard_noflags], [
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_BLKDEV_ISSUE_DISCARD_NOFLAGS, 1,
-		    [blkdev_issue_discard() is available])
-	],[
-		AC_MSG_RESULT(no)
-	])
-	AC_MSG_CHECKING([whether blkdev_issue_discard(flags) is available])
-	ZFS_LINUX_TEST_RESULT([blkdev_issue_discard_flags], [
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_BLKDEV_ISSUE_DISCARD_FLAGS, 1,
-		    [blkdev_issue_discard(flags) is available])
-	],[
-		AC_MSG_RESULT(no)
-	])
-	AC_MSG_CHECKING([whether __blkdev_issue_discard() is available])
-	ZFS_LINUX_TEST_RESULT([blkdev_issue_discard_async_noflags], [
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_BLKDEV_ISSUE_DISCARD_ASYNC_NOFLAGS, 1,
-		    [__blkdev_issue_discard() is available])
-	],[
-		AC_MSG_RESULT(no)
-	])
-	AC_MSG_CHECKING([whether __blkdev_issue_discard(flags) is available])
-	ZFS_LINUX_TEST_RESULT([blkdev_issue_discard_async_flags], [
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_BLKDEV_ISSUE_DISCARD_ASYNC_FLAGS, 1,
-		    [__blkdev_issue_discard(flags) is available])
-	],[
-		AC_MSG_RESULT(no)
-	])
+AC_DEFUN([ZFS_AC_KERNEL_BLKDEV_ISSUE_SECURE_ERASE], [
 	AC_MSG_CHECKING([whether blkdev_issue_secure_erase() is available])
 	ZFS_LINUX_TEST_RESULT([blkdev_issue_secure_erase], [
 		AC_MSG_RESULT(yes)
@ -708,6 +511,15 @@ AC_DEFUN([ZFS_AC_KERNEL_BLKDEV_ISSUE_DISCARD], [
 		    [blkdev_issue_secure_erase() is available])
 	],[
 		AC_MSG_RESULT(no)
+
+		AC_MSG_CHECKING([whether blkdev_issue_discard() is available])
+		ZFS_LINUX_TEST_RESULT([blkdev_issue_discard_flags], [
+			AC_MSG_RESULT(yes)
+			AC_DEFINE(HAVE_BLKDEV_ISSUE_DISCARD, 1,
+			    [blkdev_issue_discard() is available])
+		],[
+			ZFS_LINUX_TEST_ERROR([blkdev_issue_discard()])
+		])
 	])
 ])

@ -758,11 +570,8 @@ AC_DEFUN([ZFS_AC_KERNEL_BLKDEV_BLK_STS_RESV_CONFLICT], [
 AC_DEFUN([ZFS_AC_KERNEL_SRC_BLKDEV], [
 	ZFS_AC_KERNEL_SRC_BLKDEV_GET_BY_PATH
 	ZFS_AC_KERNEL_SRC_BLKDEV_GET_BY_PATH_4ARG
-	ZFS_AC_KERNEL_SRC_BLKDEV_BDEV_OPEN_BY_PATH
-	ZFS_AC_KERNEL_SRC_BDEV_FILE_OPEN_BY_PATH
 	ZFS_AC_KERNEL_SRC_BLKDEV_PUT
 	ZFS_AC_KERNEL_SRC_BLKDEV_PUT_HOLDER
-	ZFS_AC_KERNEL_SRC_BLKDEV_BDEV_RELEASE
 	ZFS_AC_KERNEL_SRC_BLKDEV_REREAD_PART
 	ZFS_AC_KERNEL_SRC_BLKDEV_INVALIDATE_BDEV
 	ZFS_AC_KERNEL_SRC_BLKDEV_LOOKUP_BDEV
@ -771,9 +580,8 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_BLKDEV], [
 	ZFS_AC_KERNEL_SRC_BLKDEV_CHECK_DISK_CHANGE
 	ZFS_AC_KERNEL_SRC_BLKDEV_BDEV_CHECK_MEDIA_CHANGE
 	ZFS_AC_KERNEL_SRC_BLKDEV_BDEV_WHOLE
-	ZFS_AC_KERNEL_SRC_BLKDEV_BDEV_NR_BYTES
 	ZFS_AC_KERNEL_SRC_BLKDEV_BDEVNAME
-	ZFS_AC_KERNEL_SRC_BLKDEV_ISSUE_DISCARD
+	ZFS_AC_KERNEL_SRC_BLKDEV_ISSUE_SECURE_ERASE
 	ZFS_AC_KERNEL_SRC_BLKDEV_BDEV_KOBJ
 	ZFS_AC_KERNEL_SRC_BLKDEV_PART_TO_DEV
 	ZFS_AC_KERNEL_SRC_BLKDEV_DISK_CHECK_MEDIA_CHANGE
@ -792,10 +600,9 @@ AC_DEFUN([ZFS_AC_KERNEL_BLKDEV], [
 	ZFS_AC_KERNEL_BLKDEV_CHECK_DISK_CHANGE
 	ZFS_AC_KERNEL_BLKDEV_BDEV_CHECK_MEDIA_CHANGE
 	ZFS_AC_KERNEL_BLKDEV_BDEV_WHOLE
-	ZFS_AC_KERNEL_BLKDEV_BDEV_NR_BYTES
 	ZFS_AC_KERNEL_BLKDEV_BDEVNAME
 	ZFS_AC_KERNEL_BLKDEV_GET_ERESTARTSYS
-	ZFS_AC_KERNEL_BLKDEV_ISSUE_DISCARD
+	ZFS_AC_KERNEL_BLKDEV_ISSUE_SECURE_ERASE
 	ZFS_AC_KERNEL_BLKDEV_BDEV_KOBJ
 	ZFS_AC_KERNEL_BLKDEV_PART_TO_DEV
 	ZFS_AC_KERNEL_BLKDEV_DISK_CHECK_MEDIA_CHANGE
--- a/config/kernel-block-device-operations.m4
+++ b/config/kernel-block-device-operations.m4
@ -5,7 +5,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_BLOCK_DEVICE_OPERATIONS_CHECK_EVENTS], [
 	ZFS_LINUX_TEST_SRC([block_device_operations_check_events], [
 		#include <linux/blkdev.h>

-		static unsigned int blk_check_events(struct gendisk *disk,
+		unsigned int blk_check_events(struct gendisk *disk,
 		    unsigned int clearing) {
 			(void) disk, (void) clearing;
 			return (0);
@ -34,7 +34,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_BLOCK_DEVICE_OPERATIONS_RELEASE_VOID], [
 	ZFS_LINUX_TEST_SRC([block_device_operations_release_void], [
 		#include <linux/blkdev.h>

-		static void blk_release(struct gendisk *g, fmode_t mode) {
+		void blk_release(struct gendisk *g, fmode_t mode) {
 			(void) g, (void) mode;
 			return;
 		}
@ -56,7 +56,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_BLOCK_DEVICE_OPERATIONS_RELEASE_1ARG], [
 	ZFS_LINUX_TEST_SRC([block_device_operations_release_void_1arg], [
 		#include <linux/blkdev.h>

-		static void blk_release(struct gendisk *g) {
+		void blk_release(struct gendisk *g) {
 			(void) g;
 			return;
 		}
@ -96,7 +96,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK], [
 	ZFS_LINUX_TEST_SRC([block_device_operations_revalidate_disk], [
 		#include <linux/blkdev.h>

-		static int blk_revalidate_disk(struct gendisk *disk) {
+		int blk_revalidate_disk(struct gendisk *disk) {
 			(void) disk;
 			return(0);
 		}
--- a/config/kernel-commit-metadata.m4
+++ b/config/kernel-commit-metadata.m4
@ -7,7 +7,7 @@ dnl #
 AC_DEFUN([ZFS_AC_KERNEL_SRC_COMMIT_METADATA], [
 	ZFS_LINUX_TEST_SRC([export_operations_commit_metadata], [
 		#include <linux/exportfs.h>
-		static int commit_metadata(struct inode *inode) { return 0; }
+		int commit_metadata(struct inode *inode) { return 0; }
 		static struct export_operations eops __attribute__ ((unused))={
 			.commit_metadata = commit_metadata,
 		};
--- a/config/kernel-current-time.m4
+++ b/config/kernel-current-time.m4
@ -2,15 +2,12 @@ dnl #
 dnl # 4.9, current_time() added
 dnl # 4.18, return type changed from timespec to timespec64
 dnl #
-dnl # Note that we don't care about the return type in this check. If we have
-dnl # to implement a fallback, we'll know we're <4.9, which was timespec.
-dnl #
 AC_DEFUN([ZFS_AC_KERNEL_SRC_CURRENT_TIME], [
 	ZFS_LINUX_TEST_SRC([current_time], [
 		#include <linux/fs.h>
 	], [
 		struct inode ip __attribute__ ((unused));
-		(void) current_time(&ip);
+		ip.i_atime = current_time(&ip);
 	])
 ])

--- a/config/kernel-dentry-operations.m4
+++ b/config/kernel-dentry-operations.m4
@ -98,7 +98,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_D_REVALIDATE_NAMEIDATA], [
 		#include <linux/dcache.h>
 		#include <linux/sched.h>

-		static int revalidate (struct dentry *dentry,
+		int revalidate (struct dentry *dentry,
 		    struct nameidata *nidata) { return 0; }

 		static const struct dentry_operations
--- a/config/kernel-dirty-inode.m4
+++ b/config/kernel-dirty-inode.m4
@ -8,7 +8,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_DIRTY_INODE], [
 	ZFS_LINUX_TEST_SRC([dirty_inode_with_flags], [
 		#include <linux/fs.h>

-		static void dirty_inode(struct inode *a, int b) { return; }
+		void dirty_inode(struct inode *a, int b) { return; }

 		static const struct super_operations
 		    sops __attribute__ ((unused)) = {
--- a/config/kernel-encode-fh-inode.m4
+++ b/config/kernel-encode-fh-inode.m4
@ -7,7 +7,7 @@ dnl #
 AC_DEFUN([ZFS_AC_KERNEL_SRC_ENCODE_FH_WITH_INODE], [
 	ZFS_LINUX_TEST_SRC([export_operations_encode_fh], [
 		#include <linux/exportfs.h>
-		static int encode_fh(struct inode *inode, __u32 *fh, int *max_len,
+		int encode_fh(struct inode *inode, __u32 *fh, int *max_len,
 		              struct inode *parent) { return 0; }
 		static struct export_operations eops __attribute__ ((unused))={
 			.encode_fh = encode_fh,
--- a/config/kernel-evict-inode.m4
+++ b/config/kernel-evict-inode.m4
@ -6,7 +6,7 @@ dnl #
 AC_DEFUN([ZFS_AC_KERNEL_SRC_EVICT_INODE], [
 	ZFS_LINUX_TEST_SRC([evict_inode], [
 		#include <linux/fs.h>
-		static void evict_inode (struct inode * t) { return; }
+		void evict_inode (struct inode * t) { return; }
 		static struct super_operations sops __attribute__ ((unused)) = {
 			.evict_inode = evict_inode,
 		};
--- a/config/kernel-fallocate.m4
+++ b/config/kernel-fallocate.m4
@ -11,7 +11,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_FALLOCATE], [
 	ZFS_LINUX_TEST_SRC([file_fallocate], [
 		#include <linux/fs.h>

-		static long test_fallocate(struct file *file, int mode,
+		long test_fallocate(struct file *file, int mode,
 		    loff_t offset, loff_t len) { return 0; }

 		static const struct file_operations
--- a/config/kernel-filemap.m4
+++ b/config/kernel-filemap.m4
@ -4,7 +4,6 @@ dnl #
 AC_DEFUN([ZFS_AC_KERNEL_SRC_FILEMAP], [
 	ZFS_LINUX_TEST_SRC([filemap_range_has_page], [
 		#include <linux/fs.h>
-		#include <linux/pagemap.h>
 	],[
 		struct address_space *mapping = NULL;
 		loff_t lstart = 0;
--- a/config/kernel-flush_dcache_page.m4
+++ b/config/kernel-flush_dcache_page.m4
@ -1,8 +1,7 @@
 dnl #
 dnl # Starting from Linux 5.13, flush_dcache_page() becomes an inline
-dnl # function and may indirectly referencing GPL-only symbols:
-dnl # on powerpc: cpu_feature_keys
-dnl # on riscv: PageHuge (added from 6.2)
+dnl # function and may indirectly referencing GPL-only cpu_feature_keys on
+dnl # powerpc
 dnl #

 dnl #
--- a/config/kernel-fpu.m4
+++ b/config/kernel-fpu.m4
@ -79,12 +79,6 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_FPU], [
 		__kernel_fpu_end();
 	], [], [ZFS_META_LICENSE])

-	ZFS_LINUX_TEST_SRC([kernel_neon], [
-		#include <asm/neon.h>
-	], [
-		kernel_neon_begin();
-		kernel_neon_end();
-	], [], [ZFS_META_LICENSE])
 ])

 AC_DEFUN([ZFS_AC_KERNEL_FPU], [
@ -111,20 +105,9 @@ AC_DEFUN([ZFS_AC_KERNEL_FPU], [
 			AC_DEFINE(KERNEL_EXPORTS_X86_FPU, 1,
 			    [kernel exports FPU functions])
 		],[
-			dnl #
-			dnl # ARM neon symbols (only on arm and arm64)
-			dnl # could be GPL-only on arm64 after Linux 6.2
-			dnl #
-			ZFS_LINUX_TEST_RESULT([kernel_neon_license],[
-				AC_MSG_RESULT(kernel_neon_*)
-				AC_DEFINE(HAVE_KERNEL_NEON, 1,
-				    [kernel has kernel_neon_* functions])
-			],[
-				# catch-all
 			AC_MSG_RESULT(internal)
 			AC_DEFINE(HAVE_KERNEL_FPU_INTERNAL, 1,
 			    [kernel fpu internal])
 		])
 	])
-	])
 ])
--- a/config/kernel-fsync-bdev.m4
+++ b/config/kernel-fsync-bdev.m4
@ -1,36 +0,0 @@
-dnl #
-dnl # 6.6 API change,
-dnl # fsync_bdev was removed in favor of sync_blockdev
-dnl #
-AC_DEFUN([ZFS_AC_KERNEL_SRC_SYNC_BDEV], [
-	ZFS_LINUX_TEST_SRC([fsync_bdev], [
-		#include <linux/blkdev.h>
-	],[
-		fsync_bdev(NULL);
-	])
-
-	ZFS_LINUX_TEST_SRC([sync_blockdev], [
-		#include <linux/blkdev.h>
-	],[
-		sync_blockdev(NULL);
-	])
-])
-
-AC_DEFUN([ZFS_AC_KERNEL_SYNC_BDEV], [
-	AC_MSG_CHECKING([whether fsync_bdev() exists])
-	ZFS_LINUX_TEST_RESULT([fsync_bdev], [
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_FSYNC_BDEV, 1,
-		    [fsync_bdev() is declared in include/blkdev.h])
-	],[
-		AC_MSG_CHECKING([whether sync_blockdev() exists])
-		ZFS_LINUX_TEST_RESULT([sync_blockdev], [
-			AC_MSG_RESULT(yes)
-			AC_DEFINE(HAVE_SYNC_BLOCKDEV, 1,
-			    [sync_blockdev() is declared in include/blkdev.h])
-		],[
-			ZFS_LINUX_TEST_ERROR(
-			    [neither fsync_bdev() nor sync_blockdev() exist])
-		])
-	])
-])
--- a/config/kernel-fsync.m4
+++ b/config/kernel-fsync.m4
@ -5,7 +5,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_FSYNC], [
 	ZFS_LINUX_TEST_SRC([fsync_without_dentry], [
 		#include <linux/fs.h>

-		static int test_fsync(struct file *f, int x) { return 0; }
+		int test_fsync(struct file *f, int x) { return 0; }

 		static const struct file_operations
 		    fops __attribute__ ((unused)) = {
@ -16,7 +16,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_FSYNC], [
 	ZFS_LINUX_TEST_SRC([fsync_range], [
 		#include <linux/fs.h>

-		static int test_fsync(struct file *f, loff_t a, loff_t b, int c)
+		int test_fsync(struct file *f, loff_t a, loff_t b, int c)
 		    { return 0; }

 		static const struct file_operations
--- a/config/kernel-generic_fillattr.m4
+++ b/config/kernel-generic_fillattr.m4
@ -7,10 +7,6 @@ dnl #
 dnl # 6.3 API
 dnl # generic_fillattr() now takes struct mnt_idmap* as the first argument
 dnl #
-dnl # 6.6 API
-dnl # generic_fillattr() now takes u32 as second argument, representing a
-dnl # request_mask for statx
-dnl #
 AC_DEFUN([ZFS_AC_KERNEL_SRC_GENERIC_FILLATTR], [
 	ZFS_LINUX_TEST_SRC([generic_fillattr_userns], [
 		#include <linux/fs.h>
@ -29,25 +25,9 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_GENERIC_FILLATTR], [
 		struct kstat *k = NULL;
 		generic_fillattr(idmap, in, k);
 	])
-
-	ZFS_LINUX_TEST_SRC([generic_fillattr_mnt_idmap_reqmask], [
-		#include <linux/fs.h>
-	],[
-		struct mnt_idmap *idmap = NULL;
-		struct inode *in = NULL;
-		struct kstat *k = NULL;
-		generic_fillattr(idmap, 0, in, k);
-	])
 ])

 AC_DEFUN([ZFS_AC_KERNEL_GENERIC_FILLATTR], [
-	AC_MSG_CHECKING(
-	    [whether generic_fillattr requires struct mnt_idmap* and request_mask])
-	ZFS_LINUX_TEST_RESULT([generic_fillattr_mnt_idmap_reqmask], [
-		AC_MSG_RESULT([yes])
-		AC_DEFINE(HAVE_GENERIC_FILLATTR_IDMAP_REQMASK, 1,
-		    [generic_fillattr requires struct mnt_idmap* and u32 request_mask])
-	],[
 	AC_MSG_CHECKING([whether generic_fillattr requires struct mnt_idmap*])
 	ZFS_LINUX_TEST_RESULT([generic_fillattr_mnt_idmap], [
 		AC_MSG_RESULT([yes])
@ -63,6 +43,5 @@ AC_DEFUN([ZFS_AC_KERNEL_GENERIC_FILLATTR], [
 			AC_MSG_RESULT([no])
 		])
 	])
-	])
 ])

--- a/config/kernel-get-link.m4
+++ b/config/kernel-get-link.m4
@ -5,7 +5,7 @@ dnl #
 AC_DEFUN([ZFS_AC_KERNEL_SRC_GET_LINK], [
 	ZFS_LINUX_TEST_SRC([inode_operations_get_link], [
 		#include <linux/fs.h>
-		static const char *get_link(struct dentry *de, struct inode *ip,
+		const char *get_link(struct dentry *de, struct inode *ip,
 		    struct delayed_call *done) { return "symlink"; }
 		static struct inode_operations
 		     iops __attribute__ ((unused)) = {
@ -15,7 +15,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_GET_LINK], [

 	ZFS_LINUX_TEST_SRC([inode_operations_get_link_cookie], [
 		#include <linux/fs.h>
-		static const char *get_link(struct dentry *de, struct
+		const char *get_link(struct dentry *de, struct
 		    inode *ip, void **cookie) { return "symlink"; }
 		static struct inode_operations
 		     iops __attribute__ ((unused)) = {
@ -25,7 +25,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_GET_LINK], [

 	ZFS_LINUX_TEST_SRC([inode_operations_follow_link], [
 		#include <linux/fs.h>
-		static const char *follow_link(struct dentry *de,
+		const char *follow_link(struct dentry *de,
 		    void **cookie) { return "symlink"; }
 		static struct inode_operations
 		    iops __attribute__ ((unused)) = {
@ -35,7 +35,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_GET_LINK], [

 	ZFS_LINUX_TEST_SRC([inode_operations_follow_link_nameidata], [
 		#include <linux/fs.h>
-		static void *follow_link(struct dentry *de, struct
+		void *follow_link(struct dentry *de, struct
 		    nameidata *nd) { return (void *)NULL; }
 		static struct inode_operations
 		    iops __attribute__ ((unused)) = {
--- a/config/kernel-idmap_mnt_api.m4
+++ b/config/kernel-idmap_mnt_api.m4
@ -23,28 +23,3 @@ AC_DEFUN([ZFS_AC_KERNEL_IDMAP_MNT_API], [
        ])
 ])

-dnl #
-dnl # 6.8 decouples mnt_idmap from user_namespace. This is all internal
-dnl # to mnt_idmap so we can't detect it directly, but we detect a related
-dnl # change as use that as a signal.
-dnl #
-AC_DEFUN([ZFS_AC_KERNEL_SRC_IDMAP_NO_USERNS], [
-	ZFS_LINUX_TEST_SRC([idmap_no_userns], [
-		#include <linux/uidgid.h>
-	], [
-		struct uid_gid_map *map = NULL;
-		map_id_down(map, 0);
-	])
-])
-
-
-AC_DEFUN([ZFS_AC_KERNEL_IDMAP_NO_USERNS], [
-	AC_MSG_CHECKING([whether idmapped mounts have a user namespace])
-	ZFS_LINUX_TEST_RESULT([idmap_no_userns], [
-		AC_MSG_RESULT([yes])
-		AC_DEFINE(HAVE_IDMAP_NO_USERNS, 1,
-			[mnt_idmap does not have user_namespace])
-	], [
-		AC_MSG_RESULT([no])
-	])
-])
--- a/config/kernel-inode-create.m4
+++ b/config/kernel-inode-create.m4
@ -7,7 +7,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_CREATE], [
 		#include <linux/fs.h>
 		#include <linux/sched.h>

-		static int inode_create(struct mnt_idmap *idmap,
+		int inode_create(struct mnt_idmap *idmap,
 		    struct inode *inode ,struct dentry *dentry,
 		    umode_t umode, bool flag) { return 0; }

@ -25,7 +25,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_CREATE], [
 		#include <linux/fs.h>
 		#include <linux/sched.h>

-		static int inode_create(struct user_namespace *userns,
+		int inode_create(struct user_namespace *userns,
 		    struct inode *inode ,struct dentry *dentry,
 		    umode_t umode, bool flag) { return 0; }

@ -42,7 +42,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_CREATE], [
 		#include <linux/fs.h>
 		#include <linux/sched.h>

-		static int inode_create(struct inode *inode ,struct dentry *dentry,
+		int inode_create(struct inode *inode ,struct dentry *dentry,
 		    umode_t umode, bool flag) { return 0; }

 		static const struct inode_operations
--- a/config/kernel-inode-getattr.m4
+++ b/config/kernel-inode-getattr.m4
@ -7,7 +7,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_INODE_GETATTR], [
 	ZFS_LINUX_TEST_SRC([inode_operations_getattr_mnt_idmap], [
 		#include <linux/fs.h>

-		static int test_getattr(
+		int test_getattr(
 		    struct mnt_idmap *idmap,
 		    const struct path *p, struct kstat *k,
 		    u32 request_mask, unsigned int query_flags)
@ -28,7 +28,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_INODE_GETATTR], [
 	ZFS_LINUX_TEST_SRC([inode_operations_getattr_userns], [
 		#include <linux/fs.h>

-		static int test_getattr(
+		int test_getattr(
 			struct user_namespace *userns,
 		    const struct path *p, struct kstat *k,
 		    u32 request_mask, unsigned int query_flags)
@ -47,7 +47,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_INODE_GETATTR], [
 	ZFS_LINUX_TEST_SRC([inode_operations_getattr_path], [
 		#include <linux/fs.h>

-		static int test_getattr(
+		int test_getattr(
 		    const struct path *p, struct kstat *k,
 		    u32 request_mask, unsigned int query_flags)
 		    { return 0; }
@ -61,7 +61,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_INODE_GETATTR], [
 	ZFS_LINUX_TEST_SRC([inode_operations_getattr_vfsmount], [
 		#include <linux/fs.h>

-		static int test_getattr(
+		int test_getattr(
 		    struct vfsmount *mnt, struct dentry *d,
 		    struct kstat *k)
 		    { return 0; }
--- a/config/kernel-inode-lookup.m4
+++ b/config/kernel-inode-lookup.m4
@ -6,7 +6,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_LOOKUP_FLAGS], [
 		#include <linux/fs.h>
 		#include <linux/sched.h>

-		static struct dentry *inode_lookup(struct inode *inode,
+		struct dentry *inode_lookup(struct inode *inode,
 		    struct dentry *dentry, unsigned int flags) { return NULL; }

 		static const struct inode_operations iops
--- a/config/kernel-inode-permission.m4
+++ b/config/kernel-inode-permission.m4
@ -8,12 +8,12 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_PERMISSION], [
 		#include <linux/fs.h>
 		#include <linux/sched.h>

-		static int test_permission(struct mnt_idmap *idmap,
+		int inode_permission(struct mnt_idmap *idmap,
 		    struct inode *inode, int mask) { return 0; }

 		static const struct inode_operations
 			iops __attribute__ ((unused)) = {
-			.permission             = test_permission,
+			.permission             = inode_permission,
 		};
 	],[])

@ -25,12 +25,12 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_PERMISSION], [
 		#include <linux/fs.h>
 		#include <linux/sched.h>

-		static int test_permission(struct user_namespace *userns,
+		int inode_permission(struct user_namespace *userns,
 		    struct inode *inode, int mask) { return 0; }

 		static const struct inode_operations
 			iops __attribute__ ((unused)) = {
-			.permission		= test_permission,
+			.permission		= inode_permission,
 		};
 	],[])
 ])
--- a/config/kernel-inode-setattr.m4
+++ b/config/kernel-inode-setattr.m4
@ -7,7 +7,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_INODE_SETATTR], [
 	ZFS_LINUX_TEST_SRC([inode_operations_setattr_mnt_idmap], [
 		#include <linux/fs.h>

-		static int test_setattr(
+		int test_setattr(
 		    struct mnt_idmap *idmap,
 		    struct dentry *de, struct iattr *ia)
 		    { return 0; }
@ -27,7 +27,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_INODE_SETATTR], [
 	ZFS_LINUX_TEST_SRC([inode_operations_setattr_userns], [
 		#include <linux/fs.h>

-		static int test_setattr(
+		int test_setattr(
 		    struct user_namespace *userns,
 		    struct dentry *de, struct iattr *ia)
 		    { return 0; }
@ -41,7 +41,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_INODE_SETATTR], [
 	ZFS_LINUX_TEST_SRC([inode_operations_setattr], [
 		#include <linux/fs.h>

-		static int test_setattr(
+		int test_setattr(
 		    struct dentry *de, struct iattr *ia)
 		    { return 0; }

--- a/config/kernel-inode-times.m4
+++ b/config/kernel-inode-times.m4
@ -27,73 +27,6 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_INODE_TIMES], [
 		memset(&ip, 0, sizeof(ip));
 		ts = ip.i_mtime;
 	])
-
-	dnl #
-	dnl # 6.6 API change
-	dnl # i_ctime no longer directly accessible, must use
-	dnl # inode_get_ctime(ip), inode_set_ctime*(ip) to
-	dnl # read/write.
-	dnl #
-	ZFS_LINUX_TEST_SRC([inode_get_ctime], [
-		#include <linux/fs.h>
-	],[
-		struct inode ip;
-
-		memset(&ip, 0, sizeof(ip));
-		inode_get_ctime(&ip);
-	])
-
-	ZFS_LINUX_TEST_SRC([inode_set_ctime_to_ts], [
-		#include <linux/fs.h>
-	],[
-		struct inode ip;
-		struct timespec64 ts = {0};
-
-		memset(&ip, 0, sizeof(ip));
-		inode_set_ctime_to_ts(&ip, ts);
-	])
-
-	dnl #
-	dnl # 6.7 API change
-	dnl # i_atime/i_mtime no longer directly accessible, must use
-	dnl # inode_get_mtime(ip), inode_set_mtime*(ip) to
-	dnl # read/write.
-	dnl #
-	ZFS_LINUX_TEST_SRC([inode_get_atime], [
-		#include <linux/fs.h>
-	],[
-		struct inode ip;
-
-		memset(&ip, 0, sizeof(ip));
-		inode_get_atime(&ip);
-	])
-	ZFS_LINUX_TEST_SRC([inode_get_mtime], [
-		#include <linux/fs.h>
-	],[
-		struct inode ip;
-
-		memset(&ip, 0, sizeof(ip));
-		inode_get_mtime(&ip);
-	])
-
-	ZFS_LINUX_TEST_SRC([inode_set_atime_to_ts], [
-		#include <linux/fs.h>
-	],[
-		struct inode ip;
-		struct timespec64 ts = {0};
-
-		memset(&ip, 0, sizeof(ip));
-		inode_set_atime_to_ts(&ip, ts);
-	])
-	ZFS_LINUX_TEST_SRC([inode_set_mtime_to_ts], [
-		#include <linux/fs.h>
-	],[
-		struct inode ip;
-		struct timespec64 ts = {0};
-
-		memset(&ip, 0, sizeof(ip));
-		inode_set_mtime_to_ts(&ip, ts);
-	])
 ])

 AC_DEFUN([ZFS_AC_KERNEL_INODE_TIMES], [
@ -114,58 +47,4 @@ AC_DEFUN([ZFS_AC_KERNEL_INODE_TIMES], [
 		AC_DEFINE(HAVE_INODE_TIMESPEC64_TIMES, 1,
 		    [inode->i_*time's are timespec64])
 	])
-
-	AC_MSG_CHECKING([whether inode_get_ctime() exists])
-	ZFS_LINUX_TEST_RESULT([inode_get_ctime], [
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_INODE_GET_CTIME, 1,
-		    [inode_get_ctime() exists in linux/fs.h])
-	],[
-		AC_MSG_RESULT(no)
-	])
-
-	AC_MSG_CHECKING([whether inode_set_ctime_to_ts() exists])
-	ZFS_LINUX_TEST_RESULT([inode_set_ctime_to_ts], [
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_INODE_SET_CTIME_TO_TS, 1,
-		    [inode_set_ctime_to_ts() exists in linux/fs.h])
-	],[
-		AC_MSG_RESULT(no)
-	])
-
-	AC_MSG_CHECKING([whether inode_get_atime() exists])
-	ZFS_LINUX_TEST_RESULT([inode_get_atime], [
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_INODE_GET_ATIME, 1,
-		    [inode_get_atime() exists in linux/fs.h])
-	],[
-		AC_MSG_RESULT(no)
-	])
-
-	AC_MSG_CHECKING([whether inode_set_atime_to_ts() exists])
-	ZFS_LINUX_TEST_RESULT([inode_set_atime_to_ts], [
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_INODE_SET_ATIME_TO_TS, 1,
-		    [inode_set_atime_to_ts() exists in linux/fs.h])
-	],[
-		AC_MSG_RESULT(no)
-	])
-
-	AC_MSG_CHECKING([whether inode_get_mtime() exists])
-	ZFS_LINUX_TEST_RESULT([inode_get_mtime], [
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_INODE_GET_MTIME, 1,
-		    [inode_get_mtime() exists in linux/fs.h])
-	],[
-		AC_MSG_RESULT(no)
-	])
-
-	AC_MSG_CHECKING([whether inode_set_mtime_to_ts() exists])
-	ZFS_LINUX_TEST_RESULT([inode_set_mtime_to_ts], [
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_INODE_SET_MTIME_TO_TS, 1,
-		    [inode_set_mtime_to_ts() exists in linux/fs.h])
-	],[
-		AC_MSG_RESULT(no)
-	])
 ])
--- a/config/kernel-make-request-fn.m4
+++ b/config/kernel-make-request-fn.m4
@ -4,7 +4,7 @@ dnl #
 AC_DEFUN([ZFS_AC_KERNEL_SRC_MAKE_REQUEST_FN], [
 	ZFS_LINUX_TEST_SRC([make_request_fn_void], [
 		#include <linux/blkdev.h>
-		static void make_request(struct request_queue *q,
+		void make_request(struct request_queue *q,
 		    struct bio *bio) { return; }
 	],[
 		blk_queue_make_request(NULL, &make_request);
@ -12,7 +12,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_MAKE_REQUEST_FN], [

 	ZFS_LINUX_TEST_SRC([make_request_fn_blk_qc_t], [
 		#include <linux/blkdev.h>
-		static blk_qc_t make_request(struct request_queue *q,
+		blk_qc_t make_request(struct request_queue *q,
 		    struct bio *bio) { return (BLK_QC_T_NONE); }
 	],[
 		blk_queue_make_request(NULL, &make_request);
@ -20,7 +20,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_MAKE_REQUEST_FN], [

 	ZFS_LINUX_TEST_SRC([blk_alloc_queue_request_fn], [
 		#include <linux/blkdev.h>
-		static blk_qc_t make_request(struct request_queue *q,
+		blk_qc_t make_request(struct request_queue *q,
 		    struct bio *bio) { return (BLK_QC_T_NONE); }
 	],[
 		struct request_queue *q __attribute__ ((unused));
@ -29,7 +29,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_MAKE_REQUEST_FN], [

 	ZFS_LINUX_TEST_SRC([blk_alloc_queue_request_fn_rh], [
 		#include <linux/blkdev.h>
-		static blk_qc_t make_request(struct request_queue *q,
+		blk_qc_t make_request(struct request_queue *q,
 		    struct bio *bio) { return (BLK_QC_T_NONE); }
 	],[
 		struct request_queue *q __attribute__ ((unused));
@ -50,21 +50,6 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_MAKE_REQUEST_FN], [
 		disk = blk_alloc_disk(NUMA_NO_NODE);
 	])

-	ZFS_LINUX_TEST_SRC([blk_alloc_disk_2arg], [
-		#include <linux/blkdev.h>
-	],[
-		struct queue_limits *lim = NULL;
-		struct gendisk *disk  __attribute__ ((unused));
-		disk = blk_alloc_disk(lim, NUMA_NO_NODE);
-	])
-
-	ZFS_LINUX_TEST_SRC([blkdev_queue_limits_features], [
-		#include <linux/blkdev.h>
-	],[
-		struct queue_limits *lim = NULL;
-		lim->features = 0;
-	])
-
 	ZFS_LINUX_TEST_SRC([blk_cleanup_disk], [
 		#include <linux/blkdev.h>
 	],[
@ -111,45 +96,6 @@ AC_DEFUN([ZFS_AC_KERNEL_MAKE_REQUEST_FN], [
 		], [
 			AC_MSG_RESULT(no)
 		])
-
-		dnl #
-		dnl # Linux 6.9 API Change:
-		dnl # blk_alloc_queue() takes a nullable queue_limits arg.
-		dnl #
-		AC_MSG_CHECKING([whether blk_alloc_disk() exists and takes 2 args])
-		ZFS_LINUX_TEST_RESULT([blk_alloc_disk_2arg], [
-			AC_MSG_RESULT(yes)
-			AC_DEFINE([HAVE_BLK_ALLOC_DISK_2ARG], 1, [blk_alloc_disk() exists and takes 2 args])
-
-			dnl #
-			dnl # Linux 6.11 API change:
-			dnl # struct queue_limits gains a 'features' field,
-			dnl # used to set flushing options
-			dnl #
-			AC_MSG_CHECKING([whether struct queue_limits has a features field])
-			ZFS_LINUX_TEST_RESULT([blkdev_queue_limits_features], [
-				AC_MSG_RESULT(yes)
-				AC_DEFINE([HAVE_BLKDEV_QUEUE_LIMITS_FEATURES], 1,
-				    [struct queue_limits has a features field])
-			], [
-				AC_MSG_RESULT(no)
-			])
-
-			dnl #
-			dnl # 5.20 API change,
-			dnl # Removed blk_cleanup_disk(), put_disk() should be used.
-			dnl #
-			AC_MSG_CHECKING([whether blk_cleanup_disk() exists])
-			ZFS_LINUX_TEST_RESULT([blk_cleanup_disk], [
-				AC_MSG_RESULT(yes)
-				AC_DEFINE([HAVE_BLK_CLEANUP_DISK], 1,
-				    [blk_cleanup_disk() exists])
-			], [
-				AC_MSG_RESULT(no)
-			])
-		], [
-			AC_MSG_RESULT(no)
-		])
 	],[
 		AC_MSG_RESULT(no)

--- a/config/kernel-mkdir.m4
+++ b/config/kernel-mkdir.m4
@ -9,7 +9,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_MKDIR], [
 	ZFS_LINUX_TEST_SRC([mkdir_mnt_idmap], [
 		#include <linux/fs.h>

-		static int mkdir(struct mnt_idmap *idmap,
+		int mkdir(struct mnt_idmap *idmap,
 			struct inode *inode, struct dentry *dentry,
 			umode_t umode) { return 0; }
 		static const struct inode_operations
@ -26,7 +26,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_MKDIR], [
 	ZFS_LINUX_TEST_SRC([mkdir_user_namespace], [
 		#include <linux/fs.h>

-		static int mkdir(struct user_namespace *userns,
+		int mkdir(struct user_namespace *userns,
 			struct inode *inode, struct dentry *dentry,
 		    umode_t umode) { return 0; }

@ -47,7 +47,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_MKDIR], [
 	ZFS_LINUX_TEST_SRC([inode_operations_mkdir], [
 		#include <linux/fs.h>

-		static int mkdir(struct inode *inode, struct dentry *dentry,
+		int mkdir(struct inode *inode, struct dentry *dentry,
 		    umode_t umode) { return 0; }

 		static const struct inode_operations
--- a/config/kernel-mknod.m4
+++ b/config/kernel-mknod.m4
@ -7,7 +7,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_MKNOD], [
 		#include <linux/fs.h>
 		#include <linux/sched.h>

-		static int tmp_mknod(struct mnt_idmap *idmap,
+		int tmp_mknod(struct mnt_idmap *idmap,
 		    struct inode *inode ,struct dentry *dentry,
 		    umode_t u, dev_t d) { return 0; }

@ -25,7 +25,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_MKNOD], [
 		#include <linux/fs.h>
 		#include <linux/sched.h>

-		static int tmp_mknod(struct user_namespace *userns,
+		int tmp_mknod(struct user_namespace *userns,
 		    struct inode *inode ,struct dentry *dentry,
 		    umode_t u, dev_t d) { return 0; }

--- a/config/kernel-mm-pagemap.m4
+++ b/config/kernel-mm-pagemap.m4
@ -1,36 +0,0 @@
-AC_DEFUN([ZFS_AC_KERNEL_SRC_MM_PAGE_SIZE], [
-	ZFS_LINUX_TEST_SRC([page_size], [
-		#include <linux/mm.h>
-	],[
-		unsigned long s;
-		s = page_size(NULL);
-	])
-])
-AC_DEFUN([ZFS_AC_KERNEL_MM_PAGE_SIZE], [
-	AC_MSG_CHECKING([whether page_size() is available])
-	ZFS_LINUX_TEST_RESULT([page_size], [
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_MM_PAGE_SIZE, 1, [page_size() is available])
-	],[
-		AC_MSG_RESULT(no)
-	])
-])
-
-
-AC_DEFUN([ZFS_AC_KERNEL_SRC_MM_PAGE_MAPPING], [
-	ZFS_LINUX_TEST_SRC([page_mapping], [
-		#include <linux/pagemap.h>
-	],[
-		struct page *p = NULL;
-		struct address_space *m = page_mapping(NULL);
-	])
-])
-AC_DEFUN([ZFS_AC_KERNEL_MM_PAGE_MAPPING], [
-	AC_MSG_CHECKING([whether page_mapping() is available])
-	ZFS_LINUX_TEST_RESULT([page_mapping], [
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_MM_PAGE_MAPPING, 1, [page_mapping() is available])
-	],[
-		AC_MSG_RESULT(no)
-	])
-])
--- a/config/kernel-proc-operations.m4
+++ b/config/kernel-proc-operations.m4
@ -7,14 +7,14 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_PROC_OPERATIONS], [
 	ZFS_LINUX_TEST_SRC([proc_ops_struct], [
 		#include <linux/proc_fs.h>

-		static int test_open(struct inode *ip, struct file *fp) { return 0; }
-		static ssize_t test_read(struct file *fp, char __user *ptr,
+		int test_open(struct inode *ip, struct file *fp) { return 0; }
+		ssize_t test_read(struct file *fp, char __user *ptr,
 		    size_t size, loff_t *offp) { return 0; }
-		static ssize_t test_write(struct file *fp, const char __user *ptr,
+		ssize_t test_write(struct file *fp, const char __user *ptr,
 		    size_t size, loff_t *offp) { return 0; }
-		static loff_t test_lseek(struct file *fp, loff_t off, int flag)
+		loff_t test_lseek(struct file *fp, loff_t off, int flag)
 		    { return 0; }
-		static int test_release(struct inode *ip, struct file *fp)
+		int test_release(struct inode *ip, struct file *fp)
 		    { return 0; }

 		const struct proc_ops test_ops __attribute__ ((unused)) = {
--- a/config/kernel-put-link.m4
+++ b/config/kernel-put-link.m4
@ -4,7 +4,7 @@ dnl #
 AC_DEFUN([ZFS_AC_KERNEL_SRC_PUT_LINK], [
 	ZFS_LINUX_TEST_SRC([put_link_cookie], [
 		#include <linux/fs.h>
-		static void put_link(struct inode *ip, void *cookie)
+		void put_link(struct inode *ip, void *cookie)
 		    { return; }
 		static struct inode_operations
 		    iops __attribute__ ((unused)) = {
@ -14,7 +14,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_PUT_LINK], [

 	ZFS_LINUX_TEST_SRC([put_link_nameidata], [
 		#include <linux/fs.h>
-		static void put_link(struct dentry *de, struct
+		void put_link(struct dentry *de, struct
 		    nameidata *nd, void *ptr) { return; }
 		static struct inode_operations
 		    iops __attribute__ ((unused)) = {
--- a/config/kernel-register_sysctl_table.m4
+++ b/config/kernel-register_sysctl_table.m4
@ -25,62 +25,3 @@ AC_DEFUN([ZFS_AC_KERNEL_REGISTER_SYSCTL_TABLE], [
 		AC_MSG_RESULT([no])
 	])
 ])
-
-dnl #
-dnl # Linux 6.11 register_sysctl() enforces that sysctl tables no longer
-dnl # supply a sentinel end-of-table element. 6.6 introduces
-dnl # register_sysctl_sz() to enable callers to choose, so we use it if
-dnl # available for backward compatibility.
-dnl #
-AC_DEFUN([ZFS_AC_KERNEL_SRC_REGISTER_SYSCTL_SZ], [
-	ZFS_LINUX_TEST_SRC([has_register_sysctl_sz], [
-		#include <linux/sysctl.h>
-	],[
-		struct ctl_table test_table[] __attribute__((unused)) = {0};
-		register_sysctl_sz("", test_table, 0);
-	])
-])
-
-AC_DEFUN([ZFS_AC_KERNEL_REGISTER_SYSCTL_SZ], [
-	AC_MSG_CHECKING([whether register_sysctl_sz exists])
-	ZFS_LINUX_TEST_RESULT([has_register_sysctl_sz], [
-		AC_MSG_RESULT([yes])
-		AC_DEFINE(HAVE_REGISTER_SYSCTL_SZ, 1,
-			[register_sysctl_sz exists])
-	],[
-		AC_MSG_RESULT([no])
-	])
-])
-
-dnl #
-dnl # Linux 6.11 makes const the ctl_table arg of proc_handler
-dnl #
-AC_DEFUN([ZFS_AC_KERNEL_SRC_PROC_HANDLER_CTL_TABLE_CONST], [
-	ZFS_LINUX_TEST_SRC([has_proc_handler_ctl_table_const], [
-		#include <linux/sysctl.h>
-
-		static int test_handler(
-		    const struct ctl_table *ctl __attribute((unused)),
-		    int write __attribute((unused)),
-		    void *buffer __attribute((unused)),
-		    size_t *lenp __attribute((unused)),
-		    loff_t *ppos __attribute((unused)))
-		{
-			return (0);
-		}
-	], [
-		proc_handler *ph __attribute((unused)) =
-		    &test_handler;
-	])
-])
-
-AC_DEFUN([ZFS_AC_KERNEL_PROC_HANDLER_CTL_TABLE_CONST], [
-	AC_MSG_CHECKING([whether proc_handler ctl_table arg is const])
-	ZFS_LINUX_TEST_RESULT([has_proc_handler_ctl_table_const], [
-		AC_MSG_RESULT([yes])
-		AC_DEFINE(HAVE_PROC_HANDLER_CTL_TABLE_CONST, 1,
-		    [proc_handler ctl_table arg is const])
-	], [
-		AC_MSG_RESULT([no])
-	])
-])
--- a/config/kernel-rename.m4
+++ b/config/kernel-rename.m4
@ -8,7 +8,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_RENAME], [
 	dnl #
 	ZFS_LINUX_TEST_SRC([inode_operations_rename2], [
 		#include <linux/fs.h>
-		static int rename2_fn(struct inode *sip, struct dentry *sdp,
+		int rename2_fn(struct inode *sip, struct dentry *sdp,
 			struct inode *tip, struct dentry *tdp,
 			unsigned int flags) { return 0; }

@ -26,7 +26,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_RENAME], [
 	dnl #
 	ZFS_LINUX_TEST_SRC([inode_operations_rename_flags], [
 		#include <linux/fs.h>
-		static int rename_fn(struct inode *sip, struct dentry *sdp,
+		int rename_fn(struct inode *sip, struct dentry *sdp,
 			struct inode *tip, struct dentry *tdp,
 			unsigned int flags) { return 0; }

@ -44,7 +44,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_RENAME], [
 	dnl #
 	ZFS_LINUX_TEST_SRC([dir_inode_operations_wrapper_rename2], [
 		#include <linux/fs.h>
-		static int rename2_fn(struct inode *sip, struct dentry *sdp,
+		int rename2_fn(struct inode *sip, struct dentry *sdp,
 			struct inode *tip, struct dentry *tdp,
 			unsigned int flags) { return 0; }

@ -62,7 +62,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_RENAME], [
 	dnl #
 	ZFS_LINUX_TEST_SRC([inode_operations_rename_userns], [
 		#include <linux/fs.h>
-		static int rename_fn(struct user_namespace *user_ns, struct inode *sip,
+		int rename_fn(struct user_namespace *user_ns, struct inode *sip,
 			struct dentry *sdp, struct inode *tip, struct dentry *tdp,
 			unsigned int flags) { return 0; }

@ -77,7 +77,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_RENAME], [
 	dnl #
 	ZFS_LINUX_TEST_SRC([inode_operations_rename_mnt_idmap], [
 		#include <linux/fs.h>
-		static int rename_fn(struct mnt_idmap *idmap, struct inode *sip,
+		int rename_fn(struct mnt_idmap *idmap, struct inode *sip,
 			struct dentry *sdp, struct inode *tip, struct dentry *tdp,
 			unsigned int flags) { return 0; }

--- a/config/kernel-show-options.m4
+++ b/config/kernel-show-options.m4
@ -5,7 +5,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_SHOW_OPTIONS], [
 	ZFS_LINUX_TEST_SRC([super_operations_show_options], [
 		#include <linux/fs.h>

-		static int show_options(struct seq_file * x, struct dentry * y) {
+		int show_options(struct seq_file * x, struct dentry * y) {
 			return 0;
 		};

--- a/config/kernel-shrink.m4
+++ b/config/kernel-shrink.m4
@ -8,6 +8,9 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_SUPER_BLOCK_S_SHRINK], [
 	ZFS_LINUX_TEST_SRC([super_block_s_shrink], [
 		#include <linux/fs.h>

+		int shrink(struct shrinker *s, struct shrink_control *sc)
+		    { return 0; }
+
 		static const struct super_block
 		    sb __attribute__ ((unused)) = {
 			.s_shrink.seeks = DEFAULT_SEEKS,
@ -16,45 +19,13 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_SUPER_BLOCK_S_SHRINK], [
 	],[])
 ])

-dnl #
-dnl # 6.7 API change
-dnl # s_shrink is now a pointer.
-dnl #
-AC_DEFUN([ZFS_AC_KERNEL_SRC_SUPER_BLOCK_S_SHRINK_PTR], [
-	ZFS_LINUX_TEST_SRC([super_block_s_shrink_ptr], [
-		#include <linux/fs.h>
-		static unsigned long shrinker_cb(struct shrinker *shrink,
-		    struct shrink_control *sc) { return 0; }
-		static struct shrinker shrinker = {
-			.count_objects = shrinker_cb,
-			.scan_objects = shrinker_cb,
-			.seeks = DEFAULT_SEEKS,
-		};
-		static const struct super_block
-		    sb __attribute__ ((unused)) = {
-			.s_shrink = &shrinker,
-		};
-	],[])
-])
-
 AC_DEFUN([ZFS_AC_KERNEL_SUPER_BLOCK_S_SHRINK], [
 	AC_MSG_CHECKING([whether super_block has s_shrink])
 	ZFS_LINUX_TEST_RESULT([super_block_s_shrink], [
 		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_SUPER_BLOCK_S_SHRINK, 1,
-			[have super_block s_shrink])
 	],[
-		AC_MSG_RESULT(no)
-		AC_MSG_CHECKING([whether super_block has s_shrink pointer])
-		ZFS_LINUX_TEST_RESULT([super_block_s_shrink_ptr], [
-			AC_MSG_RESULT(yes)
-			AC_DEFINE(HAVE_SUPER_BLOCK_S_SHRINK_PTR, 1,
-				[have super_block s_shrink pointer])
-		],[
-			AC_MSG_RESULT(no)
 		ZFS_LINUX_TEST_ERROR([sb->s_shrink()])
 	])
-	])
 ])

 dnl #
@ -86,7 +57,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SHRINK_CONTROL_HAS_NID], [
 AC_DEFUN([ZFS_AC_KERNEL_SRC_REGISTER_SHRINKER_VARARG], [
 	ZFS_LINUX_TEST_SRC([register_shrinker_vararg], [
 		#include <linux/mm.h>
-		static unsigned long shrinker_cb(struct shrinker *shrink,
+		unsigned long shrinker_cb(struct shrinker *shrink,
 		    struct shrink_control *sc) { return 0; }
 	],[
 		struct shrinker cache_shrinker = {
@ -101,7 +72,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_REGISTER_SHRINKER_VARARG], [
 AC_DEFUN([ZFS_AC_KERNEL_SRC_SHRINKER_CALLBACK], [
 	ZFS_LINUX_TEST_SRC([shrinker_cb_shrink_control], [
 		#include <linux/mm.h>
-		static int shrinker_cb(struct shrinker *shrink,
+		int shrinker_cb(struct shrinker *shrink,
 		    struct shrink_control *sc) { return 0; }
 	],[
 		struct shrinker cache_shrinker = {
@ -113,7 +84,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_SHRINKER_CALLBACK], [

 	ZFS_LINUX_TEST_SRC([shrinker_cb_shrink_control_split], [
 		#include <linux/mm.h>
-		static unsigned long shrinker_cb(struct shrinker *shrink,
+		unsigned long shrinker_cb(struct shrinker *shrink,
 		    struct shrink_control *sc) { return 0; }
 	],[
 		struct shrinker cache_shrinker = {
@ -125,25 +96,6 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_SHRINKER_CALLBACK], [
 	])
 ])

-dnl #
-dnl # 6.7 API change
-dnl # register_shrinker has been replaced by shrinker_register.
-dnl #
-AC_DEFUN([ZFS_AC_KERNEL_SRC_SHRINKER_REGISTER], [
-	ZFS_LINUX_TEST_SRC([shrinker_register], [
-		#include <linux/shrinker.h>
-		static unsigned long shrinker_cb(struct shrinker *shrink,
-		    struct shrink_control *sc) { return 0; }
-	],[
-		struct shrinker cache_shrinker = {
-			.count_objects = shrinker_cb,
-			.scan_objects = shrinker_cb,
-			.seeks = DEFAULT_SEEKS,
-		};
-		shrinker_register(&cache_shrinker);
-	])
-])
-
 AC_DEFUN([ZFS_AC_KERNEL_SHRINKER_CALLBACK],[
 	dnl #
 	dnl # 6.0 API change
@ -181,39 +133,17 @@ AC_DEFUN([ZFS_AC_KERNEL_SHRINKER_CALLBACK],[
 			dnl # cs->shrink() is logically split in to
 			dnl # cs->count_objects() and cs->scan_objects()
 			dnl #
-			AC_MSG_CHECKING(
-			    [whether cs->count_objects callback exists])
+			AC_MSG_CHECKING([if cs->count_objects callback exists])
 			ZFS_LINUX_TEST_RESULT(
 				[shrinker_cb_shrink_control_split],[
 					AC_MSG_RESULT(yes)
 					AC_DEFINE(HAVE_SPLIT_SHRINKER_CALLBACK, 1,
 						[cs->count_objects exists])
 			],[
-				AC_MSG_RESULT(no)
-
-				AC_MSG_CHECKING(
-				    [whether shrinker_register exists])
-				ZFS_LINUX_TEST_RESULT([shrinker_register], [
-					AC_MSG_RESULT(yes)
-					AC_DEFINE(HAVE_SHRINKER_REGISTER, 1,
-					    [shrinker_register exists])
-
-					dnl # We assume that the split shrinker
-					dnl # callback exists if
-					dnl # shrinker_register() exists,
-					dnl # because the latter is a much more
-					dnl # recent addition, and the macro
-					dnl # test for shrinker_register() only
-					dnl # works if the callback is split
-					AC_DEFINE(HAVE_SPLIT_SHRINKER_CALLBACK,
-					    1, [cs->count_objects exists])
-				],[
-					AC_MSG_RESULT(no)
 					ZFS_LINUX_TEST_ERROR([shrinker])
 			])
 		])
 	])
-	])
 ])

 dnl #
@ -244,12 +174,10 @@ AC_DEFUN([ZFS_AC_KERNEL_SHRINK_CONTROL_STRUCT], [

 AC_DEFUN([ZFS_AC_KERNEL_SRC_SHRINKER], [
 	ZFS_AC_KERNEL_SRC_SUPER_BLOCK_S_SHRINK
-	ZFS_AC_KERNEL_SRC_SUPER_BLOCK_S_SHRINK_PTR
 	ZFS_AC_KERNEL_SRC_SHRINK_CONTROL_HAS_NID
 	ZFS_AC_KERNEL_SRC_SHRINKER_CALLBACK
 	ZFS_AC_KERNEL_SRC_SHRINK_CONTROL_STRUCT
 	ZFS_AC_KERNEL_SRC_REGISTER_SHRINKER_VARARG
-	ZFS_AC_KERNEL_SRC_SHRINKER_REGISTER
 ])

 AC_DEFUN([ZFS_AC_KERNEL_SHRINKER], [
--- a/config/kernel-strlcpy.m4
+++ b/config/kernel-strlcpy.m4
@ -1,47 +0,0 @@
-dnl #
-dnl # 6.8.x replaced strlcpy with strscpy. Check for both so we can provide
-dnl # appropriate fallbacks.
-dnl #
-AC_DEFUN([ZFS_AC_KERNEL_SRC_STRLCPY], [
-	ZFS_LINUX_TEST_SRC([kernel_has_strlcpy], [
-		#include <linux/string.h>
-	], [
-		const char *src = "goodbye";
-		char dst[32];
-		size_t len;
-		len = strlcpy(dst, src, sizeof (dst));
-	])
-])
-
-AC_DEFUN([ZFS_AC_KERNEL_SRC_STRSCPY], [
-	ZFS_LINUX_TEST_SRC([kernel_has_strscpy], [
-		#include <linux/string.h>
-	], [
-		const char *src = "goodbye";
-		char dst[32];
-		ssize_t len;
-		len = strscpy(dst, src, sizeof (dst));
-	])
-])
-
-AC_DEFUN([ZFS_AC_KERNEL_STRLCPY], [
-	AC_MSG_CHECKING([whether strlcpy() exists])
-	ZFS_LINUX_TEST_RESULT([kernel_has_strlcpy], [
-		AC_MSG_RESULT([yes])
-		AC_DEFINE(HAVE_KERNEL_STRLCPY, 1,
-			[strlcpy() exists])
-	], [
-		AC_MSG_RESULT([no])
-	])
-])
-
-AC_DEFUN([ZFS_AC_KERNEL_STRSCPY], [
-	AC_MSG_CHECKING([whether strscpy() exists])
-	ZFS_LINUX_TEST_RESULT([kernel_has_strscpy], [
-		AC_MSG_RESULT([yes])
-		AC_DEFINE(HAVE_KERNEL_STRSCPY, 1,
-			[strscpy() exists])
-	], [
-		AC_MSG_RESULT([no])
-	])
-])
--- a/config/kernel-symlink.m4
+++ b/config/kernel-symlink.m4
@ -6,7 +6,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_SYMLINK], [
 	ZFS_LINUX_TEST_SRC([symlink_mnt_idmap], [
 		#include <linux/fs.h>
 		#include <linux/sched.h>
-		static int tmp_symlink(struct mnt_idmap *idmap,
+		int tmp_symlink(struct mnt_idmap *idmap,
 		    struct inode *inode ,struct dentry *dentry,
 		    const char *path) { return 0; }

@ -23,7 +23,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_SYMLINK], [
 		#include <linux/fs.h>
 		#include <linux/sched.h>

-		static int tmp_symlink(struct user_namespace *userns,
+		int tmp_symlink(struct user_namespace *userns,
 		    struct inode *inode ,struct dentry *dentry,
 		    const char *path) { return 0; }

--- a/config/kernel-timer.m4
+++ b/config/kernel-timer.m4
@ -18,7 +18,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_TIMER_SETUP], [
 			int data;
 		};

-		static void task_expire(struct timer_list *tl)
+		void task_expire(struct timer_list *tl)
 		{
 			struct my_task_timer *task_timer =
 			    from_timer(task_timer, tl, timer);
@ -31,7 +31,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_TIMER_SETUP], [

 	ZFS_LINUX_TEST_SRC([timer_list_function], [
 		#include <linux/timer.h>
-		static void task_expire(struct timer_list *tl) {}
+		void task_expire(struct timer_list *tl) {}
 	],[
 		struct timer_list tl;
 		tl.function = task_expire;
--- a/config/kernel-tmpfile.m4
+++ b/config/kernel-tmpfile.m4
@ -9,7 +9,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_TMPFILE], [
 	dnl #
 	ZFS_LINUX_TEST_SRC([inode_operations_tmpfile_mnt_idmap], [
 		#include <linux/fs.h>
-		static int tmpfile(struct mnt_idmap *idmap,
+		int tmpfile(struct mnt_idmap *idmap,
 		    struct inode *inode, struct file *file,
 		    umode_t mode) { return 0; }
 		static struct inode_operations
@ -22,7 +22,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_TMPFILE], [
 	dnl #
 	ZFS_LINUX_TEST_SRC([inode_operations_tmpfile], [
 		#include <linux/fs.h>
-		static int tmpfile(struct user_namespace *userns,
+		int tmpfile(struct user_namespace *userns,
 		    struct inode *inode, struct file *file,
 		    umode_t mode) { return 0; }
 		static struct inode_operations
@ -36,7 +36,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_TMPFILE], [
 	dnl #
 	ZFS_LINUX_TEST_SRC([inode_operations_tmpfile_dentry_userns], [
 		#include <linux/fs.h>
-		static int tmpfile(struct user_namespace *userns,
+		int tmpfile(struct user_namespace *userns,
 		    struct inode *inode, struct dentry *dentry,
 		    umode_t mode) { return 0; }
 		static struct inode_operations
@ -46,7 +46,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_TMPFILE], [
 	],[])
 	ZFS_LINUX_TEST_SRC([inode_operations_tmpfile_dentry], [
 			#include <linux/fs.h>
-			static int tmpfile(struct inode *inode, struct dentry *dentry,
+			int tmpfile(struct inode *inode, struct dentry *dentry,
 			    umode_t mode) { return 0; }
 			static struct inode_operations
 			    iops __attribute__ ((unused)) = {
--- a/config/kernel-types.m4
+++ b/config/kernel-types.m4
@ -1,40 +0,0 @@
-dnl #
-dnl # check if kernel provides definitions for given types
-dnl #
-
-dnl _ZFS_AC_KERNEL_SRC_TYPE(type)
-AC_DEFUN([_ZFS_AC_KERNEL_SRC_TYPE], [
-	ZFS_LINUX_TEST_SRC([type_$1], [
-		#include <linux/types.h>
-	],[
-		const $1 __attribute__((unused)) x = ($1) 0;
-	])
-])
-
-dnl _ZFS_AC_KERNEL_TYPE(type)
-AC_DEFUN([_ZFS_AC_KERNEL_TYPE], [
-	AC_MSG_CHECKING([whether kernel defines $1])
-	ZFS_LINUX_TEST_RESULT([type_$1], [
-		AC_MSG_RESULT([yes])
-		AC_DEFINE([HAVE_KERNEL_]m4_quote(m4_translit([$1], [a-z], [A-Z])),
-		    1, [kernel defines $1])
-	], [
-		AC_MSG_RESULT([no])
-	])
-])
-
-dnl ZFS_AC_KERNEL_TYPES([types...])
-AC_DEFUN([ZFS_AC_KERNEL_TYPES], [
-	AC_DEFUN([ZFS_AC_KERNEL_SRC_TYPES], [
-		m4_foreach_w([type], [$1], [
-			_ZFS_AC_KERNEL_SRC_TYPE(type)
-		])
-	])
-	AC_DEFUN([ZFS_AC_KERNEL_TYPES], [
-		m4_foreach_w([type], [$1], [
-			_ZFS_AC_KERNEL_TYPE(type)
-		])
-	])
-])
-
-ZFS_AC_KERNEL_TYPES([intptr_t])
--- a/config/kernel-vfs-direct_IO.m4
+++ b/config/kernel-vfs-direct_IO.m4
@ -5,7 +5,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_VFS_DIRECT_IO], [
 	ZFS_LINUX_TEST_SRC([direct_io_iter], [
 		#include <linux/fs.h>

-		static ssize_t test_direct_IO(struct kiocb *kiocb,
+		ssize_t test_direct_IO(struct kiocb *kiocb,
 		    struct iov_iter *iter) { return 0; }

 		static const struct address_space_operations
@ -17,7 +17,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_VFS_DIRECT_IO], [
 	ZFS_LINUX_TEST_SRC([direct_io_iter_offset], [
 		#include <linux/fs.h>

-		static ssize_t test_direct_IO(struct kiocb *kiocb,
+		ssize_t test_direct_IO(struct kiocb *kiocb,
 		    struct iov_iter *iter, loff_t offset) { return 0; }

 		static const struct address_space_operations
@ -29,7 +29,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_VFS_DIRECT_IO], [
 	ZFS_LINUX_TEST_SRC([direct_io_iter_rw_offset], [
 		#include <linux/fs.h>

-		static ssize_t test_direct_IO(int rw, struct kiocb *kiocb,
+		ssize_t test_direct_IO(int rw, struct kiocb *kiocb,
 		    struct iov_iter *iter, loff_t offset) { return 0; }

 		static const struct address_space_operations
@ -41,7 +41,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_VFS_DIRECT_IO], [
 	ZFS_LINUX_TEST_SRC([direct_io_iovec], [
 		#include <linux/fs.h>

-		static ssize_t test_direct_IO(int rw, struct kiocb *kiocb,
+		ssize_t test_direct_IO(int rw, struct kiocb *kiocb,
 		    const struct iovec *iov, loff_t offset,
 		    unsigned long nr_segs) { return 0; }

--- a/config/kernel-vfs-file_range.m4
+++ b/config/kernel-vfs-file_range.m4
@ -16,9 +16,6 @@ dnl #
 dnl # 5.3: VFS copy_file_range() expected to do its own fallback,
 dnl #      generic_copy_file_range() added to support it
 dnl #
-dnl # 6.8: generic_copy_file_range() removed, replaced by
-dnl #      splice_copy_file_range()
-dnl #
 AC_DEFUN([ZFS_AC_KERNEL_SRC_VFS_COPY_FILE_RANGE], [
 	ZFS_LINUX_TEST_SRC([vfs_copy_file_range], [
 		#include <linux/fs.h>
@ -75,30 +72,6 @@ AC_DEFUN([ZFS_AC_KERNEL_VFS_GENERIC_COPY_FILE_RANGE], [
 	])
 ])

-AC_DEFUN([ZFS_AC_KERNEL_SRC_VFS_SPLICE_COPY_FILE_RANGE], [
-	ZFS_LINUX_TEST_SRC([splice_copy_file_range], [
-		#include <linux/splice.h>
-	], [
-		struct file *src_file __attribute__ ((unused)) = NULL;
-		loff_t src_off __attribute__ ((unused)) = 0;
-		struct file *dst_file __attribute__ ((unused)) = NULL;
-		loff_t dst_off __attribute__ ((unused)) = 0;
-		size_t len __attribute__ ((unused)) = 0;
-		splice_copy_file_range(src_file, src_off, dst_file, dst_off,
-		    len);
-	])
-])
-AC_DEFUN([ZFS_AC_KERNEL_VFS_SPLICE_COPY_FILE_RANGE], [
-	AC_MSG_CHECKING([whether splice_copy_file_range() is available])
-	ZFS_LINUX_TEST_RESULT([splice_copy_file_range], [
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_VFS_SPLICE_COPY_FILE_RANGE, 1,
-		    [splice_copy_file_range() is available])
-	],[
-		AC_MSG_RESULT(no)
-	])
-])
-
 AC_DEFUN([ZFS_AC_KERNEL_SRC_VFS_CLONE_FILE_RANGE], [
 	ZFS_LINUX_TEST_SRC([vfs_clone_file_range], [
 		#include <linux/fs.h>
--- a/config/kernel-vfs-iterate.m4
+++ b/config/kernel-vfs-iterate.m4
@ -1,7 +1,7 @@
 AC_DEFUN([ZFS_AC_KERNEL_SRC_VFS_ITERATE], [
 	ZFS_LINUX_TEST_SRC([file_operations_iterate_shared], [
 		#include <linux/fs.h>
-		static int iterate(struct file *filp, struct dir_context * context)
+		int iterate(struct file *filp, struct dir_context * context)
 		    { return 0; }

 		static const struct file_operations fops
@ -12,7 +12,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_VFS_ITERATE], [

 	ZFS_LINUX_TEST_SRC([file_operations_iterate], [
 		#include <linux/fs.h>
-		static int iterate(struct file *filp,
+		int iterate(struct file *filp,
 		    struct dir_context *context) { return 0; }

 		static const struct file_operations fops
@ -27,7 +27,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_VFS_ITERATE], [

 	ZFS_LINUX_TEST_SRC([file_operations_readdir], [
 		#include <linux/fs.h>
-		static int readdir(struct file *filp, void *entry,
+		int readdir(struct file *filp, void *entry,
 		    filldir_t func) { return 0; }

 		static const struct file_operations fops
--- a/config/kernel-vfs-rw-iterate.m4
+++ b/config/kernel-vfs-rw-iterate.m4
@ -5,9 +5,9 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_VFS_RW_ITERATE], [
 	ZFS_LINUX_TEST_SRC([file_operations_rw], [
 		#include <linux/fs.h>

-		static ssize_t test_read(struct kiocb *kiocb, struct iov_iter *to)
+		ssize_t test_read(struct kiocb *kiocb, struct iov_iter *to)
 		    { return 0; }
-		static ssize_t test_write(struct kiocb *kiocb, struct iov_iter *from)
+		ssize_t test_write(struct kiocb *kiocb, struct iov_iter *from)
 		    { return 0; }

 		static const struct file_operations
--- a/config/kernel-writepage_t.m4
+++ b/config/kernel-writepage_t.m4
@ -6,7 +6,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_WRITEPAGE_T], [
 	dnl #
 	ZFS_LINUX_TEST_SRC([writepage_t_folio], [
 		#include <linux/writeback.h>
-		static int putpage(struct folio *folio,
+		int putpage(struct folio *folio,
 		    struct writeback_control *wbc, void *data)
 		{ return 0; }
 		writepage_t func = putpage;
--- a/config/kernel-xattr-handler.m4
+++ b/config/kernel-xattr-handler.m4
@ -68,7 +68,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_XATTR_HANDLER_GET], [
 	ZFS_LINUX_TEST_SRC([xattr_handler_get_dentry_inode], [
 		#include <linux/xattr.h>

-		static int get(const struct xattr_handler *handler,
+		int get(const struct xattr_handler *handler,
 		    struct dentry *dentry, struct inode *inode,
 		    const char *name, void *buffer, size_t size) { return 0; }
 		static const struct xattr_handler
@ -80,7 +80,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_XATTR_HANDLER_GET], [
 	ZFS_LINUX_TEST_SRC([xattr_handler_get_xattr_handler], [
 		#include <linux/xattr.h>

-		static int get(const struct xattr_handler *handler,
+		int get(const struct xattr_handler *handler,
 		    struct dentry *dentry, const char *name,
 		    void *buffer, size_t size) { return 0; }
 		static const struct xattr_handler
@ -92,7 +92,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_XATTR_HANDLER_GET], [
 	ZFS_LINUX_TEST_SRC([xattr_handler_get_dentry], [
 		#include <linux/xattr.h>

-		static int get(struct dentry *dentry, const char *name,
+		int get(struct dentry *dentry, const char *name,
 		    void *buffer, size_t size, int handler_flags)
 		    { return 0; }
 		static const struct xattr_handler
@ -104,7 +104,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_XATTR_HANDLER_GET], [
 	ZFS_LINUX_TEST_SRC([xattr_handler_get_dentry_inode_flags], [
 		#include <linux/xattr.h>

-		static int get(const struct xattr_handler *handler,
+		int get(const struct xattr_handler *handler,
 		    struct dentry *dentry, struct inode *inode,
 		    const char *name, void *buffer,
 		    size_t size, int flags) { return 0; }
@ -182,7 +182,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_XATTR_HANDLER_SET], [
 	ZFS_LINUX_TEST_SRC([xattr_handler_set_mnt_idmap], [
 		#include <linux/xattr.h>

-		static int set(const struct xattr_handler *handler,
+		int set(const struct xattr_handler *handler,
 			struct mnt_idmap *idmap,
 			struct dentry *dentry, struct inode *inode,
 			const char *name, const void *buffer,
@ -197,7 +197,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_XATTR_HANDLER_SET], [
 	ZFS_LINUX_TEST_SRC([xattr_handler_set_userns], [
 		#include <linux/xattr.h>

-		static int set(const struct xattr_handler *handler,
+		int set(const struct xattr_handler *handler,
 			struct user_namespace *mnt_userns,
 			struct dentry *dentry, struct inode *inode,
 			const char *name, const void *buffer,
@ -212,7 +212,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_XATTR_HANDLER_SET], [
 	ZFS_LINUX_TEST_SRC([xattr_handler_set_dentry_inode], [
 		#include <linux/xattr.h>

-		static int set(const struct xattr_handler *handler,
+		int set(const struct xattr_handler *handler,
 		    struct dentry *dentry, struct inode *inode,
 		    const char *name, const void *buffer,
 		    size_t size, int flags)
@ -226,7 +226,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_XATTR_HANDLER_SET], [
 	ZFS_LINUX_TEST_SRC([xattr_handler_set_xattr_handler], [
 		#include <linux/xattr.h>

-		static int set(const struct xattr_handler *handler,
+		int set(const struct xattr_handler *handler,
 		    struct dentry *dentry, const char *name,
 		    const void *buffer, size_t size, int flags)
 		    { return 0; }
@ -239,7 +239,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_XATTR_HANDLER_SET], [
 	ZFS_LINUX_TEST_SRC([xattr_handler_set_dentry], [
 		#include <linux/xattr.h>

-		static int set(struct dentry *dentry, const char *name,
+		int set(struct dentry *dentry, const char *name,
 		    const void *buffer, size_t size, int flags,
 		    int handler_flags) { return 0; }
 		static const struct xattr_handler
@ -325,7 +325,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_XATTR_HANDLER_LIST], [
 	ZFS_LINUX_TEST_SRC([xattr_handler_list_simple], [
 		#include <linux/xattr.h>

-		static bool list(struct dentry *dentry) { return 0; }
+		bool list(struct dentry *dentry) { return 0; }
 		static const struct xattr_handler
 		    xops __attribute__ ((unused)) = {
 			.list = list,
@ -335,7 +335,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_XATTR_HANDLER_LIST], [
 	ZFS_LINUX_TEST_SRC([xattr_handler_list_xattr_handler], [
 		#include <linux/xattr.h>

-		static size_t list(const struct xattr_handler *handler,
+		size_t list(const struct xattr_handler *handler,
 		    struct dentry *dentry, char *list, size_t list_size,
 		    const char *name, size_t name_len) { return 0; }
 		static const struct xattr_handler
@ -347,7 +347,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_XATTR_HANDLER_LIST], [
 	ZFS_LINUX_TEST_SRC([xattr_handler_list_dentry], [
 		#include <linux/xattr.h>

-		static size_t list(struct dentry *dentry,
+		size_t list(struct dentry *dentry,
 		    char *list, size_t list_size,
 		    const char *name, size_t name_len,
 		    int handler_flags) { return 0; }
--- a/config/kernel.m4
+++ b/config/kernel.m4
@ -37,7 +37,6 @@ dnl # only once the compilation can be done in parallel significantly
 dnl # speeding up the process.
 dnl #
 AC_DEFUN([ZFS_AC_KERNEL_TEST_SRC], [
-	ZFS_AC_KERNEL_SRC_TYPES
 	ZFS_AC_KERNEL_SRC_OBJTOOL
 	ZFS_AC_KERNEL_SRC_GLOBAL_PAGE_STATE
 	ZFS_AC_KERNEL_SRC_ACCESS_OK_TYPE
@ -119,7 +118,6 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_SRC], [
 	ZFS_AC_KERNEL_SRC_VFS_IOV_ITER
 	ZFS_AC_KERNEL_SRC_VFS_COPY_FILE_RANGE
 	ZFS_AC_KERNEL_SRC_VFS_GENERIC_COPY_FILE_RANGE
-	ZFS_AC_KERNEL_SRC_VFS_SPLICE_COPY_FILE_RANGE
 	ZFS_AC_KERNEL_SRC_VFS_REMAP_FILE_RANGE
 	ZFS_AC_KERNEL_SRC_VFS_CLONE_FILE_RANGE
 	ZFS_AC_KERNEL_SRC_VFS_DEDUPE_FILE_RANGE
@ -151,8 +149,6 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_SRC], [
 	ZFS_AC_KERNEL_SRC_SYSFS
 	ZFS_AC_KERNEL_SRC_SET_SPECIAL_STATE
 	ZFS_AC_KERNEL_SRC_STANDALONE_LINUX_STDARG
-	ZFS_AC_KERNEL_SRC_STRLCPY
-	ZFS_AC_KERNEL_SRC_STRSCPY
 	ZFS_AC_KERNEL_SRC_PAGEMAP_FOLIO_WAIT_BIT
 	ZFS_AC_KERNEL_SRC_ADD_DISK
 	ZFS_AC_KERNEL_SRC_KTHREAD
@ -160,26 +156,17 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_SRC], [
 	ZFS_AC_KERNEL_SRC___COPY_FROM_USER_INATOMIC
 	ZFS_AC_KERNEL_SRC_USER_NS_COMMON_INUM
 	ZFS_AC_KERNEL_SRC_IDMAP_MNT_API
-	ZFS_AC_KERNEL_SRC_IDMAP_NO_USERNS
 	ZFS_AC_KERNEL_SRC_IATTR_VFSID
 	ZFS_AC_KERNEL_SRC_FILEMAP
 	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
-	ZFS_AC_KERNEL_SRC_PROC_HANDLER_CTL_TABLE_CONST
 	ZFS_AC_KERNEL_SRC_COPY_SPLICE_READ
-	ZFS_AC_KERNEL_SRC_SYNC_BDEV
-	ZFS_AC_KERNEL_SRC_MM_PAGE_SIZE
-	ZFS_AC_KERNEL_SRC_MM_PAGE_MAPPING
 	case "$host_cpu" in
 		powerpc*)
 			ZFS_AC_KERNEL_SRC_CPU_HAS_FEATURE
 			ZFS_AC_KERNEL_SRC_FLUSH_DCACHE_PAGE
 			;;
-		riscv*)
-			ZFS_AC_KERNEL_SRC_FLUSH_DCACHE_PAGE
-			;;
 	esac

 	AC_MSG_CHECKING([for available kernel interfaces])
@ -191,7 +178,6 @@ dnl #
 dnl # Check results of kernel interface tests.
 dnl #
 AC_DEFUN([ZFS_AC_KERNEL_TEST_RESULT], [
-	ZFS_AC_KERNEL_TYPES
 	ZFS_AC_KERNEL_ACCESS_OK_TYPE
 	ZFS_AC_KERNEL_GLOBAL_PAGE_STATE
 	ZFS_AC_KERNEL_OBJTOOL
@ -273,7 +259,6 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_RESULT], [
 	ZFS_AC_KERNEL_VFS_IOV_ITER
 	ZFS_AC_KERNEL_VFS_COPY_FILE_RANGE
 	ZFS_AC_KERNEL_VFS_GENERIC_COPY_FILE_RANGE
-	ZFS_AC_KERNEL_VFS_SPLICE_COPY_FILE_RANGE
 	ZFS_AC_KERNEL_VFS_REMAP_FILE_RANGE
 	ZFS_AC_KERNEL_VFS_CLONE_FILE_RANGE
 	ZFS_AC_KERNEL_VFS_DEDUPE_FILE_RANGE
@ -305,8 +290,6 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_RESULT], [
 	ZFS_AC_KERNEL_SYSFS
 	ZFS_AC_KERNEL_SET_SPECIAL_STATE
 	ZFS_AC_KERNEL_STANDALONE_LINUX_STDARG
-	ZFS_AC_KERNEL_STRLCPY
-	ZFS_AC_KERNEL_STRSCPY
 	ZFS_AC_KERNEL_PAGEMAP_FOLIO_WAIT_BIT
 	ZFS_AC_KERNEL_ADD_DISK
 	ZFS_AC_KERNEL_KTHREAD
@ -314,26 +297,17 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_RESULT], [
 	ZFS_AC_KERNEL___COPY_FROM_USER_INATOMIC
 	ZFS_AC_KERNEL_USER_NS_COMMON_INUM
 	ZFS_AC_KERNEL_IDMAP_MNT_API
-	ZFS_AC_KERNEL_IDMAP_NO_USERNS
 	ZFS_AC_KERNEL_IATTR_VFSID
 	ZFS_AC_KERNEL_FILEMAP
 	ZFS_AC_KERNEL_WRITEPAGE_T
 	ZFS_AC_KERNEL_RECLAIMED
 	ZFS_AC_KERNEL_REGISTER_SYSCTL_TABLE
-	ZFS_AC_KERNEL_REGISTER_SYSCTL_SZ
-	ZFS_AC_KERNEL_PROC_HANDLER_CTL_TABLE_CONST
 	ZFS_AC_KERNEL_COPY_SPLICE_READ
-	ZFS_AC_KERNEL_SYNC_BDEV
-	ZFS_AC_KERNEL_MM_PAGE_SIZE
-	ZFS_AC_KERNEL_MM_PAGE_MAPPING
 	case "$host_cpu" in
 		powerpc*)
 			ZFS_AC_KERNEL_CPU_HAS_FEATURE
 			ZFS_AC_KERNEL_FLUSH_DCACHE_PAGE
 			;;
-		riscv*)
-			ZFS_AC_KERNEL_FLUSH_DCACHE_PAGE
-			;;
 	esac
 ])

--- a/config/rpm.am
+++ b/config/rpm.am
@ -83,11 +83,6 @@ srpm-common:
 		rpm-local || exit 1; \
 	LANG=C $(RPMBUILD) \
 		--define "_tmppath $$rpmbuild/TMP" \
-		--define "_builddir $$rpmbuild/BUILD" \
-		--define "_rpmdir $$rpmbuild/RPMS" \
-		--define "_srcrpmdir $$rpmbuild/SRPMS" \
-		--define "_specdir $$rpmbuild/SPECS" \
-		--define "_sourcedir $$rpmbuild/SOURCES" \
 		--define "_topdir $$rpmbuild" \
 		$(def) -bs $$rpmbuild/SPECS/$$rpmspec || exit 1; \
 	cp $$rpmbuild/SRPMS/$$rpmpkg . || exit 1; \
@ -104,11 +99,6 @@ rpm-common:
 		rpm-local || exit 1; \
 	LANG=C ${RPMBUILD} \
 		--define "_tmppath $$rpmbuild/TMP" \
-		--define "_builddir $$rpmbuild/BUILD" \
-		--define "_rpmdir $$rpmbuild/RPMS" \
-		--define "_srcrpmdir $$rpmbuild/SRPMS" \
-		--define "_specdir $$rpmbuild/SPECS" \
-		--define "_sourcedir $$rpmbuild/SOURCES" \
 		--define "_topdir $$rpmbuild" \
 		$(def) --rebuild $$rpmpkg || exit 1; \
 	cp $$rpmbuild/RPMS/*/* . || exit 1; \
--- a/config/user-backtrace.m4
+++ b/config/user-backtrace.m4
@ -1,14 +0,0 @@
-dnl
-dnl backtrace(), for userspace assertions. glibc has this directly in libc.
-dnl FreeBSD and (sometimes) musl have it in a separate -lexecinfo. It's assumed
-dnl that this will also get the companion function backtrace_symbols().
-dnl
-AC_DEFUN([ZFS_AC_CONFIG_USER_BACKTRACE], [
-	AX_SAVE_FLAGS
-	LIBS=""
-	AC_SEARCH_LIBS([backtrace], [execinfo], [
-		AC_DEFINE(HAVE_BACKTRACE, 1, [backtrace() is available])
-		AC_SUBST([BACKTRACE_LIBS], ["$LIBS"])
-	])
-	AX_RESTORE_FLAGS
-])
--- a/Show More
+++ b/Show More