buildsys: fix DEBS variable name

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
(cherry picked from commit b577f030c4)
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

Makefile

@@ -13,7 +13,7 @@ libpam-zfs_${ZFSPKGVER}_amd64.deb		\
 libuutil3linux_${ZFSPKGVER}_amd64.deb		\
 libzfs4linux_${ZFSPKGVER}_amd64.deb		\
 libzfsbootenv1linux_${ZFSPKGVER}_amd64.deb	\
-libzpool5linux_${ZFSPKGVER}_amd64.deb		\
+libzpool4linux_${ZFSPKGVER}_amd64.deb		\
 zfs-test_${ZFSPKGVER}_amd64.deb			\
 zfsutils-linux_${ZFSPKGVER}_amd64.deb		\
 zfs-zed_${ZFSPKGVER}_amd64.deb
@@ -53,7 +53,7 @@ ${ZFSSRC}/README.md: submodule
 
 .PHONY: zfs
 zfs: ${DEBS}
-${ZFS_DEB2} ${ZFS_DBG_DEBS}: ${ZFS_DEB1}
+${ZFS_DEB2}: ${ZFS_DEB1}
 ${ZFS_DEB1}: ${ZFSDIR}
 	cd ${ZFSDIR}; dpkg-buildpackage -b -uc -us
 	lintian ${DEBS}
@@ -79,4 +79,4 @@ distclean: clean
 
 .PHONY: upload
 upload: ${DEBS}
-	tar -cf - ${DEBS} | ssh repoman@repo.proxmox.com -- upload --product pve,pmg,pbs --dist bullseye --arch amd64
+	tar -cf - ${DEBS} | ssh repoman@repo.proxmox.com -- upload --product pve,pmg,pbs --dist buster --arch amd64

debian/changelog

@@ -1,82 +1,20 @@
-zfs-linux (2.1.9-pve1) bullseye; urgency=medium
+zfs-linux (2.0.7-pve1) buster; urgency=medium
 
-  * update ZFS to 2.1.9
+  * update ZFS to 2.0.7
 
- -- Proxmox Support Team <support@proxmox.com>  Sat, 28 Jan 2023 15:03:22 +0100
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 12 Jan 2022 18:46:26 +0100
 
-zfs-linux (2.1.7-pve3) bullseye; urgency=medium
+zfs-linux (2.0.6-pve1~bpo10+1) buster; urgency=medium
 
-  * backport a fix for as potentially hanging pipe when resizing it on recv
+  * update ZFS to 2.0.6
 
-  * backport a fix for setting extended attributes (xattr)
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 28 Sep 2021 09:19:18 +0200
 
-  * adapt to 6.1 changes for open syscall with TMPFILE option
+zfs-linux (2.0.5-pve1~bpo10+1) buster; urgency=medium
 
- -- Proxmox Support Team <support@proxmox.com>  Sat, 07 Jan 2023 13:21:57 +0100
+  * Rebuild for buster based releases
 
-zfs-linux (2.1.7-pve2) bullseye; urgency=medium
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 21 Jul 2021 18:01:07 +0200
-
-  * backport fix for initramfs script when detecting rootfs legacy mountpoints
-
- -- Proxmox Support Team <support@proxmox.com>  Mon, 02 Jan 2023 17:07:18 +0100
-
-zfs-linux (2.1.7-pve1) bullseye; urgency=medium
-
-  * update ZFS to 2.1.7
-
- -- Proxmox Support Team <support@proxmox.com>  Tue, 06 Dec 2022 16:41:31 +0100
-
-zfs-linux (2.1.6-pve1) bullseye; urgency=medium
-
-  * update ZFS to 2.1.6
-
-  * symlink zpool_influxdb to /bin
-
-  * symlink zfs, zpool to /bin/ for non-root usage
-
- -- Proxmox Support Team <support@proxmox.com>  Tue, 04 Oct 2022 16:09:17 +0200
-
-zfs-linux (2.1.5-pve1) bullseye; urgency=medium
-
-  * update ZFS to 2.1.5
-
-  * Build with libcurl for new keylocation=https://
-
-  * d/control: add new zfs-dracut package
-
- -- Proxmox Support Team <support@proxmox.com>  Tue, 28 Jun 2022 16:13:24 +0200
-
-zfs-linux (2.1.4-pve1) bullseye; urgency=medium
-
-  * update ZFS to 2.1.4
-
- -- Proxmox Support Team <support@proxmox.com>  Thu, 24 Mar 2022 09:28:50 +0100
-
-zfs-linux (2.1.3-pve1) bullseye; urgency=medium
-
-  * update ZFS to 2.1.3
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 11 Mar 2022 16:36:22 +0100
-
-zfs-linux (2.1.2-pve1) bullseye; urgency=medium
-
-  * update ZFS to 2.1.2
-
- -- Proxmox Support Team <support@proxmox.com>  Tue, 11 Jan 2022 11:31:34 +0100
-
-zfs-linux (2.1.1-pve3) bullseye; urgency=medium
-
-  * zfs-utils: arc stat/summary: guard access to l2arc MFU/MRU stats to avoid
-    bogus exception when checking the ARC stats/summary on a older, 2.0 based
-    ZFS kernel module with the newer, 2.1 based, user space tools.
-
- -- Proxmox Support Team <support@proxmox.com>  Wed, 10 Nov 2021 09:58:31 +0100
-
-zfs-linux (2.1.1-pve1) bullseye; urgency=medium
-
-  * update ZFS to 2.1.1
-
- -- Proxmox Support Team <support@proxmox.com>  Tue, 28 Sep 2021 06:16:14 +0200
 
 zfs-linux (2.0.5-pve1) bullseye; urgency=medium
 

debian/control

@@ -5,14 +5,11 @@ Maintainer: Proxmox Support Team <support@proxmox.com>
 Build-Depends: abigail-tools,
                debhelper-compat (= 12),
                dh-python,
-               libaio-dev,
                libblkid-dev,
-               libcurl4-openssl-dev | libcurl4-gnutls-dev,
                libelf-dev,
                libpam0g-dev,
                libssl-dev | libssl1.0-dev,
                libtool,
-               libudev-dev,
                lsb-release,
                python3-cffi,
                python3-setuptools,
@@ -73,7 +70,7 @@ Depends: libssl-dev | libssl1.0-dev,
          libuutil3linux (= ${binary:Version}),
          libzfs4linux (= ${binary:Version}),
          libzfsbootenv1linux (= ${binary:Version}),
-         libzpool5linux (= ${binary:Version}),
+         libzpool4linux (= ${binary:Version}),
          ${misc:Depends}
 Provides: libnvpair-dev, libuutil-dev
 Description: OpenZFS filesystem development files for Linux
@@ -81,18 +78,15 @@ Description: OpenZFS filesystem development files for Linux
  libraries of OpenZFS filesystem.
  .
  This package includes the development files of libnvpair3, libuutil3,
- libzpool5 and libzfs4, libzfsbootenv1.
+ libzpool4 and libzfs4.
 
 Package: libzfs4linux
 Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-# The libcurl4 is loaded through dlopen("libcurl.so.4").
-# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=988521
-Recommends: libcurl4
 Breaks: libzfs2, libzfs2linux, libzfs3linux, libzfs4
 Replaces: libzfs2, libzfs2linux, libzfs3linux, libzfs4
