Tag zfs-2.3.2

META file and changelog updated. Signed-off-by: Tony Hutter <hutter2@llnl.gov>
RPM: Hold back incompatible kernel packages on Fedora
2026-05-25 19:57:43 +03:00 · 2025-04-30 10:58:28 -07:00 · 2025-04-30 10:58:28 -07:00 · 2025-04-22 12:29:07 -07:00 · 2025-04-16 09:59:45 -07:00 · 2025-04-16 09:59:45 -07:00
3280 changed files with 30052 additions and 813 deletions
@@ -5,16 +5,16 @@ env:
 build_task:
  matrix:
    freebsd_instance:
-      image_family: freebsd-12-4
+      image_family: freebsd-13-5
    freebsd_instance:
-      image_family: freebsd-13-2
+      image_family: freebsd-14-2
    freebsd_instance:
-      image_family: freebsd-14-0-snap
+      image_family: freebsd-15-0-snap
  prepare_script:
-    - pkg install -y autoconf automake libtool gettext-runtime gmake ksh93 py39-packaging py39-cffi py39-sysctl
+    - pkg install -y autoconf automake libtool gettext-runtime gmake ksh93 py311-packaging py311-cffi py311-sysctl
  configure_script:
    - env MAKE=gmake ./autogen.sh
-    - env MAKE=gmake ./configure --with-config="user" --with-python=3.9
+    - env MAKE=gmake ./configure --with-config="user" --with-python=3.11
  build_script:
    - gmake -j `sysctl -n kern.smp.cpus`
  install_script:
@@ -68,12 +68,10 @@ case "$OS" in
    OSv="fedora-unknown"
    URL="https://download.fedoraproject.org/pub/fedora/linux/releases/41/Cloud/x86_64/images/Fedora-Cloud-Base-Generic-41-1.4.x86_64.qcow2"
    ;;
-  freebsd13-3r)
+  fedora42)
-    OSNAME="FreeBSD 13.3-RELEASE"
+    OSNAME="Fedora 42"
-    OSv="freebsd13.0"
+    OSv="fedora-unknown"
-    URLzs="$FREEBSD/amd64-freebsd-13.3-RELEASE.qcow2.zst"
+    URL="https://download.fedoraproject.org/pub/fedora/linux/releases/42/Cloud/x86_64/images/Fedora-Cloud-Base-Generic-42-1.1.x86_64.qcow2"
    BASH="/usr/local/bin/bash"
    NIC="rtl8139"
    ;;
  freebsd13-4r)
    OSNAME="FreeBSD 13.4-RELEASE"
@@ -82,12 +80,6 @@ case "$OS" in
    BASH="/usr/local/bin/bash"
    NIC="rtl8139"
    ;;
  freebsd14-1r)
    OSNAME="FreeBSD 14.1-RELEASE"
    OSv="freebsd14.0"
    URLzs="$FREEBSD/amd64-freebsd-14.1-RELEASE.qcow2.zst"
    BASH="/usr/local/bin/bash"
    ;;
  freebsd14-2r)
    OSNAME="FreeBSD 14.2-RELEASE"
    OSv="freebsd14.0"
@@ -129,6 +129,9 @@ case "$1" in
  fedora*)
    rhel
    sudo dnf install -y libunwind-devel
    # Fedora 42+ moves /usr/bin/script from 'util-linux' to 'util-linux-script'
    sudo dnf install -y util-linux-script || true
    ;;
  freebsd*)
    freebsd
