openzfs · tonyhutter · Mar 24, 2025 · Mar 25, 2025 · Feb 14, 2025 · Feb 14, 2025
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -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:

diff --git a/.github/workflows/scripts/qemu-2-start.sh b/.github/workflows/scripts/qemu-2-start.sh
@@ -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)
-    OSNAME="FreeBSD 13.3-RELEASE"
-    OSv="freebsd13.0"
-    URLzs="$FREEBSD/amd64-freebsd-13.3-RELEASE.qcow2.zst"
-    BASH="/usr/local/bin/bash"
-    NIC="rtl8139"
+  fedora42)
+    OSNAME="Fedora 42"
+    OSv="fedora-unknown"
+    URL="https://download.fedoraproject.org/pub/fedora/linux/releases/42/Cloud/x86_64/images/Fedora-Cloud-Base-Generic-42-1.1.x86_64.qcow2"
     ;;
   freebsd13-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"

diff --git a/.github/workflows/scripts/qemu-3-deps-vm.sh b/.github/workflows/scripts/qemu-3-deps-vm.sh
@@ -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

diff --git a/.github/workflows/scripts/qemu-4-build-vm.sh b/.github/workflows/scripts/qemu-4-build-vm.sh
@@ -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/SRPMS/*.rpm .
+    cp ~/rpmbuild/RPMS/noarch/*.rpm ~/zfs
+    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

diff --git a/.github/workflows/zfs-qemu-packages.yml b/.github/workflows/zfs-qemu-packages.yml
@@ -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

diff --git a/.github/workflows/zfs-qemu.yml b/.github/workflows/zfs-qemu.yml
@@ -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"]'
-          QUICK_OS='["almalinux8", "almalinux9", "debian12", "fedora41", "freebsd13-3r", "freebsd14-2r", "ubuntu24"]'
+          FULL_OS='["almalinux8", "almalinux9", "debian11", "debian12", "fedora40", "fedora41", "fedora42", "freebsd13-4r", "freebsd14-2r", "freebsd15-0c", "ubuntu20", "ubuntu22", "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) }}

diff --git a/.mailmap b/.mailmap
@@ -71,15 +71,19 @@ Rob Norris <[email protected]>
 Sam Lunt <[email protected]>
 Sanjeev Bagewadi <[email protected]>
 Sebastian Wuerl <[email protected]>
+SHENGYI HONG <[email protected]>
 Stoiko Ivanov <[email protected]>
 Tamas TEVESZ <[email protected]>
 WHR <[email protected]>
 Yanping Gao <[email protected]>
 Youzhong Yang <[email protected]>
 
 # Signed-off-by: overriding Author:
+Alexander Ziaee <[email protected]> <[email protected]>
 Ryan <[email protected]> <[email protected]>
 Sietse <[email protected]> <[email protected]>
+Phil Sutter <[email protected]> <[email protected]>
+poscat <[email protected]> <[email protected]>
 Qiuhao Chen <[email protected]> <[email protected]>
 Yuxin Wang <[email protected]> <[email protected]>
 Zhenlei Huang <[email protected]> <[email protected]>
@@ -207,6 +211,7 @@ Torsten Wörtwein <[email protected]> <[email protected]>
 Tulsi Jain <[email protected]> <[email protected]>
 Václav Skála <[email protected]> <[email protected]>
 Vaibhav Bhanawat <[email protected]> <[email protected]>
+Vandana Rungta <[email protected]> <[email protected]>
 Violet Purcell <[email protected]> <[email protected]>
 Vipin Kumar Verma <[email protected]> <[email protected]>
 Wolfgang Bumiller <[email protected]> <[email protected]>

diff --git a/AUTHORS b/AUTHORS
@@ -36,6 +36,7 @@ CONTRIBUTORS:
     Alexander Pyhalov <[email protected]>
     Alexander Richardson <[email protected]>
     Alexander Stetsenko <[email protected]>
+    Alexander Ziaee <[email protected]>
     Alex Braunegg <[email protected]>
     Alexey Shvetsov <[email protected]>
     Alexey Smirnoff <[email protected]>
@@ -288,13 +289,15 @@ CONTRIBUTORS:
     ilovezfs <[email protected]>
     InsanePrawn <[email protected]>
     Isaac Huang <[email protected]>
+    Ivan Volosyuk <[email protected]>
     Jacek Fefliński <[email protected]>
     Jacob Adams <[email protected]>
     Jake Howard <[email protected]>
     James Cowgill <[email protected]>
     James H <[email protected]>
     James Lee <[email protected]>
     James Pan <[email protected]>
+    James Reilly <[email protected]>
     James Wah <[email protected]>
     Jan Engelhardt <[email protected]>
     Jan Kryl <[email protected]>
@@ -306,13 +309,15 @@ CONTRIBUTORS:
     Jason Lee <[email protected]>
     Jason Zaman <[email protected]>
     Javen Wu <[email protected]>
+    Jaydeep Kshirsagar <[email protected]>
     Jean-Baptiste Lallement <[email protected]>
     Jeff Dike <[email protected]>
     Jeremy Faulkner <[email protected]>
     Jeremy Gill <[email protected]>
     Jeremy Jones <[email protected]>
     Jeremy Visser <[email protected]>
     Jerry Jelinek <[email protected]>
+    Jerzy Kołosowski <[email protected]>
     Jessica Clarke <[email protected]>
     Jinshan Xiong <[email protected]>
     Jitendra Patidar <[email protected]>
@@ -372,6 +377,7 @@ CONTRIBUTORS:
     Kohsuke Kawaguchi <[email protected]>
     Konstantin Khorenko <[email protected]>
     KORN Andras <[email protected]>
+    kotauskas <[email protected]>
     Kristof Provost <[email protected]>
     Krzysztof Piecuch <[email protected]>
     Kyle Blatter <[email protected]>
@@ -452,6 +458,7 @@ CONTRIBUTORS:
     Mike Swanson <[email protected]>
     Milan Jurik <[email protected]>
     Minsoo Choo <[email protected]>
+    mnrx <[email protected]>
     Mohamed Tawfik <[email protected]>
     Morgan Jones <[email protected]>
     Moritz Maxeiner <[email protected]>
@@ -494,6 +501,7 @@ CONTRIBUTORS:
     Pawel Jakub Dawidek <[email protected]>
     Pedro Giffuni <[email protected]>
     Peng <[email protected]>
+    Peng Liu <[email protected]>
     Peter Ashford <[email protected]>
     Peter Dave Hello <[email protected]>
     Peter Doherty <[email protected]>
@@ -503,9 +511,11 @@ CONTRIBUTORS:
     Philip Pokorny <[email protected]>
     Philipp Riederer <[email protected]>
     Phil Kauffman <[email protected]>
+    Phil Sutter <[email protected]>
     Ping Huang <[email protected]>
     Piotr Kubaj <[email protected]>
     Piotr P. Stefaniak <[email protected]>
+    poscat <[email protected]>
     Prakash Surya <[email protected]>
     Prasad Joshi <[email protected]>
     privb0x23 <[email protected]>
@@ -575,6 +585,7 @@ CONTRIBUTORS:
     Shaun Tancheff <[email protected]>
     Shawn Bayern <[email protected]>
     Shengqi Chen <[email protected]>
+    SHENGYI HONG <[email protected]>
     Shen Yan <[email protected]>
     Sietse <[email protected]>
     Simon Guest <[email protected]>
@@ -616,7 +627,9 @@ CONTRIBUTORS:
     timor <[email protected]>
     Timothy Day <[email protected]>
     Tim Schumacher <[email protected]>
+    Tim Smith <[email protected]>
     Tino Reichardt <[email protected]>
+    tleydxdy <[email protected]>
     Tobin Harding <[email protected]>
     Todd Seidelmann <[email protected]>
     Tom Caputi <[email protected]>
@@ -640,6 +653,7 @@ CONTRIBUTORS:
     Vaibhav Bhanawat <[email protected]>
     Valmiky Arquissandas <[email protected]>
     Val Packett <[email protected]>
+    Vandana Rungta <[email protected]>
     Vince van Oosten <[email protected]>
     Violet Purcell <[email protected]>
     Vipin Kumar Verma <[email protected]>

diff --git a/META b/META
@@ -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
diff --git a/Makefile.am b/Makefile.am
@@ -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

diff --git a/cmd/arc_summary b/cmd/arc_summary
@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# SPDX-License-Identifier: BSD-2-Clause
 #
 # Copyright (c) 2008 Ben Rockwood <[email protected]>,
 # Copyright (c) 2010 Martin Matuska <[email protected]>,

diff --git a/cmd/arcstat.in b/cmd/arcstat.in
@@ -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

diff --git a/cmd/dbufstat.in b/cmd/dbufstat.in
@@ -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

diff --git a/cmd/mount_zfs.c b/cmd/mount_zfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *

diff --git a/cmd/raidz_test/raidz_bench.c b/cmd/raidz_test/raidz_bench.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *

diff --git a/cmd/raidz_test/raidz_test.c b/cmd/raidz_test/raidz_test.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *

diff --git a/cmd/raidz_test/raidz_test.h b/cmd/raidz_test/raidz_test.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *

diff --git a/cmd/zdb/zdb.c b/cmd/zdb/zdb.c
@@ -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

diff --git a/cmd/zdb/zdb.h b/cmd/zdb/zdb.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *

diff --git a/cmd/zdb/zdb_il.c b/cmd/zdb/zdb_il.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *

diff --git a/cmd/zed/agents/fmd_api.c b/cmd/zed/agents/fmd_api.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *

diff --git a/cmd/zed/agents/fmd_api.h b/cmd/zed/agents/fmd_api.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *

diff --git a/cmd/zed/agents/fmd_serd.c b/cmd/zed/agents/fmd_serd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *

diff --git a/cmd/zed/agents/fmd_serd.h b/cmd/zed/agents/fmd_serd.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: CDDL-1.0
 /*
  * CDDL HEADER START
  *