-Description: OpenZFS filesystem library for Linux - general support
+Description: OpenZFS filesystem library for Linux
  OpenZFS is a storage platform that encompasses the functionality of
  traditional filesystems and volume managers. It supports data checksums,
  compression, encryption, snapshots, and more.
@@ -112,7 +106,7 @@ Description: OpenZFS filesystem library for Linux
  .
  The zfsbootenv library provides support for modifying ZFS label information.
 
-Package: libzpool5linux
+Package: libzpool4linux
 Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -186,19 +180,6 @@ Description: OpenZFS root filesystem capabilities for Linux - initramfs
  This package adds OpenZFS to the system initramfs with a hook
  for the initramfs-tools infrastructure.
 
-Package: zfs-dracut
-Architecture: all
-Depends: dracut,
-         zfsutils-linux (>= ${source:Version}),
-         ${misc:Depends}
-Description: OpenZFS root filesystem capabilities for Linux - dracut
- OpenZFS is a storage platform that encompasses the functionality of
- traditional filesystems and volume managers. It supports data checksums,
- compression, encryption, snapshots, and more.
- .
- This package adds OpenZFS to the system initramfs with a hook
- for the dracut infrastructure.
-
 Package: zfsutils-linux
 Section: contrib/admin
 Architecture: linux-any