@@ -259,8 +259,9 @@ function rpm_build_and_install() {
    # ZFS release RPMs are built.  Copy them to the ~/zfs directory just to
    # keep all the RPMs in the same place.
-    cp ~/rpmbuild/RPMS/noarch/*.rpm .
+    cp ~/rpmbuild/RPMS/noarch/*.rpm ~/zfs
-    cp ~/rpmbuild/SRPMS/*.rpm .
+    cp ~/rpmbuild/SRPMS/*.rpm ~/zfs
    popd
    rm -fr ~/rpmbuild
    echo "##[endgroup]"
@@ -300,6 +301,17 @@ function deb_build_and_install() {
  echo "##[endgroup]"
 }
 function build_tarball {
  if [ -n "$REPO" ] ; then
    ./autogen.sh
    ./configure --with-config=srpm
    make dist
    mkdir -p /tmp/repo/releases
    # The tarball name is based off of 'Version' field in the META file.
    mv *.tar.gz /tmp/repo/releases/
  fi
 }
 # Debug: show kernel cmdline
 if [ -f /proc/cmdline ] ; then
  cat /proc/cmdline || true
@@ -339,6 +351,13 @@ case "$OS" in
    ;;
  fedora*)
    rpm_build_and_install "$extra"
    # Historically, we've always built the release tarballs on Fedora, since
    # there was one instance long ago where we built them on CentOS 7, and they
    # didn't work correctly for everyone.
    if [ -n "$TARBALL" ] ; then
        build_tarball
    fi
    ;;
  debian*|ubuntu*)
    deb_build_and_install "$extra"
@@ -348,16 +367,6 @@ case "$OS" in
    ;;
 esac
 # Optionally build tarballs.  The tarball's root directory name will be named
 # after the current tag, like 'zfs-2.3.0' or 'master'.
 if [ -n "$TARBALL" ] ; then
  tag="$(git symbolic-ref -q --short HEAD || git describe --tags --exact-match)"
  git archive --format=tar.gz -o $tag.tar.gz $tag
  if [ -n "$REPO" ] ; then
    mkdir -p /tmp/repo/releases
    cp $tag.tar.gz /tmp/repo/releases
  fi
 fi
 # building the zfs module was ok
 echo 0 > /var/tmp/build-exitcode.txt
@@ -47,7 +47,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os: ['almalinux8', 'almalinux9', 'fedora40', 'fedora41']
+        os: ['almalinux8', 'almalinux9', 'fedora40', 'fedora41', 'fedora42']
    runs-on: ubuntu-24.04
    steps:
    - uses: actions/checkout@v4
@@ -34,8 +34,8 @@ jobs:
      - name: Generate OS config and CI type
        id: os
        run: |
-          FULL_OS='["almalinux8", "almalinux9", "debian11", "debian12", "fedora40", "fedora41", "freebsd13-3r", "freebsd13-4s", "freebsd14-1r", "freebsd14-2s", "freebsd15-0c", "ubuntu20", "ubuntu22", "ubuntu24"]'
+          FULL_OS='["almalinux8", "almalinux9", "debian11", "debian12", "fedora40", "fedora41", "fedora42", "freebsd13-4r", "freebsd14-2r", "freebsd15-0c", "ubuntu20", "ubuntu22", "ubuntu24"]'
-          QUICK_OS='["almalinux8", "almalinux9", "debian12", "fedora41", "freebsd13-3r", "freebsd14-2r", "ubuntu24"]'
+          QUICK_OS='["almalinux8", "almalinux9", "debian12", "fedora42", "freebsd14-2r", "ubuntu24"]'
          # determine CI type when running on PR
          ci_type="full"
          if ${{ github.event_name == 'pull_request' }}; then
@@ -72,7 +72,7 @@ jobs:
        # debian:  debian11, debian12, ubuntu20, ubuntu22, ubuntu24
        # misc:    archlinux, tumbleweed
        # FreeBSD variants of 2024-12:
-        # FreeBSD Release: freebsd13-3r, freebsd13-4r, freebsd14-1r, freebsd14-2r
+        # FreeBSD Release: freebsd13-4r, freebsd14-2r
        # FreeBSD Stable:  freebsd13-4s, freebsd14-2s
        # FreeBSD Current: freebsd15-0c
        os: ${{ fromJson(needs.test-config.outputs.test_os) }}
@@ -71,6 +71,7 @@ Rob Norris <rob.norris@klarasystems.com>
 Sam Lunt <samuel.j.lunt@gmail.com>
 Sanjeev Bagewadi <sanjeev.bagewadi@gmail.com>
 Sebastian Wuerl <s.wuerl@mailbox.org>
 SHENGYI HONG <aokblast@FreeBSD.org>
 Stoiko Ivanov <github@nomore.at>
 Tamas TEVESZ <ice@extreme.hu>
 WHR <msl0000023508@gmail.com>
@@ -78,8 +79,11 @@ Yanping Gao <yanping.gao@xtaotech.com>
 Youzhong Yang <youzhong@gmail.com>
 # Signed-off-by: overriding Author:
 Alexander Ziaee <ziaee@FreeBSD.org> <concussious@runbox.com>
 Ryan <errornointernet@envs.net> <error.nointernet@gmail.com>
 Sietse <sietse@wizdom.nu> <uglymotha@wizdom.nu>
 Phil Sutter <phil@nwl.cc> <p.github@nwl.cc>
 poscat <poscat@poscat.moe> <poscat0x04@outlook.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>
@@ -207,6 +211,7 @@ Torsten Wörtwein <twoertwein@gmail.com> <twoertwein@users.noreply.github.com>
 Tulsi Jain <tulsi.jain@delphix.com> <TulsiJain@users.noreply.github.com>
 Václav Skála <skala@vshosting.cz> <33496485+vaclavskala@users.noreply.github.com>
 Vaibhav Bhanawat <vaibhav.bhanawat@delphix.com> <88050553+vaibhav-delphix@users.noreply.github.com>
 Vandana Rungta <vrungta@amazon.com> <46906819+vandanarungta@users.noreply.github.com>
 Violet Purcell <vimproved@inventati.org> <66446404+vimproved@users.noreply.github.com>
 Vipin Kumar Verma <vipin.verma@hpe.com> <75025470+vermavipinkumar@users.noreply.github.com>
 Wolfgang Bumiller <w.bumiller@proxmox.com> <Blub@users.noreply.github.com>
@@ -36,6 +36,7 @@ CONTRIBUTORS:
    Alexander Pyhalov <apyhalov@gmail.com>
    Alexander Richardson <Alexander.Richardson@cl.cam.ac.uk>
    Alexander Stetsenko <ams@nexenta.com>
    Alexander Ziaee <ziaee@FreeBSD.org>
    Alex Braunegg <alex.braunegg@gmail.com>
    Alexey Shvetsov <alexxy@gentoo.org>
    Alexey Smirnoff <fling@member.fsf.org>
@@ -288,6 +289,7 @@ CONTRIBUTORS:
    ilovezfs <ilovezfs@icloud.com>
    InsanePrawn <Insane.Prawny@gmail.com>
    Isaac Huang <he.huang@intel.com>
    Ivan Volosyuk <Ivan.Volosyuk@gmail.com>
    Jacek Fefliński <feflik@gmail.com>
    Jacob Adams <tookmund@gmail.com>
    Jake Howard <git@theorangeone.net>
@@ -295,6 +297,7 @@ CONTRIBUTORS:
    James H <james@kagisoft.co.uk>
    James Lee <jlee@thestaticvoid.com>
    James Pan <jiaming.pan@yahoo.com>
    James Reilly <jreilly1821@gmail.com>
    James Wah <james@laird-wah.net>
    Jan Engelhardt <jengelh@inai.de>
    Jan Kryl <jan.kryl@nexenta.com>
@@ -306,6 +309,7 @@ CONTRIBUTORS:
    Jason Lee <jasonlee@lanl.gov>
    Jason Zaman <jasonzaman@gmail.com>
    Javen Wu <wu.javen@gmail.com>
    Jaydeep Kshirsagar <jkshirsagar@maxlinear.com>
    Jean-Baptiste Lallement <jean-baptiste@ubuntu.com>
    Jeff Dike <jdike@akamai.com>
    Jeremy Faulkner <gldisater@gmail.com>
@@ -313,6 +317,7 @@ CONTRIBUTORS:
    Jeremy Jones <jeremy@delphix.com>
    Jeremy Visser <jeremy.visser@gmail.com>
    Jerry Jelinek <jerry.jelinek@joyent.com>
    Jerzy Kołosowski <jerzy@kolosowscy.pl>
    Jessica Clarke <jrtc27@jrtc27.com>
    Jinshan Xiong <jinshan.xiong@intel.com>
    Jitendra Patidar <jitendra.patidar@nutanix.com>
@@ -372,6 +377,7 @@ CONTRIBUTORS:
    Kohsuke Kawaguchi <kk@kohsuke.org>
    Konstantin Khorenko <khorenko@virtuozzo.com>
    KORN Andras <korn@elan.rulez.org>
    kotauskas <v.toncharov@gmail.com>
    Kristof Provost <github@sigsegv.be>
    Krzysztof Piecuch <piecuch@kpiecuch.pl>
    Kyle Blatter <kyleblatter@llnl.gov>
@@ -452,6 +458,7 @@ CONTRIBUTORS:
    Mike Swanson <mikeonthecomputer@gmail.com>
    Milan Jurik <milan.jurik@xylab.cz>
    Minsoo Choo <minsoochoo0122@proton.me>
    mnrx <mnrx@users.noreply.github.com>
    Mohamed Tawfik <m_tawfik@aucegypt.edu>
    Morgan Jones <mjones@rice.edu>
    Moritz Maxeiner <moritz@ucworks.org>
@@ -494,6 +501,7 @@ CONTRIBUTORS:
    Pawel Jakub Dawidek <pjd@FreeBSD.org>
    Pedro Giffuni <pfg@freebsd.org>
    Peng <peng.hse@xtaotech.com>
    Peng Liu <littlenewton6@gmail.com>
    Peter Ashford <ashford@accs.com>
    Peter Dave Hello <hsu@peterdavehello.org>
    Peter Doherty <peterd@acranox.org>
@@ -503,9 +511,11 @@ CONTRIBUTORS:
    Philip Pokorny <ppokorny@penguincomputing.com>
    Philipp Riederer <pt@philipptoelke.de>
    Phil Kauffman <philip@kauffman.me>
    Phil Sutter <phil@nwl.cc>
    Ping Huang <huangping@smartx.com>
    Piotr Kubaj <pkubaj@anongoth.pl>
    Piotr P. Stefaniak <pstef@freebsd.org>
    poscat <poscat@poscat.moe>
    Prakash Surya <prakash.surya@delphix.com>
    Prasad Joshi <prasadjoshi124@gmail.com>
    privb0x23 <privb0x23@users.noreply.github.com>
@@ -575,6 +585,7 @@ CONTRIBUTORS:
    Shaun Tancheff <shaun@aeonazure.com>
    Shawn Bayern <sbayern@law.fsu.edu>
    Shengqi Chen <harry-chen@outlook.com>
    SHENGYI HONG <aokblast@FreeBSD.org>
    Shen Yan <shenyanxxxy@qq.com>
    Sietse <sietse@wizdom.nu>
    Simon Guest <simon.guest@tesujimath.org>
@@ -616,7 +627,9 @@ CONTRIBUTORS:
    timor <timor.dd@googlemail.com>
    Timothy Day <tday141@gmail.com>
    Tim Schumacher <timschumi@gmx.de>
    Tim Smith <tim@mondoo.com>
    Tino Reichardt <milky-zfs@mcmilk.de>
    tleydxdy <shironeko.github@tesaguri.club>
    Tobin Harding <me@tobin.cc>
    Todd Seidelmann <seidelma@users.noreply.github.com>
    Tom Caputi <tcaputi@datto.com>
@@ -640,6 +653,7 @@ CONTRIBUTORS:
    Vaibhav Bhanawat <vaibhav.bhanawat@delphix.com>
    Valmiky Arquissandas <kayvlim@gmail.com>
    Val Packett <val@packett.cool>
    Vandana Rungta <vrungta@amazon.com>
    Vince van Oosten <techhazard@codeforyouand.me>
    Violet Purcell <vimproved@inventati.org>
    Vipin Kumar Verma <vipin.verma@hpe.com>
@@ -1,10 +1,10 @@
 Meta:          1
 Name:          zfs
 Branch:        1.0
-Version:       2.3.1
+Version:       2.3.2
 Release:       1
 Release-Tags:  relext
 License:       CDDL
 Author:        OpenZFS
-Linux-Maximum: 6.13
+Linux-Maximum: 6.14
 Linux-Minimum: 4.18
@@ -112,6 +112,10 @@ commitcheck:
 		${top_srcdir}/scripts/commitcheck.sh; \
 	fi
 CHECKS += spdxcheck
 spdxcheck:
 	$(AM_V_at)$(top_srcdir)/scripts/spdxcheck.pl
 if HAVE_PARALLEL
 cstyle_line = -print0 | parallel -X0 ${top_srcdir}/scripts/cstyle.pl -cpP {}
 else
@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
 # SPDX-License-Identifier: BSD-2-Clause
 #
 # Copyright (c) 2008 Ben Rockwood <benr@cuddletech.com>,
 # Copyright (c) 2010 Martin Matuska <mm@FreeBSD.org>,
@@ -1,4 +1,5 @@
 #!/usr/bin/env @PYTHON_SHEBANG@
 # SPDX-License-Identifier: CDDL-1.0
 #
 # Print out ZFS ARC Statistics exported via kstat(1)
 # For a definition of fields, or usage, use arcstat -v
@@ -1,4 +1,5 @@
 #!/usr/bin/env @PYTHON_SHEBANG@
 # SPDX-License-Identifier: CDDL-1.0
 #
 # Print out statistics for all cached dmu buffers.  This information
 # is available through the dbufs kstat and may be post-processed as
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * CDDL HEADER START
 *
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * CDDL HEADER START
 *
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * CDDL HEADER START
 *
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * CDDL HEADER START
 *
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * CDDL HEADER START
 *
@@ -2059,6 +2060,8 @@ dump_ddt_object(ddt_t *ddt, ddt_type_t type, ddt_class_t class)
 	if (dump_opt['D'] < 3)
 		return;
 	(void) printf("%s: object=%llu\n", name,
 	    (u_longlong_t)ddt->ddt_object[type][class]);
 	zpool_dump_ddt(NULL, &ddt->ddt_histogram[type][class]);
 	if (dump_opt['D'] < 4)
@@ -5862,7 +5865,7 @@ zdb_count_block(zdb_cb_t *zcb, zilog_t *zilog, const blkptr_t *bp,
 		 * Find the block. This will create the entry in memory, but
 		 * we'll know if that happened by its refcount.
 		 */
-		ddt_entry_t *dde = ddt_lookup(ddt, bp);
+		ddt_entry_t *dde = ddt_lookup(ddt, bp, B_TRUE);
 		/*
 		 * ddt_lookup() can return NULL if this block didn't exist
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * CDDL HEADER START
 *
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * CDDL HEADER START
 *
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * CDDL HEADER START
 *
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * CDDL HEADER START
 *
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * CDDL HEADER START
 *
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * CDDL HEADER START
 *
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * CDDL HEADER START
 *
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * CDDL HEADER START
 *
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * CDDL HEADER START
 *
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * CDDL HEADER START
 *
@@ -214,6 +215,7 @@ zfs_process_add(zpool_handle_t *zhp, nvlist_t *vdev, boolean_t labeled)
 	vdev_stat_t *vs;
 	char **lines = NULL;
 	int lines_cnt = 0;
 	int rc;
 	/*
 	 * Get the persistent path, typically under the '/dev/disk/by-id' or
@@ -405,17 +407,17 @@ zfs_process_add(zpool_handle_t *zhp, nvlist_t *vdev, boolean_t labeled)
 	}
 	nvlist_lookup_string(vdev, "new_devid", &new_devid);
 	if (is_mpath_wholedisk) {
 		/* Don't label device mapper or multipath disks. */
 		zed_log_msg(LOG_INFO,
 		    "  it's a multipath wholedisk, don't label");
-		if (zpool_prepare_disk(zhp, vdev, "autoreplace", &lines,
+		rc = zpool_prepare_disk(zhp, vdev, "autoreplace", &lines,
-		    &lines_cnt) != 0) {
+		    &lines_cnt);
 		if (rc != 0) {
 			zed_log_msg(LOG_INFO,
 			    "  zpool_prepare_disk: could not "
-			    "prepare '%s' (%s)", fullpath,
+			    "prepare '%s' (%s), path '%s', rc = %d", fullpath,
-			    libzfs_error_description(g_zfshdl));
+			    libzfs_error_description(g_zfshdl), path, rc);
 			if (lines_cnt > 0) {
 				zed_log_msg(LOG_INFO,
 				    "  zfs_prepare_disk output:");
@@ -446,12 +448,13 @@ zfs_process_add(zpool_handle_t *zhp, nvlist_t *vdev, boolean_t labeled)
 		 * If this is a request to label a whole disk, then attempt to
 		 * write out the label.
 		 */
-		if (zpool_prepare_and_label_disk(g_zfshdl, zhp, leafname,
+		rc = zpool_prepare_and_label_disk(g_zfshdl, zhp, leafname,
-		    vdev, "autoreplace", &lines, &lines_cnt) != 0) {
+		    vdev, "autoreplace", &lines, &lines_cnt);
 		if (rc != 0) {
 			zed_log_msg(LOG_WARNING,
 			    "  zpool_prepare_and_label_disk: could not "
-			    "label '%s' (%s)", leafname,
+			    "label '%s' (%s), rc = %d", leafname,
-			    libzfs_error_description(g_zfshdl));
+			    libzfs_error_description(g_zfshdl), rc);
 			if (lines_cnt > 0) {
 				zed_log_msg(LOG_INFO,
 				"  zfs_prepare_disk output:");
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * CDDL HEADER START
 *
@@ -403,6 +404,7 @@ zfs_retire_recv(fmd_hdl_t *hdl, fmd_event_t *ep, nvlist_t *nvl,
 	    (state == VDEV_STATE_REMOVED || state == VDEV_STATE_FAULTED))) {
 		const char *devtype;
 		char *devname;
 		boolean_t skip_removal = B_FALSE;
 		if (nvlist_lookup_string(nvl, FM_EREPORT_PAYLOAD_ZFS_VDEV_TYPE,
 		    &devtype) == 0) {
@@ -440,18 +442,28 @@ zfs_retire_recv(fmd_hdl_t *hdl, fmd_event_t *ep, nvlist_t *nvl,
 		nvlist_lookup_uint64_array(vdev, ZPOOL_CONFIG_VDEV_STATS,
 		    (uint64_t **)&vs, &c);
 		if (vs->vs_state == VDEV_STATE_OFFLINE)
 			return;
 		/*
 		 * If state removed is requested for already removed vdev,
 		 * its a loopback event from spa_async_remove(). Just
 		 * ignore it.
 		 */
-		if ((vs->vs_state == VDEV_STATE_REMOVED && state ==
+		if ((vs->vs_state == VDEV_STATE_REMOVED &&
-		    VDEV_STATE_REMOVED) || vs->vs_state == VDEV_STATE_OFFLINE)
+		    state == VDEV_STATE_REMOVED)) {
 			if (strcmp(class, "resource.fs.zfs.removed") == 0 &&
 			    nvlist_exists(nvl, "by_kernel")) {
 				skip_removal = B_TRUE;
 			} else {
 				return;
 			}
 		}
 		/* Remove the vdev since device is unplugged */
 		int remove_status = 0;
-		if (l2arc || (strcmp(class, "resource.fs.zfs.removed") == 0)) {
+		if (!skip_removal && (l2arc ||
 		    (strcmp(class, "resource.fs.zfs.removed") == 0))) {
 			remove_status = zpool_vdev_remove_wanted(zhp, devname);
 			fmd_hdl_debug(hdl, "zpool_vdev_remove_wanted '%s'"
 			    ", err:%d", devname, libzfs_errno(zhdl));
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * This file is part of the ZFS Event Daemon (ZED).
 *
@@ -1,4 +1,5 @@
 #!/bin/sh
 # SPDX-License-Identifier: CDDL-1.0
 # shellcheck disable=SC2154
 #
 # CDDL HEADER START
@@ -283,6 +283,11 @@ zed_notify_email()
        if [ "${ZED_EMAIL_OPTS%@SUBJECT@*}" = "${ZED_EMAIL_OPTS}" ] ; then
            # inject subject header
            printf "Subject: %s\n" "${subject}"
            # The following empty line is needed to separate the header from the
            # body of the message. Otherwise programs like sendmail will skip
            # everything up to the first empty line (or wont send an email at
            # all) and will still exit with exit code 0
            printf "\n"
        fi
        # output message
        cat "${pathname}"
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * This file is part of the ZFS Event Daemon (ZED).
 *
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * This file is part of the ZFS Event Daemon (ZED).
 *
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * This file is part of the ZFS Event Daemon (ZED).
 *
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * CDDL HEADER START
 *
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * CDDL HEADER START
 *
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * This file is part of the ZFS Event Daemon (ZED).
 *
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * This file is part of the ZFS Event Daemon (ZED).
 *
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * This file is part of the ZFS Event Daemon (ZED).
 *
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * This file is part of the ZFS Event Daemon (ZED).
 *
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * This file is part of the ZFS Event Daemon (ZED).
 *
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * This file is part of the ZFS Event Daemon (ZED).
 *
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * This file is part of the ZFS Event Daemon (ZED).
 *
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * This file is part of the ZFS Event Daemon (ZED).
 *
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * This file is part of the ZFS Event Daemon (ZED).
 *
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * This file is part of the ZFS Event Daemon (ZED).
 *
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * CDDL HEADER START
 *
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * CDDL HEADER START
 *
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * CDDL HEADER START
 *
@@ -5292,6 +5293,7 @@ zfs_do_receive(int argc, char **argv)
 #define	ZFS_DELEG_PERM_SHARE		"share"
 #define	ZFS_DELEG_PERM_SEND		"send"
 #define	ZFS_DELEG_PERM_RECEIVE		"receive"
 #define	ZFS_DELEG_PERM_RECEIVE_APPEND	"receive:append"
 #define	ZFS_DELEG_PERM_ALLOW		"allow"
 #define	ZFS_DELEG_PERM_USERPROP		"userprop"
 #define	ZFS_DELEG_PERM_VSCAN		"vscan" /* ??? */
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * CDDL HEADER START
 *
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * CDDL HEADER START
 *
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * CDDL HEADER START
 *
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * CDDL HEADER START
 *
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * CDDL HEADER START
 *
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * CDDL HEADER START
 *
@@ -1,4 +1,5 @@
 #!/usr/bin/env @PYTHON_SHEBANG@
 # SPDX-License-Identifier: CDDL-1.0
 #
 # Print out statistics for all zil stats. This information is
 # available through the zil kstat.
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * CDDL HEADER START
 *
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * CDDL HEADER START
 *
@@ -434,29 +435,26 @@ print_data_handler(int id, const char *pool, zinject_record_t *record,
 	if (*count == 0) {
 		(void) printf("%3s  %-15s  %-6s  %-6s  %-8s  %3s  %-4s  "
-		    "%-15s  %-6s  %-15s\n", "ID", "POOL", "OBJSET", "OBJECT",
+		    "%-15s\n", "ID", "POOL", "OBJSET", "OBJECT", "TYPE",
-		    "TYPE", "LVL", "DVAs", "RANGE", "MATCH", "INJECT");
+		    "LVL", "DVAs", "RANGE");
 		(void) printf("---  ---------------  ------  "
-		    "------  --------  ---  ----  ---------------  "
+		    "------  --------  ---  ----  ---------------\n");
 		    "------  ------\n");
 	}
 	*count += 1;
-	char rangebuf[32];
+	(void) printf("%3d  %-15s  %-6llu  %-6llu  %-8s  %-3d  0x%02x  ",
-	if (record->zi_start == 0 && record->zi_end == -1ULL)
+	    id, pool, (u_longlong_t)record->zi_objset,
 		snprintf(rangebuf, sizeof (rangebuf), "all");
 	else
 		snprintf(rangebuf, sizeof (rangebuf), "[%llu, %llu]",
 		    (u_longlong_t)record->zi_start,
 		    (u_longlong_t)record->zi_end);
 	(void) printf("%3d  %-15s  %-6llu  %-6llu  %-8s  %-3d  0x%02x  %-15s  "
 	    "%6lu  %6lu\n", id, pool, (u_longlong_t)record->zi_objset,
 	    (u_longlong_t)record->zi_object, type_to_name(record->zi_type),
-	    record->zi_level, record->zi_dvas, rangebuf,
+	    record->zi_level, record->zi_dvas);
-	    record->zi_match_count, record->zi_inject_count);
+
 	if (record->zi_start == 0 &&
 	    record->zi_end == -1ULL)
 		(void) printf("all\n");
 	else
 		(void) printf("[%llu, %llu]\n", (u_longlong_t)record->zi_start,
 		    (u_longlong_t)record->zi_end);
 	return (0);
 }
@@ -474,14 +472,11 @@ print_device_handler(int id, const char *pool, zinject_record_t *record,
 		return (0);
 	if (*count == 0) {
-		(void) printf("%3s  %-15s  %-16s  %-5s  %-10s  %-9s  "
+		(void) printf("%3s  %-15s  %-16s  %-5s  %-10s  %-9s\n",
-		    "%-6s  %-6s\n",
+		    "ID", "POOL", "GUID", "TYPE", "ERROR", "FREQ");
 		    "ID", "POOL", "GUID", "TYPE", "ERROR", "FREQ",
 		    "MATCH", "INJECT");
 		(void) printf(
 		    "---  ---------------  ----------------  "
-		    "-----  ----------  ---------  "
+		    "-----  ----------  ---------\n");
 		    "------  ------\n");
 	}
 	*count += 1;
@@ -489,10 +484,9 @@ print_device_handler(int id, const char *pool, zinject_record_t *record,
 	double freq = record->zi_freq == 0 ? 100.0f :
 	    (((double)record->zi_freq) / ZI_PERCENTAGE_MAX) * 100.0f;
-	(void) printf("%3d  %-15s  %llx  %-5s  %-10s  %8.4f%%  "
+	(void) printf("%3d  %-15s  %llx  %-5s  %-10s  %8.4f%%\n", id, pool,
-	    "%6lu  %6lu\n", id, pool, (u_longlong_t)record->zi_guid,
+	    (u_longlong_t)record->zi_guid, iotype_to_str(record->zi_iotype),
-	    iotype_to_str(record->zi_iotype), err_to_str(record->zi_error),
+	    err_to_str(record->zi_error), freq);
 	    freq, record->zi_match_count, record->zi_inject_count);
 	return (0);
 }
@@ -510,25 +504,18 @@ print_delay_handler(int id, const char *pool, zinject_record_t *record,
 		return (0);
 	if (*count == 0) {
-		(void) printf("%3s  %-15s  %-16s  %-10s  %-5s  %-9s  "
+		(void) printf("%3s  %-15s  %-15s  %-15s  %s\n",
-		    "%-6s  %-6s\n",
+		    "ID", "POOL", "DELAY (ms)", "LANES", "GUID");
-		    "ID", "POOL", "GUID", "DELAY (ms)", "LANES", "FREQ",
+		(void) printf("---  ---------------  ---------------  "
-		    "MATCH", "INJECT");
+		    "---------------  ----------------\n");
 		(void) printf("---  ---------------  ----------------  "
 		    "----------  -----  ---------  "
 		    "------  ------\n");
 	}
 	*count += 1;
-	double freq = record->zi_freq == 0 ? 100.0f :
+	(void) printf("%3d  %-15s  %-15llu  %-15llu  %llx\n", id, pool,
 	    (((double)record->zi_freq) / ZI_PERCENTAGE_MAX) * 100.0f;
 	(void) printf("%3d  %-15s  %llx  %10llu  %5llu  %8.4f%%  "
 	    "%6lu  %6lu\n", id, pool, (u_longlong_t)record->zi_guid,
 	    (u_longlong_t)NSEC2MSEC(record->zi_timer),
 	    (u_longlong_t)record->zi_nlanes,
-	    freq, record->zi_match_count, record->zi_inject_count);
+	    (u_longlong_t)record->zi_guid);
 	return (0);
 }
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * CDDL HEADER START
 *
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * CDDL HEADER START
 *
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * CDDL HEADER START
 *
@@ -87,7 +88,8 @@
 typedef struct vdev_disk_db_entry
 {
-	char id[24];
+	/* 24 byte name + 1 byte NULL terminator to make GCC happy */
 	char id[25];
 	int sector_size;
 } vdev_disk_db_entry_t;
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * CDDL HEADER START
 *
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * CDDL HEADER START
 *
@@ -12746,11 +12747,13 @@ found:
 			if (strcmp(argv[1], "root") == 0)
 				vdev = strdup("root-0");
 			else
 				vdev = strdup(argv[1]);
 			/* ... and the rest are vdev names */
 			if (vdev == NULL)
 				cb.cb_vdevs.cb_names = argv + 1;
 			else
 				cb.cb_vdevs.cb_names = &vdev;
 			cb.cb_vdevs.cb_names_count = argc - 1;
 			cb.cb_type = ZFS_TYPE_VDEV;
 			argc = 1; /* One pool to process */
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * CDDL HEADER START
 *
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * CDDL HEADER START
 *
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * CDDL HEADER START
 *
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * Gather top-level ZFS pool and resilver/scan statistics and print using
 * influxdb line protocol
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * CDDL HEADER START
 *
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * CDDL HEADER START
 *
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * CDDL HEADER START
 *
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * CDDL HEADER START
 *
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * CDDL HEADER START
 *
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * CDDL HEADER START
 *
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * CDDL HEADER START
 *
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * CDDL HEADER START
 *
@@ -1811,7 +1812,8 @@ ztest_zd_fini(ztest_ds_t *zd)
 		ztest_rll_destroy(&zd->zd_range_lock[l]);
 }
-#define	TXG_MIGHTWAIT	(ztest_random(10) == 0 ? TXG_NOWAIT : TXG_WAIT)
+#define	DMU_TX_MIGHTWAIT	\
 	(ztest_random(10) == 0 ? DMU_TX_NOWAIT : DMU_TX_WAIT)
 static uint64_t
 ztest_tx_assign(dmu_tx_t *tx, uint64_t txg_how, const char *tag)
@@ -1825,7 +1827,7 @@ ztest_tx_assign(dmu_tx_t *tx, uint64_t txg_how, const char *tag)
 	error = dmu_tx_assign(tx, txg_how);
 	if (error) {
 		if (error == ERESTART) {
-			ASSERT3U(txg_how, ==, TXG_NOWAIT);
+			ASSERT3U(txg_how, ==, DMU_TX_NOWAIT);
 			dmu_tx_wait(tx);
 		} else {
 			ASSERT3U(error, ==, ENOSPC);
@@ -2072,7 +2074,7 @@ ztest_replay_create(void *arg1, void *arg2, boolean_t byteswap)
 		dmu_tx_hold_bonus(tx, DMU_NEW_OBJECT);
 	}
-	txg = ztest_tx_assign(tx, TXG_WAIT, FTAG);
+	txg = ztest_tx_assign(tx, DMU_TX_WAIT, FTAG);
 	if (txg == 0)
 		return (ENOSPC);
@@ -2162,7 +2164,7 @@ ztest_replay_remove(void *arg1, void *arg2, boolean_t byteswap)
 	dmu_tx_hold_zap(tx, lr->lr_doid, B_FALSE, name);
 	dmu_tx_hold_free(tx, object, 0, DMU_OBJECT_END);
-	txg = ztest_tx_assign(tx, TXG_WAIT, FTAG);
+	txg = ztest_tx_assign(tx, DMU_TX_WAIT, FTAG);
 	if (txg == 0) {
 		ztest_object_unlock(zd, object);
 		return (ENOSPC);
@@ -2244,7 +2246,7 @@ ztest_replay_write(void *arg1, void *arg2, boolean_t byteswap)
 	    P2PHASE(offset, length) == 0)
 		abuf = dmu_request_arcbuf(db, length);
-	txg = ztest_tx_assign(tx, TXG_WAIT, FTAG);
+	txg = ztest_tx_assign(tx, DMU_TX_WAIT, FTAG);
 	if (txg == 0) {
 		if (abuf != NULL)
 			dmu_return_arcbuf(abuf);
@@ -2342,7 +2344,7 @@ ztest_replay_truncate(void *arg1, void *arg2, boolean_t byteswap)
 	dmu_tx_hold_free(tx, lr->lr_foid, lr->lr_offset, lr->lr_length);
-	txg = ztest_tx_assign(tx, TXG_WAIT, FTAG);
+	txg = ztest_tx_assign(tx, DMU_TX_WAIT, FTAG);
 	if (txg == 0) {
 		ztest_range_unlock(rl);
 		ztest_object_unlock(zd, lr->lr_foid);
@@ -2383,7 +2385,7 @@ ztest_replay_setattr(void *arg1, void *arg2, boolean_t byteswap)
 	tx = dmu_tx_create(os);
 	dmu_tx_hold_bonus(tx, lr->lr_foid);
-	txg = ztest_tx_assign(tx, TXG_WAIT, FTAG);
+	txg = ztest_tx_assign(tx, DMU_TX_WAIT, FTAG);
 	if (txg == 0) {
 		dmu_buf_rele(db, FTAG);
 		ztest_object_unlock(zd, lr->lr_foid);
@@ -2801,7 +2803,7 @@ ztest_prealloc(ztest_ds_t *zd, uint64_t object, uint64_t offset, uint64_t size)
 	dmu_tx_hold_write(tx, object, offset, size);
-	txg = ztest_tx_assign(tx, TXG_WAIT, FTAG);
+	txg = ztest_tx_assign(tx, DMU_TX_WAIT, FTAG);
 	if (txg != 0) {
 		dmu_prealloc(os, object, offset, size, tx);
@@ -5169,7 +5171,7 @@ ztest_dmu_read_write(ztest_ds_t *zd, uint64_t id)
 	/* This accounts for setting the checksum/compression. */
 	dmu_tx_hold_bonus(tx, bigobj);
-	txg = ztest_tx_assign(tx, TXG_MIGHTWAIT, FTAG);
+	txg = ztest_tx_assign(tx, DMU_TX_MIGHTWAIT, FTAG);
 	if (txg == 0) {
 		umem_free(packbuf, packsize);
 		umem_free(bigbuf, bigsize);
@@ -5470,7 +5472,7 @@ ztest_dmu_read_write_zcopy(ztest_ds_t *zd, uint64_t id)
 		dmu_tx_hold_write(tx, packobj, packoff, packsize);
 		dmu_tx_hold_write(tx, bigobj, bigoff, bigsize);
-		txg = ztest_tx_assign(tx, TXG_MIGHTWAIT, FTAG);
+		txg = ztest_tx_assign(tx, DMU_TX_MIGHTWAIT, FTAG);
 		if (txg == 0) {
 			umem_free(packbuf, packsize);
 			umem_free(bigbuf, bigsize);
@@ -5690,7 +5692,7 @@ ztest_zap(ztest_ds_t *zd, uint64_t id)
 	 */
 	tx = dmu_tx_create(os);
 	dmu_tx_hold_zap(tx, object, B_TRUE, NULL);
-	txg = ztest_tx_assign(tx, TXG_MIGHTWAIT, FTAG);
+	txg = ztest_tx_assign(tx, DMU_TX_MIGHTWAIT, FTAG);
 	if (txg == 0)
 		goto out;
 	for (i = 0; i < 2; i++) {
@@ -5758,7 +5760,7 @@ ztest_zap(ztest_ds_t *zd, uint64_t id)
 	 */
 	tx = dmu_tx_create(os);
 	dmu_tx_hold_zap(tx, object, B_TRUE, NULL);
-	txg = ztest_tx_assign(tx, TXG_MIGHTWAIT, FTAG);
+	txg = ztest_tx_assign(tx, DMU_TX_MIGHTWAIT, FTAG);
 	if (txg == 0)
 		goto out;
@@ -5792,7 +5794,7 @@ ztest_zap(ztest_ds_t *zd, uint64_t id)
 	tx = dmu_tx_create(os);
 	dmu_tx_hold_zap(tx, object, B_TRUE, NULL);
-	txg = ztest_tx_assign(tx, TXG_MIGHTWAIT, FTAG);
+	txg = ztest_tx_assign(tx, DMU_TX_MIGHTWAIT, FTAG);
 	if (txg == 0)
 		goto out;
 	VERIFY0(zap_remove(os, object, txgname, tx));
@@ -5835,7 +5837,7 @@ ztest_fzap(ztest_ds_t *zd, uint64_t id)
 		tx = dmu_tx_create(os);
 		dmu_tx_hold_zap(tx, object, B_TRUE, name);
-		txg = ztest_tx_assign(tx, TXG_MIGHTWAIT, FTAG);
+		txg = ztest_tx_assign(tx, DMU_TX_MIGHTWAIT, FTAG);
 		if (txg == 0)
 			goto out;
 		error = zap_add(os, object, name, sizeof (uint64_t), 1,
@@ -5906,7 +5908,7 @@ ztest_zap_parallel(ztest_ds_t *zd, uint64_t id)
 	if (i >= 2) {
 		tx = dmu_tx_create(os);
 		dmu_tx_hold_zap(tx, object, B_TRUE, NULL);
-		txg = ztest_tx_assign(tx, TXG_MIGHTWAIT, FTAG);
+		txg = ztest_tx_assign(tx, DMU_TX_MIGHTWAIT, FTAG);
 		if (txg == 0) {
 			umem_free(od, sizeof (ztest_od_t));
 			return;
@@ -6072,7 +6074,7 @@ ztest_dmu_commit_callbacks(ztest_ds_t *zd, uint64_t id)
 		error = -1;
 	if (!error)
-		error = dmu_tx_assign(tx, TXG_NOWAIT);
+		error = dmu_tx_assign(tx, DMU_TX_NOWAIT);
 	txg = error ? 0 : dmu_tx_get_txg(tx);
@@ -1,3 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 # ===========================================================================
 #     https://www.gnu.org/software/autoconf-archive/ax_code_coverage.html
 # ===========================================================================
@@ -0,0 +1,19 @@
 dnl #
 dnl # SB_DYING exists since Linux 6.6
 dnl #
 AC_DEFUN([ZFS_AC_KERNEL_SRC_SB_DYING], [
 	ZFS_LINUX_TEST_SRC([sb_dying], [
 		#include <linux/fs.h>
 	],[
 		(void) SB_DYING;
 	])
 ])
 AC_DEFUN([ZFS_AC_KERNEL_SB_DYING], [
 	AC_MSG_CHECKING([whether SB_DYING is defined])
 	ZFS_LINUX_TEST_RESULT([sb_dying], [
 		AC_MSG_RESULT(yes)
 	],[
 		AC_MSG_RESULT(no)
 	])
 ])
@@ -0,0 +1,27 @@
 dnl #
 dnl # Linux 6.0 gets rid of address_space_operations.migratepage
 dnl #
 AC_DEFUN([ZFS_AC_KERNEL_SRC_VFS_MIGRATEPAGE], [
 	ZFS_LINUX_TEST_SRC([vfs_has_migratepage], [
 		#include <linux/fs.h>
 		#include <linux/migrate.h>
 		static const struct address_space_operations
 		    aops __attribute__ ((unused)) = {
 			.migratepage	= migrate_page,
 		};
 	],[])
 ])
 AC_DEFUN([ZFS_AC_KERNEL_VFS_MIGRATEPAGE], [
 	dnl #
 	dnl # Linux 6.0 gets rid of address_space_operations.migratepage
 	dnl #
 	AC_MSG_CHECKING([whether migratepage exists])
 	ZFS_LINUX_TEST_RESULT([vfs_has_migratepage], [
 		AC_MSG_RESULT([yes])
 		AC_DEFINE(HAVE_VFS_MIGRATEPAGE, 1, [migratepage exists])
 	],[
 		AC_MSG_RESULT([no])
 	])
 ])
@@ -73,11 +73,13 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_SRC], [
 	ZFS_AC_KERNEL_SRC_TRUNCATE_SETSIZE
 	ZFS_AC_KERNEL_SRC_SECURITY_INODE
 	ZFS_AC_KERNEL_SRC_FST_MOUNT
 	ZFS_AC_KERNEL_SRC_SB_DYING
 	ZFS_AC_KERNEL_SRC_SET_NLINK
 	ZFS_AC_KERNEL_SRC_SGET
 	ZFS_AC_KERNEL_SRC_VFS_FILEMAP_DIRTY_FOLIO
 	ZFS_AC_KERNEL_SRC_VFS_READ_FOLIO
 	ZFS_AC_KERNEL_SRC_VFS_MIGRATE_FOLIO
 	ZFS_AC_KERNEL_SRC_VFS_MIGRATEPAGE
 	ZFS_AC_KERNEL_SRC_VFS_FSYNC_2ARGS
 	ZFS_AC_KERNEL_SRC_VFS_READPAGES
 	ZFS_AC_KERNEL_SRC_VFS_SET_PAGE_DIRTY_NOBUFFERS
@@ -184,11 +186,13 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_RESULT], [
 	ZFS_AC_KERNEL_TRUNCATE_SETSIZE
 	ZFS_AC_KERNEL_SECURITY_INODE
 	ZFS_AC_KERNEL_FST_MOUNT
 	ZFS_AC_KERNEL_SB_DYING
 	ZFS_AC_KERNEL_SET_NLINK
 	ZFS_AC_KERNEL_SGET
 	ZFS_AC_KERNEL_VFS_FILEMAP_DIRTY_FOLIO
 	ZFS_AC_KERNEL_VFS_READ_FOLIO
 	ZFS_AC_KERNEL_VFS_MIGRATE_FOLIO
 	ZFS_AC_KERNEL_VFS_MIGRATEPAGE
 	ZFS_AC_KERNEL_VFS_FSYNC_2ARGS
 	ZFS_AC_KERNEL_VFS_READPAGES
 	ZFS_AC_KERNEL_VFS_SET_PAGE_DIRTY_NOBUFFERS
@@ -463,6 +467,11 @@ AC_DEFUN([ZFS_AC_KERNEL], [
 	AC_SUBST(LINUX)
 	AC_SUBST(LINUX_OBJ)
 	AC_SUBST(LINUX_VERSION)
 	dnl # create a relatively unique numeric checksum based on the kernel
 	dnl # version and path. this is included in the cache key below,
 	dnl # allowing different cached values for different kernels
 	_zfs_linux_cache_checksum=$(echo ${kernelsrc} {$kernelbuild} ${kernsrcver} | cksum | cut -f1 -d' ')
 ])
 AC_DEFUN([ZFS_AC_KERNEL_VERSION_WARNING], [
@@ -810,6 +819,9 @@ dnl # must never depend on the results of previous tests.  Each test
 dnl # needs to be entirely independent.
 dnl #
 AC_DEFUN([ZFS_LINUX_TEST_SRC], [
 	cachevar="zfs_cv_kernel_[$1]_$_zfs_linux_cache_checksum"
 	eval "cacheval=\$$cachevar"
 	AS_IF([test "x$cacheval" = "x"], [
 		ZFS_LINUX_CONFTEST_C([ZFS_LINUX_TEST_PROGRAM([[$2]], [[$3]],
 		    [["Dual BSD/GPL"]])], [$1])
 		ZFS_LINUX_CONFTEST_MAKEFILE([$1], [yes], [$4])
@@ -820,6 +832,7 @@ AC_DEFUN([ZFS_LINUX_TEST_SRC], [
 			ZFS_LINUX_CONFTEST_MAKEFILE([$1_license], [yes], [$4])
 		])
 	])
 ])
 dnl #
 dnl # ZFS_LINUX_TEST_RESULT
@@ -829,8 +842,14 @@ dnl # $2 - run on success (valid .ko generated)
 dnl # $3 - run on failure (unable to compile)
 dnl #
 AC_DEFUN([ZFS_LINUX_TEST_RESULT], [
 	cachevar="zfs_cv_kernel_[$1]_$_zfs_linux_cache_checksum"
 	AC_CACHE_VAL([$cachevar], [
 		AS_IF([test -d build/$1], [
-		AS_IF([test -f build/$1/$1.ko], [$2], [$3])
+			AS_IF([test -f build/$1/$1.ko], [
 				eval "$cachevar=yes"
 			], [
 				eval "$cachevar=no"
 			])
 		], [
 			AC_MSG_ERROR([
 	*** No matching source for the "$1" test, check that
@@ -838,6 +857,9 @@ AC_DEFUN([ZFS_LINUX_TEST_RESULT], [
 			])
 		])
 	])
 	eval "cacheval=\$$cachevar"
 	AS_IF([test "x$cacheval" = "xyes"], [$2], [$3])
 ])
 dnl #
 dnl # ZFS_LINUX_TEST_ERROR
@@ -865,16 +887,25 @@ dnl # verify symbol exports, unless --enable-linux-builtin was provided to
 dnl # configure.
 dnl #
 AC_DEFUN([ZFS_LINUX_TEST_RESULT_SYMBOL], [
 	cachevar="zfs_cv_kernel_[$1]_$_zfs_linux_cache_checksum"
 	AC_CACHE_VAL([$cachevar], [
 		AS_IF([ ! test -f build/$1/$1.ko], [
-		$5
+			eval "$cachevar=no"
 		], [
 			AS_IF([test "x$enable_linux_builtin" != "xyes"], [
-			ZFS_CHECK_SYMBOL_EXPORT([$2], [$3], [$4], [$5])
+				ZFS_CHECK_SYMBOL_EXPORT([$2], [$3], [
 					eval "$cachevar=yes"
 				], [
-			$4
+					eval "$cachevar=no"
 				])
 			], [
 				eval "$cachevar=yes"
 			])
 		])
 	])
 	eval "cacheval=\$$cachevar"
 	AS_IF([test "x$cacheval" = "xyes"], [$4], [$5])
 ])
 dnl #
 dnl # ZFS_LINUX_COMPILE_IFELSE
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: CDDL-1.0
 /*
 * This file is part of OpenZFS.
 *
@@ -11,6 +11,7 @@ Build-Depends: debhelper-compat (= 12),
               libelf-dev,
               libpam0g-dev,
               libssl-dev | libssl1.0-dev,
               libtirpc-dev,
               libtool,
               libudev-dev,
               lsb-release,
@@ -41,9 +41,9 @@ activate_vg()
                return 1
        fi
-        # Detect and activate available volume groups
+        # Detect and auto-activate available volume groups
        /sbin/lvm vgscan
-        /sbin/lvm vgchange -a y --sysinit
+        /sbin/lvm vgchange -aay --sysinit
        return $?
 }
@@ -1,3 +1,4 @@
 // SPDX-License-Identifier: BSD-3-Clause
 /*
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
@@ -1,3 +1,4 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 # Copyright 2015 ClusterHQ
 #
@@ -1,3 +1,4 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 # Copyright 2015 ClusterHQ
 #
@@ -1,3 +1,4 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 # Copyright 2015 ClusterHQ
 #
@@ -1,3 +1,4 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 # Copyright 2015 ClusterHQ
 #
@@ -1,3 +1,4 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 # Copyright 2015 ClusterHQ
 #
@@ -1,3 +1,4 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 # Copyright 2015 ClusterHQ
 #
@@ -1,3 +1,4 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 # Copyright 2015 ClusterHQ
 #
@@ -1,3 +1,4 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 # Copyright 2015 ClusterHQ
 #
@@ -1,3 +1,4 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 # Copyright 2015 ClusterHQ
 #
@@ -1,3 +1,4 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 # Copyright 2015 ClusterHQ
 #
@@ -1,3 +1,4 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 # Copyright 2015 ClusterHQ
 #
@@ -1,3 +1,4 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 # Copyright 2015 ClusterHQ
 #
@@ -1,4 +1,5 @@
 #!@DEFAULT_INIT_SHELL@
 # SPDX-License-Identifier: BSD-2-Clause
 # shellcheck disable=SC2154
 #
 # zfs-import    This script will import ZFS pools
@@ -1,4 +1,5 @@
 #!@DEFAULT_INIT_SHELL@
 # SPDX-License-Identifier: BSD-2-Clause
 # shellcheck disable=SC2154
 #
 # zfs-load-key  This script will load/unload the zfs filesystems keys.
@@ -1,4 +1,5 @@
 #!@DEFAULT_INIT_SHELL@
 # SPDX-License-Identifier: BSD-2-Clause
 # shellcheck disable=SC2154
 #
 # zfs-mount     This script will mount/umount the zfs filesystems.
@@ -1,4 +1,5 @@
 #!@DEFAULT_INIT_SHELL@
 # SPDX-License-Identifier: BSD-2-Clause
 # shellcheck disable=SC2154
 #
 # zfs-share     This script will network share zfs filesystems and volumes.
--- a/Show More
+++ b/Show More