@@ -223,7 +204,6 @@ Architecture: linux-any
 Depends: zfsutils-linux (>= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
-Recommends: bsd-mailx | mailutils
 Description: OpenZFS Event Daemon
  OpenZFS is a storage platform that encompasses the functionality of
  traditional filesystems and volume managers. It supports data checksums,
@@ -294,7 +274,7 @@ Suggests: libnvpair3linux-dbgsym,
          libuutil3linux-dbgsym,
          libzfs4linux-dbgsym,
          libzfsbootenv1linux-dbgsym,
-         libzpool5linux-dbgsym,
+         libzpool4linux-dbgsym,
          zfs-test-dbgsym,
          zfsutils-linux-dbgsym,
          zfs-zed-dbgsym,

debian/libzfsbootenv1linux.lintian-overrides

@@ -1,2 +1,2 @@
 package-name-doesnt-match-sonames
-extra-license-file *usr/share/doc/libzfsbootenv1linux/LICENSE.gz*
+extra-license-file usr/share/doc/libzfsbootenv1linux/LICENSE.gz

debian/patches/0001-Check-for-META-and-DCH-consistency-in-autoconf.patch

@@ -10,7 +10,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  1 file changed, 29 insertions(+), 5 deletions(-)
 
 diff --git a/config/zfs-meta.m4 b/config/zfs-meta.m4
-index 20064a0fb..4d5f545ad 100644
+index b3c1befaa..660d8ccb9 100644
 --- a/config/zfs-meta.m4
 +++ b/config/zfs-meta.m4
 @@ -1,9 +1,10 @@
@@ -67,4 +67,4 @@ index 20064a0fb..4d5f545ad 100644
 +		elif test ! -f ".nogitrelease" && git rev-parse --git-dir > /dev/null 2>&1; then
  			_match="${ZFS_META_NAME}-${ZFS_META_VERSION}"
  			_alias=$(git describe --match=${_match} 2>/dev/null)
- 			_release=$(echo ${_alias}|sed "s/${ZFS_META_NAME}//"|cut -f3- -d'-'|tr - _)
+ 			_release=$(echo ${_alias}|cut -f3- -d'-'|sed 's/-/_/g')

debian/patches/0003-Fix-the-path-to-the-zed-binary-on-the-systemd-unit.patch

@@ -13,7 +13,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/etc/systemd/system/zfs-zed.service.in b/etc/systemd/system/zfs-zed.service.in
-index be80025a4..20ce8e632 100644
+index 008075138..570e27707 100644
 --- a/etc/systemd/system/zfs-zed.service.in
 +++ b/etc/systemd/system/zfs-zed.service.in
 @@ -4,7 +4,7 @@ Documentation=man:zed(8)
@@ -22,6 +22,6 @@ index be80025a4..20ce8e632 100644
  [Service]
 -ExecStart=@sbindir@/zed -F
 +ExecStart=/usr/sbin/zed -F
- Restart=always
+ Restart=on-abort
  
  [Install]

debian/patches/0004-import-with-d-dev-disk-by-id-in-scan-service.patch

@@ -14,15 +14,15 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/etc/systemd/system/zfs-import-scan.service.in b/etc/systemd/system/zfs-import-scan.service.in
-index 598ef501b..e4f3a70c1 100644
+index f0317e23e..9a5e9cb17 100644
 --- a/etc/systemd/system/zfs-import-scan.service.in
 +++ b/etc/systemd/system/zfs-import-scan.service.in
 @@ -13,7 +13,7 @@ ConditionPathIsDirectory=/sys/module/zfs
  [Service]
  Type=oneshot
  RemainAfterExit=yes
--ExecStart=@sbindir@/zpool import -aN -o cachefile=none $ZPOOL_IMPORT_OPTS
+-ExecStart=@sbindir@/zpool import -aN -o cachefile=none
-+ExecStart=@sbindir@/zpool import -aN -d /dev/disk/by-id -o cachefile=none $ZPOOL_IMPORT_OPTS
++ExecStart=@sbindir@/zpool import -aN -d /dev/disk/by-id -o cachefile=none
  
  [Install]
  WantedBy=zfs-import.target

debian/patches/0005-Enable-zed-emails.patch

@@ -9,14 +9,23 @@ behavior of mdadm.
 
 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 ---
- cmd/zed/zed.d/zed.rc | 2 +-
+ cmd/zed/zed.d/zed.rc | 4 ++--
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/cmd/zed/zed.d/zed.rc b/cmd/zed/zed.d/zed.rc
-index 227b26c26..240d0dbfa 100644
+index 1c278b2ef..41c075c09 100644
 --- a/cmd/zed/zed.d/zed.rc
 +++ b/cmd/zed/zed.d/zed.rc
-@@ -42,7 +42,7 @@ ZED_EMAIL_ADDR="root"
+@@ -15,7 +15,7 @@
+ # Email will only be sent if ZED_EMAIL_ADDR is defined.
+ # Disabled by default; uncomment to enable.
+ #
+-#ZED_EMAIL_ADDR="root"
++ZED_EMAIL_ADDR="root"
+ 
+ ##
+ # Name or path of executable responsible for sending notifications via email;
+@@ -41,7 +41,7 @@
  ##
  # Minimum number of seconds between notifications for a similar event.
  #

debian/patches/0006-dont-symlink-zed-scripts.patch

@@ -16,10 +16,10 @@ Forwarded: no need
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/cmd/zed/zed.d/Makefile.am b/cmd/zed/zed.d/Makefile.am
-index 2c8173b3e..ad39292e4 100644
+index 8b2d0c200..118c96547 100644
 --- a/cmd/zed/zed.d/Makefile.am
 +++ b/cmd/zed/zed.d/Makefile.am
-@@ -49,7 +49,7 @@ install-data-hook:
+@@ -48,6 +48,6 @@ install-data-hook:
  	for f in $(zedconfdefaults); do \
  	  test -f "$(DESTDIR)$(zedconfdir)/$${f}" -o \
  	       -L "$(DESTDIR)$(zedconfdir)/$${f}" || \
@@ -27,4 +27,3 @@ index 2c8173b3e..ad39292e4 100644
 +	    echo "$${f}" >> "$(DESTDIR)$(zedexecdir)/DEFAULT-ENABLED" ; \
  	done
  	chmod 0600 "$(DESTDIR)$(zedconfdir)/zed.rc"
- 

debian/patches/0007-Use-installed-python3.patch

@@ -28,11 +28,11 @@ index 3788543b0..c7ee4ae9a 100755
  
  typeset -i cnt=0
 diff --git a/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh b/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh
-index 370f5382e..661fbe85d 100755
+index d52f0261a..18356b017 100755
 --- a/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh
 +++ b/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh
 @@ -87,7 +87,7 @@ log_must xattrtest -f 10 -x 3 -s 32768 -r -k -p /$TESTPOOL/$TESTFS2/xattrsadir
- # OpenZFS issue #7432
+ # ZoL issue #7432
  log_must zfs set compression=on xattr=sa $TESTPOOL/$TESTFS2
  log_must touch /$TESTPOOL/$TESTFS2/attrs
 -log_must eval "python -c 'print \"a\" * 4096' | \

debian/patches/0008-Add-systemd-unit-for-importing-specific-pools.patch

@@ -31,7 +31,7 @@ index e4056a92c..030611419 100644
  enable zfs-mount.service
  enable zfs-share.service
 diff --git a/etc/systemd/system/Makefile.am b/etc/systemd/system/Makefile.am
-index 35f833de5..af3ae597c 100644
+index c374a52ac..25d1b99d7 100644
 --- a/etc/systemd/system/Makefile.am
 +++ b/etc/systemd/system/Makefile.am
 @@ -7,6 +7,7 @@ systemdunit_DATA = \

debian/patches/0009-Patch-move-manpage-arcstat-1-to-arcstat-8.patch

@@ -8,44 +8,47 @@ Originally-By: Antonio Russo <aerusso@aerusso.net>
 
 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 ---
- man/Makefile.am                        | 2 +-
+ man/man1/Makefile.am                   | 2 +-
+ man/man8/Makefile.am                   | 1 +
  man/{man1/arcstat.1 => man8/arcstat.8} | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ 3 files changed, 3 insertions(+), 2 deletions(-)
  rename man/{man1/arcstat.1 => man8/arcstat.8} (99%)
 
-diff --git a/man/Makefile.am b/man/Makefile.am
+diff --git a/man/man1/Makefile.am b/man/man1/Makefile.am
-index 64650c2b9..95a66a62f 100644
+index 8d7457a3e..101af7b6c 100644
---- a/man/Makefile.am
+--- a/man/man1/Makefile.am
-+++ b/man/Makefile.am
++++ b/man/man1/Makefile.am
-@@ -8,7 +8,6 @@ dist_man_MANS = \
+@@ -1,4 +1,4 @@
- 	man1/ztest.1 \
+-dist_man_MANS = zhack.1 ztest.1 raidz_test.1 zvol_wait.1 arcstat.1
- 	man1/raidz_test.1 \
++dist_man_MANS = zhack.1 ztest.1 raidz_test.1 zvol_wait.1
- 	man1/zvol_wait.1 \
+ EXTRA_DIST = cstyle.1
--	man1/arcstat.1 \
+ 
- 	\
+ if BUILD_LINUX
- 	man5/vdev_id.conf.5 \
+diff --git a/man/man8/Makefile.am b/man/man8/Makefile.am
- 	\
+index 07f6aefa6..a757b1c62 100644
-@@ -22,6 +21,7 @@ dist_man_MANS = \
+--- a/man/man8/Makefile.am
- 	man7/zpoolconcepts.7 \
++++ b/man/man8/Makefile.am
- 	man7/zpoolprops.7 \
+@@ -1,6 +1,7 @@
- 	\
+ include $(top_srcdir)/config/Substfiles.am
-+	man8/arcstat.8 \
+ 
- 	man8/fsck.zfs.8 \
+ dist_man_MANS = \
- 	man8/mount.zfs.8 \
++	arcstat.8 \
- 	man8/vdev_id.8 \
+ 	fsck.zfs.8 \
+ 	mount.zfs.8 \
+ 	vdev_id.8 \
 diff --git a/man/man1/arcstat.1 b/man/man8/arcstat.8
 similarity index 99%
 rename from man/man1/arcstat.1
 rename to man/man8/arcstat.8
-index a69cd8937..dfe9c971b 100644
+index ca508b49c..0aa81849a 100644
 --- a/man/man1/arcstat.1
 +++ b/man/man8/arcstat.8
 @@ -13,7 +13,7 @@
+ .\" Copyright (c) 2015 by Delphix. All rights reserved.
  .\" Copyright (c) 2020 by AJ Jordan. All rights reserved.
  .\"
- .Dd May 26, 2021
+-.TH ARCSTAT 1 "Oct 20, 2020" OpenZFS
--.Dt ARCSTAT 1
++.TH ARCSTAT 8 "Oct 20, 2020" OpenZFS
-+.Dt ARCSTAT 8
+ .SH NAME
- .Os
+ arcstat \- report ZFS ARC and L2ARC statistics
- .
+ .SH SYNOPSIS
- .Sh NAME

debian/patches/0010-arcstat-Fix-integer-division-with-python3.patch

@@ -1,134 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Valmiky Arquissandas <kayvlim@gmail.com>
-Date: Fri, 8 Oct 2021 16:32:27 +0100
-Subject: [PATCH] arcstat: Fix integer division with python3
-
-The arcstat script requests compatibility with python2 and python3, but
-PEP 238 modified the / operator and results in erroneous output when
-run under python3.
-
-This commit replaces instances of / with //, yielding the expected
-result in both versions of Python.
-
-Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Reviewed-by: John Kennedy <john.kennedy@delphix.com>
-Reviewed-by: Ryan Moeller <ryan@ixsystems.com>
-Signed-off-by: Valmiky Arquissandas <foss@kayvlim.com>
-Closes #12603
-(cherry picked from commit 2d02bba23d83ae8fede8d281edc255f01ccd28e9)
-Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
----
- cmd/arcstat/arcstat.in | 66 +++++++++++++++++++++---------------------
- 1 file changed, 33 insertions(+), 33 deletions(-)
-
-diff --git a/cmd/arcstat/arcstat.in b/cmd/arcstat/arcstat.in
-index 425e52d1f..010f69ec0 100755
---- a/cmd/arcstat/arcstat.in
-+++ b/cmd/arcstat/arcstat.in
-@@ -441,73 +441,73 @@ def calculate():
- 
-     v = dict()
-     v["time"] = time.strftime("%H:%M:%S", time.localtime())
--    v["hits"] = d["hits"] / sint
--    v["miss"] = d["misses"] / sint
-+    v["hits"] = d["hits"] // sint
-+    v["miss"] = d["misses"] // sint
-     v["read"] = v["hits"] + v["miss"]
--    v["hit%"] = 100 * v["hits"] / v["read"] if v["read"] > 0 else 0
-+    v["hit%"] = 100 * v["hits"] // v["read"] if v["read"] > 0 else 0
-     v["miss%"] = 100 - v["hit%"] if v["read"] > 0 else 0
- 
--    v["dhit"] = (d["demand_data_hits"] + d["demand_metadata_hits"]) / sint
--    v["dmis"] = (d["demand_data_misses"] + d["demand_metadata_misses"]) / sint
-+    v["dhit"] = (d["demand_data_hits"] + d["demand_metadata_hits"]) // sint
-+    v["dmis"] = (d["demand_data_misses"] + d["demand_metadata_misses"]) // sint
- 
-     v["dread"] = v["dhit"] + v["dmis"]
--    v["dh%"] = 100 * v["dhit"] / v["dread"] if v["dread"] > 0 else 0
-+    v["dh%"] = 100 * v["dhit"] // v["dread"] if v["dread"] > 0 else 0
-     v["dm%"] = 100 - v["dh%"] if v["dread"] > 0 else 0
- 
--    v["phit"] = (d["prefetch_data_hits"] + d["prefetch_metadata_hits"]) / sint
-+    v["phit"] = (d["prefetch_data_hits"] + d["prefetch_metadata_hits"]) // sint
-     v["pmis"] = (d["prefetch_data_misses"] +
--                 d["prefetch_metadata_misses"]) / sint
-+                 d["prefetch_metadata_misses"]) // sint
- 
-     v["pread"] = v["phit"] + v["pmis"]
--    v["ph%"] = 100 * v["phit"] / v["pread"] if v["pread"] > 0 else 0
-+    v["ph%"] = 100 * v["phit"] // v["pread"] if v["pread"] > 0 else 0
-     v["pm%"] = 100 - v["ph%"] if v["pread"] > 0 else 0
- 
-     v["mhit"] = (d["prefetch_metadata_hits"] +
--                 d["demand_metadata_hits"]) / sint
-+                 d["demand_metadata_hits"]) // sint
-     v["mmis"] = (d["prefetch_metadata_misses"] +
--                 d["demand_metadata_misses"]) / sint
-+                 d["demand_metadata_misses"]) // sint
- 
-     v["mread"] = v["mhit"] + v["mmis"]
--    v["mh%"] = 100 * v["mhit"] / v["mread"] if v["mread"] > 0 else 0
-+    v["mh%"] = 100 * v["mhit"] // v["mread"] if v["mread"] > 0 else 0
-     v["mm%"] = 100 - v["mh%"] if v["mread"] > 0 else 0
- 
-     v["arcsz"] = cur["size"]
-     v["size"] = cur["size"]
-     v["c"] = cur["c"]
--    v["mfu"] = d["mfu_hits"] / sint
--    v["mru"] = d["mru_hits"] / sint
--    v["mrug"] = d["mru_ghost_hits"] / sint
--    v["mfug"] = d["mfu_ghost_hits"] / sint
--    v["eskip"] = d["evict_skip"] / sint
--    v["el2skip"] = d["evict_l2_skip"] / sint
--    v["el2cach"] = d["evict_l2_cached"] / sint
--    v["el2el"] = d["evict_l2_eligible"] / sint
--    v["el2mfu"] = d["evict_l2_eligible_mfu"] / sint
--    v["el2mru"] = d["evict_l2_eligible_mru"] / sint
--    v["el2inel"] = d["evict_l2_ineligible"] / sint
--    v["mtxmis"] = d["mutex_miss"] / sint
-+    v["mfu"] = d["mfu_hits"] // sint
-+    v["mru"] = d["mru_hits"] // sint
-+    v["mrug"] = d["mru_ghost_hits"] // sint
-+    v["mfug"] = d["mfu_ghost_hits"] // sint
-+    v["eskip"] = d["evict_skip"] // sint
-+    v["el2skip"] = d["evict_l2_skip"] // sint
-+    v["el2cach"] = d["evict_l2_cached"] // sint
-+    v["el2el"] = d["evict_l2_eligible"] // sint
-+    v["el2mfu"] = d["evict_l2_eligible_mfu"] // sint
-+    v["el2mru"] = d["evict_l2_eligible_mru"] // sint
-+    v["el2inel"] = d["evict_l2_ineligible"] // sint
-+    v["mtxmis"] = d["mutex_miss"] // sint
- 
-     if l2exist:
--        v["l2hits"] = d["l2_hits"] / sint
--        v["l2miss"] = d["l2_misses"] / sint
-+        v["l2hits"] = d["l2_hits"] // sint
-+        v["l2miss"] = d["l2_misses"] // sint
-         v["l2read"] = v["l2hits"] + v["l2miss"]
--        v["l2hit%"] = 100 * v["l2hits"] / v["l2read"] if v["l2read"] > 0 else 0
-+        v["l2hit%"] = 100 * v["l2hits"] // v["l2read"] if v["l2read"] > 0 else 0
- 
-         v["l2miss%"] = 100 - v["l2hit%"] if v["l2read"] > 0 else 0
-         v["l2asize"] = cur["l2_asize"]
-         v["l2size"] = cur["l2_size"]
--        v["l2bytes"] = d["l2_read_bytes"] / sint
-+        v["l2bytes"] = d["l2_read_bytes"] // sint
- 
-         v["l2pref"] = cur["l2_prefetch_asize"]
-         v["l2mfu"] = cur["l2_mfu_asize"]
-         v["l2mru"] = cur["l2_mru_asize"]
-         v["l2data"] = cur["l2_bufc_data_asize"]
-         v["l2meta"] = cur["l2_bufc_metadata_asize"]
--        v["l2pref%"] = 100 * v["l2pref"] / v["l2asize"]
--        v["l2mfu%"] = 100 * v["l2mfu"] / v["l2asize"]
--        v["l2mru%"] = 100 * v["l2mru"] / v["l2asize"]
--        v["l2data%"] = 100 * v["l2data"] / v["l2asize"]
--        v["l2meta%"] = 100 * v["l2meta"] / v["l2asize"]
-+        v["l2pref%"] = 100 * v["l2pref"] // v["l2asize"]
-+        v["l2mfu%"] = 100 * v["l2mfu"] // v["l2asize"]
-+        v["l2mru%"] = 100 * v["l2mru"] // v["l2asize"]
-+        v["l2data%"] = 100 * v["l2data"] // v["l2asize"]
-+        v["l2meta%"] = 100 * v["l2meta"] // v["l2asize"]
- 
-     v["grow"] = 0 if cur["arc_no_grow"] else 1
-     v["need"] = cur["arc_need_free"]

debian/patches/0011-arc-stat-summary-guard-access-to-l2arc-MFU-MRU-stats.patch

@@ -1,112 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Thomas Lamprecht <t.lamprecht@proxmox.com>
-Date: Wed, 10 Nov 2021 09:29:47 +0100
-Subject: [PATCH] arc stat/summary: guard access to l2arc MFU/MRU stats
-
-commit 085321621e79a75bea41c2b6511da6ebfbf2ba0a added printing MFU
-and MRU stats for 2.1 user space tools, but those keys are not
-available in the 2.0 module. That means it may break the arcstat and
-arc_summary tools after upgrade to 2.1 (user space), before a reboot
-to the new 2.1 ZFS kernel-module happened, due to python raising a
-KeyError on the dict access then.
-
-Move those two keys to a .get accessor with `0` as fallback, as it
-should be better to show some possible wrong data for new stat-keys
-than throwing an exception.
-
-Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
-
-also move l2_mfu_asize  l2_mru_asize l2_prefetch_asize
-l2_bufc_data_asize l2_bufc_metadata_asize to .get accessor
-(these are only present with a cache device in the pool)
-Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
----
- cmd/arc_summary/arc_summary3 | 28 ++++++++++++++--------------
- cmd/arcstat/arcstat.in       | 14 +++++++-------
- 2 files changed, 21 insertions(+), 21 deletions(-)
-
-diff --git a/cmd/arc_summary/arc_summary3 b/cmd/arc_summary/arc_summary3
-index 301c485b3..ac46f5843 100755
---- a/cmd/arc_summary/arc_summary3
-+++ b/cmd/arc_summary/arc_summary3
-@@ -617,13 +617,13 @@ def section_arc(kstats_dict):
-     prt_i1('L2 cached evictions:', f_bytes(arc_stats['evict_l2_cached']))
-     prt_i1('L2 eligible evictions:', f_bytes(arc_stats['evict_l2_eligible']))
-     prt_i2('L2 eligible MFU evictions:',
--           f_perc(arc_stats['evict_l2_eligible_mfu'],
-+           f_perc(arc_stats.get('evict_l2_eligible_mfu', 0), # 2.0 module compat
-            arc_stats['evict_l2_eligible']),
--           f_bytes(arc_stats['evict_l2_eligible_mfu']))
-+           f_bytes(arc_stats.get('evict_l2_eligible_mfu', 0)))
-     prt_i2('L2 eligible MRU evictions:',
--           f_perc(arc_stats['evict_l2_eligible_mru'],
-+           f_perc(arc_stats.get('evict_l2_eligible_mru', 0), # 2.0 module compat
-            arc_stats['evict_l2_eligible']),
--           f_bytes(arc_stats['evict_l2_eligible_mru']))
-+           f_bytes(arc_stats.get('evict_l2_eligible_mru', 0)))
-     prt_i1('L2 ineligible evictions:',
-            f_bytes(arc_stats['evict_l2_ineligible']))
-     print()
-@@ -765,20 +765,20 @@ def section_l2arc(kstats_dict):
-            f_perc(arc_stats['l2_hdr_size'], arc_stats['l2_size']),
-            f_bytes(arc_stats['l2_hdr_size']))
-     prt_i2('MFU allocated size:',
--           f_perc(arc_stats['l2_mfu_asize'], arc_stats['l2_asize']),
--           f_bytes(arc_stats['l2_mfu_asize']))
-+           f_perc(arc_stats.get('l2_mfu_asize', 0), arc_stats['l2_asize']),
-+           f_bytes(arc_stats.get('l2_mfu_asize', 0))) # 2.0 module compat
-     prt_i2('MRU allocated size:',
--           f_perc(arc_stats['l2_mru_asize'], arc_stats['l2_asize']),
--           f_bytes(arc_stats['l2_mru_asize']))
-+           f_perc(arc_stats.get('l2_mru_asize', 0), arc_stats['l2_asize']),
-+           f_bytes(arc_stats.get('l2_mru_asize', 0))) # 2.0 module compat
-     prt_i2('Prefetch allocated size:',
--           f_perc(arc_stats['l2_prefetch_asize'], arc_stats['l2_asize']),
--           f_bytes(arc_stats['l2_prefetch_asize']))
-+           f_perc(arc_stats.get('l2_prefetch_asize', 0), arc_stats['l2_asize']),
-+           f_bytes(arc_stats.get('l2_prefetch_asize',0))) # 2.0 module compat
-     prt_i2('Data (buffer content) allocated size:',
--           f_perc(arc_stats['l2_bufc_data_asize'], arc_stats['l2_asize']),
--           f_bytes(arc_stats['l2_bufc_data_asize']))
-+           f_perc(arc_stats.get('l2_bufc_data_asize', 0), arc_stats['l2_asize']),
-+           f_bytes(arc_stats.get('l2_bufc_data_asize', 0))) # 2.0 module compat
-     prt_i2('Metadata (buffer content) allocated size:',
--           f_perc(arc_stats['l2_bufc_metadata_asize'], arc_stats['l2_asize']),
--           f_bytes(arc_stats['l2_bufc_metadata_asize']))
-+           f_perc(arc_stats.get('l2_bufc_metadata_asize', 0), arc_stats['l2_asize']),
-+           f_bytes(arc_stats.get('l2_bufc_metadata_asize', 0))) # 2.0 module compat
- 
-     print()
-     prt_1('L2ARC breakdown:', f_hits(l2_access_total))
-diff --git a/cmd/arcstat/arcstat.in b/cmd/arcstat/arcstat.in
-index 010f69ec0..50e5a7150 100755
---- a/cmd/arcstat/arcstat.in
-+++ b/cmd/arcstat/arcstat.in
-@@ -482,8 +482,8 @@ def calculate():
-     v["el2skip"] = d["evict_l2_skip"] // sint
-     v["el2cach"] = d["evict_l2_cached"] // sint
-     v["el2el"] = d["evict_l2_eligible"] // sint
--    v["el2mfu"] = d["evict_l2_eligible_mfu"] // sint
--    v["el2mru"] = d["evict_l2_eligible_mru"] // sint
-+    v["el2mfu"] = d.get("evict_l2_eligible_mfu", 0) // sint
-+    v["el2mru"] = d.get("evict_l2_eligible_mru", 0) // sint
-     v["el2inel"] = d["evict_l2_ineligible"] // sint
-     v["mtxmis"] = d["mutex_miss"] // sint
- 
-@@ -498,11 +498,11 @@ def calculate():
-         v["l2size"] = cur["l2_size"]
-         v["l2bytes"] = d["l2_read_bytes"] // sint
- 
--        v["l2pref"] = cur["l2_prefetch_asize"]
--        v["l2mfu"] = cur["l2_mfu_asize"]
--        v["l2mru"] = cur["l2_mru_asize"]
--        v["l2data"] = cur["l2_bufc_data_asize"]
--        v["l2meta"] = cur["l2_bufc_metadata_asize"]
-+        v["l2pref"] = cur.get("l2_prefetch_asize", 0)
-+        v["l2mfu"] = cur.get("l2_mfu_asize", 0)
-+        v["l2mru"] = cur.get("l2_mru_asize", 0)
-+        v["l2data"] = cur.get("l2_bufc_data_asize", 0)
-+        v["l2meta"] = cur.get("l2_bufc_metadata_asize", 0)
-         v["l2pref%"] = 100 * v["l2pref"] // v["l2asize"]
-         v["l2mfu%"] = 100 * v["l2mfu"] // v["l2asize"]
-         v["l2mru%"] = 100 * v["l2mru"] // v["l2asize"]

debian/patches/0012-linux-6.3-compat-add-another-bdev_io_acct-case.patch

@@ -1,195 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Rich Ercolani <214141+rincebrain@users.noreply.github.com>
-Date: Mon, 27 Mar 2023 14:29:19 -0400
-Subject: [PATCH] linux 6.3 compat: add another bdev_io_acct case
-
-Linux 6.3+, and backports from it (6.2.8+), changed the
-signatures on bdev_io_{start,end}_acct.  Add a case for it.
-
-Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Signed-off-by: Rich Ercolani <rincebrain@gmail.com>
-Closes #14658
-Closes #14668
-(cherry picked from commit 59f187563937aa0d6c74a9854eb1cab6632866f9)
-Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
----
- config/kernel-generic_io_acct.m4              | 98 ++++++++++++-------
- include/os/linux/kernel/linux/blkdev_compat.h | 10 +-
- 2 files changed, 69 insertions(+), 39 deletions(-)
-
-diff --git a/config/kernel-generic_io_acct.m4 b/config/kernel-generic_io_acct.m4
-index a8a448c6f..a6a109004 100644
---- a/config/kernel-generic_io_acct.m4
-+++ b/config/kernel-generic_io_acct.m4
-@@ -2,7 +2,20 @@ dnl #
- dnl # Check for generic io accounting interface.
- dnl #
- AC_DEFUN([ZFS_AC_KERNEL_SRC_GENERIC_IO_ACCT], [
--	ZFS_LINUX_TEST_SRC([bdev_io_acct], [
-+	ZFS_LINUX_TEST_SRC([bdev_io_acct_63], [
-+		#include <linux/blkdev.h>
-+	], [
-+		struct block_device *bdev = NULL;
-+		struct bio *bio = NULL;
-+		unsigned long passed_time = 0;
-+		unsigned long start_time;
-+
-+		start_time = bdev_start_io_acct(bdev, bio_op(bio),
-+		    passed_time);
-+		bdev_end_io_acct(bdev, bio_op(bio), bio_sectors(bio), start_time);
-+	])
-+
-+	ZFS_LINUX_TEST_SRC([bdev_io_acct_old], [
- 		#include <linux/blkdev.h>
- 	], [
- 		struct block_device *bdev = NULL;
-@@ -63,74 +76,85 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_GENERIC_IO_ACCT], [
- 
- AC_DEFUN([ZFS_AC_KERNEL_GENERIC_IO_ACCT], [
- 	dnl #
--	dnl # 5.19 API,
-+	dnl # Linux 6.3, and then backports thereof, changed
-+	dnl # the signatures on bdev_start_io_acct/bdev_end_io_acct
- 	dnl #
--	dnl # disk_start_io_acct() and disk_end_io_acct() have been replaced by
--	dnl # bdev_start_io_acct() and bdev_end_io_acct().
--	dnl #
--	AC_MSG_CHECKING([whether generic bdev_*_io_acct() are available])
--	ZFS_LINUX_TEST_RESULT([bdev_io_acct], [
-+	AC_MSG_CHECKING([whether 6.3+ bdev_*_io_acct() are available])
-+	ZFS_LINUX_TEST_RESULT([bdev_io_acct_63], [
- 		AC_MSG_RESULT(yes)
--		AC_DEFINE(HAVE_BDEV_IO_ACCT, 1, [bdev_*_io_acct() available])
-+		AC_DEFINE(HAVE_BDEV_IO_ACCT_63, 1, [bdev_*_io_acct() available])
- 	], [
- 		AC_MSG_RESULT(no)
- 
- 		dnl #
--		dnl # 5.12 API,
-+		dnl # 5.19 API,
- 		dnl #
--		dnl # bio_start_io_acct() and bio_end_io_acct() became GPL-exported
--		dnl # so use disk_start_io_acct() and disk_end_io_acct() instead
-+		dnl # disk_start_io_acct() and disk_end_io_acct() have been replaced by
-+		dnl # bdev_start_io_acct() and bdev_end_io_acct().
- 		dnl #
--		AC_MSG_CHECKING([whether generic disk_*_io_acct() are available])
--		ZFS_LINUX_TEST_RESULT([disk_io_acct], [
-+		AC_MSG_CHECKING([whether pre-6.3 bdev_*_io_acct() are available])
-+		ZFS_LINUX_TEST_RESULT([bdev_io_acct_old], [
- 			AC_MSG_RESULT(yes)
--			AC_DEFINE(HAVE_DISK_IO_ACCT, 1, [disk_*_io_acct() available])
-+			AC_DEFINE(HAVE_BDEV_IO_ACCT_OLD, 1, [bdev_*_io_acct() available])
- 		], [
- 			AC_MSG_RESULT(no)
--
- 			dnl #
--			dnl # 5.7 API,
-+			dnl # 5.12 API,
- 			dnl #
--			dnl # Added bio_start_io_acct() and bio_end_io_acct() helpers.
-+			dnl # bio_start_io_acct() and bio_end_io_acct() became GPL-exported
-+			dnl # so use disk_start_io_acct() and disk_end_io_acct() instead
- 			dnl #
--			AC_MSG_CHECKING([whether generic bio_*_io_acct() are available])
--			ZFS_LINUX_TEST_RESULT([bio_io_acct], [
-+			AC_MSG_CHECKING([whether generic disk_*_io_acct() are available])
-+			ZFS_LINUX_TEST_RESULT([disk_io_acct], [
- 				AC_MSG_RESULT(yes)
--				AC_DEFINE(HAVE_BIO_IO_ACCT, 1, [bio_*_io_acct() available])
-+				AC_DEFINE(HAVE_DISK_IO_ACCT, 1, [disk_*_io_acct() available])
- 			], [
- 				AC_MSG_RESULT(no)
- 
- 				dnl #
--				dnl # 4.14 API,
-+				dnl # 5.7 API,
- 				dnl #
--				dnl # generic_start_io_acct/generic_end_io_acct now require
--				dnl # request_queue to be provided. No functional changes,
--				dnl # but preparation for inflight accounting.
-+				dnl # Added bio_start_io_acct() and bio_end_io_acct() helpers.
- 				dnl #
--				AC_MSG_CHECKING([whether generic_*_io_acct wants 4 args])
--				ZFS_LINUX_TEST_RESULT_SYMBOL([generic_acct_4args],
--				    [generic_start_io_acct], [block/bio.c], [
-+				AC_MSG_CHECKING([whether generic bio_*_io_acct() are available])
-+				ZFS_LINUX_TEST_RESULT([bio_io_acct], [
- 					AC_MSG_RESULT(yes)
--					AC_DEFINE(HAVE_GENERIC_IO_ACCT_4ARG, 1,
--					    [generic_*_io_acct() 4 arg available])
-+					AC_DEFINE(HAVE_BIO_IO_ACCT, 1, [bio_*_io_acct() available])
- 				], [
- 					AC_MSG_RESULT(no)
- 
- 					dnl #
--					dnl # 3.19 API addition
-+					dnl # 4.14 API,
- 					dnl #
--					dnl # torvalds/linux@394ffa50 allows us to increment
--					dnl # iostat counters without generic_make_request().
-+					dnl # generic_start_io_acct/generic_end_io_acct now require
-+					dnl # request_queue to be provided. No functional changes,
-+					dnl # but preparation for inflight accounting.
- 					dnl #
--					AC_MSG_CHECKING(
--					    [whether generic_*_io_acct wants 3 args])
--					ZFS_LINUX_TEST_RESULT_SYMBOL([generic_acct_3args],
-+					AC_MSG_CHECKING([whether generic_*_io_acct wants 4 args])
-+					ZFS_LINUX_TEST_RESULT_SYMBOL([generic_acct_4args],
- 					    [generic_start_io_acct], [block/bio.c], [
- 						AC_MSG_RESULT(yes)
--						AC_DEFINE(HAVE_GENERIC_IO_ACCT_3ARG, 1,
--						    [generic_*_io_acct() 3 arg available])
-+						AC_DEFINE(HAVE_GENERIC_IO_ACCT_4ARG, 1,
-+						    [generic_*_io_acct() 4 arg available])
- 					], [
- 						AC_MSG_RESULT(no)
-+
-+						dnl #
-+						dnl # 3.19 API addition
-+						dnl #
-+						dnl # torvalds/linux@394ffa50 allows us to increment
-+						dnl # iostat counters without generic_make_request().
-+						dnl #
-+						AC_MSG_CHECKING(
-+						    [whether generic_*_io_acct wants 3 args])
-+						ZFS_LINUX_TEST_RESULT_SYMBOL([generic_acct_3args],
-+						    [generic_start_io_acct], [block/bio.c], [
-+							AC_MSG_RESULT(yes)
-+							AC_DEFINE(HAVE_GENERIC_IO_ACCT_3ARG, 1,
-+							    [generic_*_io_acct() 3 arg available])
-+						], [
-+							AC_MSG_RESULT(no)
-+						])
- 					])
- 				])
- 			])
-diff --git a/include/os/linux/kernel/linux/blkdev_compat.h b/include/os/linux/kernel/linux/blkdev_compat.h
-index bac5c2279..3a3f264d7 100644
---- a/include/os/linux/kernel/linux/blkdev_compat.h
-+++ b/include/os/linux/kernel/linux/blkdev_compat.h
-@@ -555,7 +555,10 @@ blk_generic_start_io_acct(struct request_queue *q __attribute__((unused)),
-     struct gendisk *disk __attribute__((unused)),
-     int rw __attribute__((unused)), struct bio *bio)
- {
--#if defined(HAVE_BDEV_IO_ACCT)
-+#if defined(HAVE_BDEV_IO_ACCT_63)
-+	return (bdev_start_io_acct(bio->bi_bdev, bio_op(bio),
-+	    jiffies));
-+#elif defined(HAVE_BDEV_IO_ACCT_OLD)
- 	return (bdev_start_io_acct(bio->bi_bdev, bio_sectors(bio),
- 	    bio_op(bio), jiffies));
- #elif defined(HAVE_DISK_IO_ACCT)
-@@ -581,7 +584,10 @@ blk_generic_end_io_acct(struct request_queue *q __attribute__((unused)),
-     struct gendisk *disk __attribute__((unused)),
-     int rw __attribute__((unused)), struct bio *bio, unsigned long start_time)
- {
--#if defined(HAVE_BDEV_IO_ACCT)
-+#if defined(HAVE_BDEV_IO_ACCT_63)
-+	bdev_end_io_acct(bio->bi_bdev, bio_op(bio), bio_sectors(bio),
-+	    start_time);
-+#elif defined(HAVE_BDEV_IO_ACCT_OLD)
- 	bdev_end_io_acct(bio->bi_bdev, bio_op(bio), start_time);
- #elif defined(HAVE_DISK_IO_ACCT)
- 	disk_end_io_acct(disk, bio_op(bio), start_time);

debian/patches/series

@@ -7,6 +7,3 @@
 0007-Use-installed-python3.patch
 0008-Add-systemd-unit-for-importing-specific-pools.patch
 0009-Patch-move-manpage-arcstat-1-to-arcstat-8.patch
-0010-arcstat-Fix-integer-division-with-python3.patch
-0011-arc-stat-summary-guard-access-to-l2arc-MFU-MRU-stats.patch
-0012-linux-6.3-compat-add-another-bdev_io_acct-case.patch

debian/tree/zfsutils-linux/usr/lib/zfs-linux/trim

@@ -1,4 +1,4 @@
-#!/bin/sh -u
+#!/bin/sh -eu
 
 # directly exit successfully when zfs module is not loaded
 if ! [ -d /sys/module/zfs ]; then
@@ -14,56 +14,47 @@ get_property () {
 	# since they're not available on pools https://github.com/openzfs/zfs/pull/11680
 	# TODO: use zpool user-defined property when such feature is available.
 	pool="$1"
-	zfs get -H -o value "${PROPERTY_NAME}" "${pool}" 2>/dev/null
+	zfs get -H -o value "${PROPERTY_NAME}" "${pool}" 2>/dev/null || return 1
 }
 
 trim_if_not_already_trimming () {
 	pool="$1"
 	if ! zpool status "${pool}" | grep -q "trimming"; then
-		# This will error on HDD-only pools: doesn't matter
+		# Ignore errors (i.e. HDD pools),
-		zpool trim "${pool}"
+		# and continue with trimming other pools.
+		zpool trim "${pool}" || true
 	fi
 }
 
-# Walk up the kernel parent names:
+zpool_is_nvme_only () {
-# this will catch devices from LVM &a.
+	zpool=$1
-get_transp () {
+	# get a list of devices attached to the specified zpool
-	dev="$1"
+	zpool list -vHPL "${zpool}" |
-	while pd="$(lsblk -dnr -o PKNAME "$dev")"; do
+		awk -F'\t' '$2 ~ /^\/dev\// {
-		if [ -z "$pd" ]; then
+			if($2 !~ /^\/dev\/nvme/)
-			break
+				exit 1
-		else
+		}'
-			dev="/dev/$pd"
-		fi
-	done
-	lsblk -dnr -o TRAN "$dev"
-}
-
-pool_is_nvme_only () {
-	pool="$1"
-	# get a list of devices attached to the specified pool
-	zpool list -vHP "${pool}" | \
-		awk -F'\t' '$2 ~ "^/dev/" {print $2}' | \
-	while read -r dev
-	do
-		[ "$(get_transp "$dev")" = "nvme" ] || return
-	done
 }
 
 # TRIM all healthy pools that are not already trimming as per their configs.
 zpool list -H -o health,name 2>&1 | \
 	awk -F'\t' '$1 == "ONLINE" {print $2}' | \
-while read -r pool
+while read pool
 do
 	# read user-defined config
-	ret=$(get_property "${pool}") || continue
+	ret=$(get_property "${pool}")
-	case "${ret}" in
+	if [ $? -ne 0 ] || [ "disable" = "${ret}" ]; then
-		disable);;
+		:
-		enable)	trim_if_not_already_trimming "${pool}" ;;
+	elif [ "enable" = "${ret}" ]; then
-		-|auto)	pool_is_nvme_only "${pool}" && trim_if_not_already_trimming "${pool}" ;;
+		trim_if_not_already_trimming "${pool}"
-		*)	cat > /dev/stderr <<EOF
+	elif [ "-" = "${ret}" ] || [ "auto" = "${ret}" ]; then
+		if zpool_is_nvme_only "${pool}"; then
+			trim_if_not_already_trimming "${pool}"
+		fi
+	else
+		cat > /dev/stderr <<EOF
 $0: [WARNING] illegal value "${ret}" for property "${PROPERTY_NAME}" of ZFS dataset "${pool}".
 $0: Acceptable choices for this property are: auto, enable, disable. The default is auto.
 EOF
-	esac
+	fi
 done

debian/zfs-dracut.install

@@ -1,2 +0,0 @@
-usr/lib/dracut
-usr/share/man/man7/dracut.zfs.7

debian/zfs-initramfs.lintian-overrides

@@ -1 +0,0 @@
-executable-not-elf-or-script *usr/share/initramfs-tools/scripts/zfs*

debian/zfs-test.lintian-overrides

@@ -1,13 +1,13 @@
 arch-dependent-file-in-usr-share
+script-not-executable usr/share/zfs/common.sh
 command-in-sbin-has-manpage-in-incorrect-section
 arch-dep-package-has-big-usr-share
 manpage-without-executable
-national-encoding *usr/share/zfs/zfs-tests/tests/functional/channel_program/lua_core/tst.lib_table.lua*
+national-encoding usr/share/zfs/zfs-tests/tests/functional/channel_program/lua_core/tst.lib_table.lua
-executable-not-elf-or-script *usr/share/zfs/zfs-tests/tests/functional/cli_root/zfs_jail/jail.conf*
+executable-not-elf-or-script usr/share/zfs/zfs-tests/tests/functional/cli_root/zfs_jail/jail.conf
-package-contains-documentation-outside-usr-share-doc *usr/share/zfs/zfs-tests/*
+script-not-executable usr/share/zfs/zfs-tests/include/default.cfg
-script-not-executable *usr/share/zfs/common.sh*
+script-not-executable usr/share/zfs/zfs-tests/tests/functional/cli_root/zfs_wait/zfs_wait.kshlib
-script-not-executable *usr/share/zfs/zfs-tests/include/default.cfg*
+script-not-executable usr/share/zfs/zfs-tests/tests/functional/cli_root/zpool_wait/zpool_wait.kshlib
-script-not-executable *usr/share/zfs/zfs-tests/tests/functional/cli_root/zfs_wait/zfs_wait.kshlib*
+script-not-executable usr/share/zfs/zfs-tests/tests/functional/persist_l2arc/persist_l2arc.cfg
-script-not-executable *usr/share/zfs/zfs-tests/tests/functional/cli_root/zpool_wait/zpool_wait.kshlib*
+script-not-executable usr/share/zfs/zfs-tests/tests/functional/redacted_send/redacted.kshlib
-script-not-executable *usr/share/zfs/zfs-tests/tests/functional/l2arc/l2arc.cfg*
+package-contains-documentation-outside-usr-share-doc usr/share/zfs/zfs-tests/*
-script-not-executable *usr/share/zfs/zfs-tests/tests/functional/redacted_send/redacted.kshlib*

debian/zfsutils-linux.install

@@ -8,11 +8,7 @@ lib/systemd/system/zfs-import-scan.service
 lib/systemd/system/zfs-import@.service
 lib/systemd/system/zfs-import.target
 lib/systemd/system/zfs-import.service
-lib/systemd/system/zfs-load-key.service
 lib/systemd/system/zfs-mount.service
-lib/systemd/system/zfs-scrub-monthly@.timer
-lib/systemd/system/zfs-scrub-weekly@.timer
-lib/systemd/system/zfs-scrub@.service
 lib/systemd/system/zfs-share.service
 lib/systemd/system/zfs-volume-wait.service
 lib/systemd/system/zfs-volumes.target
@@ -32,7 +28,6 @@ sbin/zstreamdump
 usr/bin/zvol_wait
 usr/lib/modules-load.d/ lib/
 usr/lib/zfs-linux/zpool.d/
-usr/lib/zfs-linux/zpool_influxdb
 usr/sbin/arc_summary
 usr/sbin/arcstat
 usr/sbin/dbufstat
@@ -40,14 +35,7 @@ usr/share/bash-completion/completions
 usr/share/man/man8/arcstat.8
 usr/share/man/man1/zhack.1
 usr/share/man/man1/zvol_wait.1
-usr/share/man/man4/zfs.4
-usr/share/man/man4/spl.4
 usr/share/man/man5/
-usr/share/man/man7/zfsconcepts.7
-usr/share/man/man7/zfsprops.7
-usr/share/man/man7/zpoolconcepts.7
-usr/share/man/man7/zpoolprops.7
-usr/share/man/man7/zpool-features.7
 usr/share/man/man8/fsck.zfs.8
 usr/share/man/man8/mount.zfs.8
 usr/share/man/man8/vdev_id.8
@@ -91,6 +79,8 @@ usr/share/man/man8/zfs-userspace.8
 usr/share/man/man8/zfs-wait.8
 usr/share/man/man8/zfs.8
 usr/share/man/man8/zfs_ids_to_path.8
+usr/share/man/man8/zfsconcepts.8
+usr/share/man/man8/zfsprops.8
 usr/share/man/man8/zgenhostid.8
 usr/share/man/man8/zpool-add.8
 usr/share/man/man8/zpool-attach.8
@@ -104,7 +94,6 @@ usr/share/man/man8/zpool-export.8
 usr/share/man/man8/zpool-get.8
 usr/share/man/man8/zpool-history.8
 usr/share/man/man8/zpool-import.8
-usr/share/man/man8/zpool_influxdb.8
 usr/share/man/man8/zpool-initialize.8
 usr/share/man/man8/zpool-iostat.8
 usr/share/man/man8/zpool-labelclear.8
@@ -125,6 +114,7 @@ usr/share/man/man8/zpool-trim.8
 usr/share/man/man8/zpool-upgrade.8
 usr/share/man/man8/zpool-wait.8
 usr/share/man/man8/zpool.8
+usr/share/man/man8/zpoolconcepts.8
+usr/share/man/man8/zpoolprops.8
 usr/share/man/man8/zstream.8
 usr/share/man/man8/zstreamdump.8
-usr/share/zfs/compatibility.d/

debian/zfsutils-linux.links

@@ -1,3 +0,0 @@
-sbin/zfs      bin/zfs
-sbin/zpool    bin/zpool
-usr/lib/zfs-linux/zpool_influxdb  bin/zpool_influxdb

debian/zfsutils-linux.lintian-overrides

@@ -1,13 +1,14 @@
 spare-manual-page
 systemd-service-file-refers-to-unusual-wantedby-target
-binary-without-manpage *usr/sbin/dbufstat*
+binary-without-manpage usr/sbin/dbufstat
-binary-without-manpage *usr/sbin/arc_summary*
+binary-without-manpage usr/sbin/arc_summary
 manpage-has-errors-from-man
 appstream-metadata-missing-modalias-provide
 command-in-sbin-has-manpage-in-incorrect-section
-package-supports-alternative-init-but-no-init.d-script *lib/systemd/system/zfs-import-cache.service*
+package-supports-alternative-init-but-no-init.d-script lib/systemd/system/zfs-import-cache.service
-package-supports-alternative-init-but-no-init.d-script *lib/systemd/system/zfs-import-scan.service*
+package-supports-alternative-init-but-no-init.d-script lib/systemd/system/zfs-import-scan.service
 spelling-error-in-manpage
-package-supports-alternative-init-but-no-init.d-script *lib/systemd/system/zfs-volume-wait.service*
+package-supports-alternative-init-but-no-init.d-script lib/systemd/system/zfs-volume-wait.service
-systemd-service-file-missing-documentation-key *lib/systemd/system/zfs-volume-wait.service*
+systemd-service-file-missing-documentation-key lib/systemd/system/zfs-volume-wait.service
-extra-license-file *usr/share/doc/zfsutils-linux/LICENSE.gz*
+extra-license-file usr/share/doc/zfsutils-linux/LICENSE.gz
+package-supports-alternative-init-but-no-init.d-script lib/systemd/system/zfs-load-module.service