bump version to 2.1.15-pve1

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

.gitignore

@@ -0,0 +1,7 @@
+/*.build
+/*.buildinfo
+/*.changes
+/*.deb
+/*.dsc
+/*.tar*
+/zfs-utils-*.*/

Makefile

@@ -1,72 +1,93 @@
+include /usr/share/dpkg/default.mk
 # source form https://github.com/zfsonlinux/
 
-ZFSPKG=debian
-ZFSVER != dpkg-parsechangelog -l ${ZFSPKG}/changelog -Sversion | cut -d- -f1
-ZFSPKGVER != dpkg-parsechangelog -l ${ZFSPKG}/changelog -Sversion
-ZFSDIR=zfs-linux_${ZFSVER}
-ZFSSRC=upstream
+PACKAGE = zfs-linux
 
-ZFS_DEB1= libnvpair1linux_${ZFSPKGVER}_amd64.deb
-ZFS_DEB2= 					\
-libuutil1linux_${ZFSPKGVER}_amd64.deb		\
-libzfs2linux_${ZFSPKGVER}_amd64.deb		\
-libzfslinux-dev_${ZFSPKGVER}_amd64.deb		\
-libzpool2linux_${ZFSPKGVER}_amd64.deb		\
-zfs-dbg_${ZFSPKGVER}_amd64.deb			\
-zfs-zed_${ZFSPKGVER}_amd64.deb			\
-zfs-initramfs_${ZFSPKGVER}_all.deb		\
-zfs-test_${ZFSPKGVER}_amd64.deb		\
-zfsutils-linux_${ZFSPKGVER}_amd64.deb
-ZFS_DEBS= $(ZFS_DEB1) $(ZFS_DEB2)
-ZFS_DSC = zfs-linux_${ZFSPKGVER}.dsc
+SRCDIR = upstream
+BUILDDIR ?= $(PACKAGE)-$(DEB_VERSION_UPSTREAM)
+ORIG_SRC_TAR = $(PACKAGE)_$(DEB_VERSION_UPSTREAM).orig.tar.gz
+
+ZFS_DEB1= libnvpair3linux_$(DEB_VERSION)_amd64.deb
+
+ZFS_DEB_BINARY =				\
+libpam-zfs_$(DEB_VERSION)_amd64.deb		\
+libuutil3linux_$(DEB_VERSION)_amd64.deb		\
+libzfs4linux_$(DEB_VERSION)_amd64.deb		\
+libzfsbootenv1linux_$(DEB_VERSION)_amd64.deb	\
+libzpool5linux_$(DEB_VERSION)_amd64.deb		\
+zfs-test_$(DEB_VERSION)_amd64.deb			\
+zfsutils-linux_$(DEB_VERSION)_amd64.deb		\
+zfs-zed_$(DEB_VERSION)_amd64.deb
+
+ZFS_DBG_DEBS = $(patsubst %_$(DEB_VERSION)_amd64.deb, %-dbgsym_$(DEB_VERSION)_amd64.deb, $(ZFS_DEB1) $(ZFS_DEB_BINARY))
+
+ZFS_DEB2= $(ZFS_DEB_BINARY)			\
+libzfslinux-dev_$(DEB_VERSION)_amd64.deb		\
+python3-pyzfs_$(DEB_VERSION)_amd64.deb		\
+pyzfs-doc_$(DEB_VERSION)_all.deb			\
+spl_$(DEB_VERSION)_all.deb			\
+zfs-initramfs_$(DEB_VERSION)_all.deb
+DEBS= $(ZFS_DEB1) $(ZFS_DEB2) $(ZFS_DBG_DEBS)
+
+ZFS_DSC = zfs-linux_$(DEB_VERSION).dsc
 
 all: deb
-.PHONY: deb
-deb: ${ZFS_DEBS}
-.PHONY: dsc
-dsc: ${ZFS_DSC}
+
+.PHONY: deb dsc
+deb: $(DEBS)
+
+dsc:
+	rm -rf *.dsc $(BUILDDIR)
+	$(MAKE) $(ZFS_DSC)
+	lintian $(ZFS_DSC)
 
 # called from pve-kernel's Makefile to get patched sources
 .PHONY: kernel
-kernel: dsc
-	dpkg-source -x ${ZFS_DSC} ../pkg-zfs
+kernel: $(ZFS_DSC)
+	dpkg-source -x $(ZFS_DSC) ../pkg-zfs
 	$(MAKE) -C ../pkg-zfs -f debian/rules adapt_meta_file
 
 .PHONY: dinstall
-dinstall: ${DEBS}
-	dpkg -i ${DEBS}
+dinstall: $(DEBS)
+	dpkg -i $(DEBS)
 
 .PHONY: submodule
 submodule:
-	test -f "$(ZFSSRC)/README.md" || git submodule update --init
-$(ZFSSRC)/README.md: submodule
+	test -f "$(SRCDIR)/README.md" || git submodule update --init
+
+$(SRCDIR)/README.md: submodule
 
 .PHONY: zfs
-zfs: $(ZFS_DEBS)
-$(ZFS_DEB2): $(ZFS_DEB1)
-$(ZFS_DEB1): ${ZFSDIR}
-	cd ${ZFSDIR}; dpkg-buildpackage -b -uc -us
-	lintian ${ZFS_DEBS}
+zfs: $(DEBS)
+$(ZFS_DEB2) $(ZFS_DBG_DEBS): $(ZFS_DEB1)
+$(ZFS_DEB1): $(BUILDDIR)
+	cd $(BUILDDIR); dpkg-buildpackage -b -uc -us
+	lintian $(DEBS)
 
-${ZFS_DSC}: ${ZFSDIR}
-	tar czf zfs-linux_${ZFSVER}.orig.tar.gz ${ZFSDIR}
-	cd ${ZFSDIR}; dpkg-buildpackage -S -uc -us -d
-	lintian $@
+$(ORIG_SRC_TAR): $(BUILDDIR)
+	tar czf $(ORIG_SRC_TAR) --exclude="$(BUILDDIR)/debian" $(BUILDDIR)
 
-${ZFSDIR}: $(ZFSSRC)/README.md $(ZFSSRC) ${ZFSPKG}
-	rm -rf ${ZFSDIR}
-	mkdir ${ZFSDIR}
-	cp -a ${ZFSSRC}/* ${ZFSDIR}/
-	cp -a ${ZFSPKG} ${ZFSDIR}/debian
+$(ZFS_DSC): $(BUILDDIR) $(ORIG_SRC_TAR)
+	cd $(BUILDDIR); dpkg-buildpackage -S -uc -us -d
 
+sbuild: $(ZFS_DSC)
+	sbuild $(ZFS_DSC)
+
+$(BUILDDIR): $(SRCDIR)/README.md $(SRCDIR) debian
+	rm -rf $@ $@.tmp
+	cp -a $(SRCDIR) $@.tmp
+	cp -a debian $@.tmp/debian
+	mv $@.tmp $@
 
 .PHONY: clean
 clean: 	
-	rm -rf *~ *.deb *.changes *.buildinfo *.dsc *.orig.tar.* *.debian.tar.* ${ZFSDIR}
+	rm -rf $(PACKAGE)-[0-9]*/
+	rm -f *~ *.deb *.changes *.buildinfo *.build *.dsc *.orig.tar.* *.debian.tar.*
 
 .PHONY: distclean
 distclean: clean
 
 .PHONY: upload
-upload: ${DEBS}
-	tar -cf - ${DEBS} | ssh repoman@repo.proxmox.com -- upload --product pve,pmg --dist buster --arch amd64
+upload: UPLOAD_DIST ?= $(DEB_DISTRIBUTION)
+upload: $(DEBS)
+	tar -cf - $(DEBS) | ssh repoman@repo.proxmox.com -- upload --product pve,pmg,pbs --dist $(UPLOAD_DIST) --arch $(DEB_HOST_ARCH)

debian/changelog

@@ -1,3 +1,200 @@
+zfs-linux (2.1.15-pve1) bullseye; urgency=medium
+
+  * update ZFS to 2.1.15
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 29 Mar 2024 15:18:31 +0100
+
+zfs-linux (2.1.14-pve1) bullseye; urgency=medium
+
+  * update ZFS to 2.1.14
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 01 Dec 2023 13:47:16 +0100
+
+zfs-linux (2.1.13-pve1) bookworm; urgency=medium
+
+  * update ZFS to 2.1.13
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 28 Sep 2023 12:22:28 +0200
+
+zfs-linux (2.1.12-pve1) bookworm; urgency=medium
+
+  * update ZFS to 2.1.12
+
+  * zfs trim: avoid exit-failure if last pool isn't nvme-only
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 13 Jun 2023 15:25:16 +0200
+
+zfs-linux (2.1.11-pve2) bookworm; urgency=medium
+
+  * re-build for Debian 12 Bookworm based releases
+
+ -- Proxmox Support Team <support@proxmox.com>  Sat, 20 May 2023 19:32:04 +0200
+
+zfs-linux (2.1.11-pve1) bullseye; urgency=medium
+
+  * update ZFS to 2.1.11
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 20 Apr 2023 09:30:53 +0200
+
+zfs-linux (2.1.9-pve1) bullseye; urgency=medium
+
+  * update ZFS to 2.1.9
+
+ -- Proxmox Support Team <support@proxmox.com>  Sat, 28 Jan 2023 15:03:22 +0100
+
+zfs-linux (2.1.7-pve3) bullseye; urgency=medium
+
+  * backport a fix for as potentially hanging pipe when resizing it on recv
+
+  * backport a fix for setting extended attributes (xattr)
+
+  * adapt to 6.1 changes for open syscall with TMPFILE option
+
+ -- Proxmox Support Team <support@proxmox.com>  Sat, 07 Jan 2023 13:21:57 +0100
+
+zfs-linux (2.1.7-pve2) bullseye; urgency=medium
+
+  * 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
+
+  * update ZFS to 2.0.5
+
+  * do not restart most services upon upgrade
+
+  * add a script and cronjob for regular trimming of pools
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 09 Jul 2021 18:23:58 +0200
+
+zfs-linux (2.0.4-pve1) pve pmg; urgency=medium
+
+  * update ZFS to 2.0.4
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 18 Mar 2021 13:31:18 +0100
+
+zfs-linux (2.0.3-pve2) pve pmg; urgency=medium
+
+  * match package names to the ones used by Debian
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 25 Feb 2021 13:06:07 +0100
+
+zfs-linux (2.0.3-pve1) pve pmg; urgency=medium
+
+  * buildsys: make libpam-zfs a separate package
+
+  * update ZFS to 2.0.3
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 15 Feb 2021 15:46:03 +0100
+
+zfs-linux (2.0.2-pve1) pve pmg; urgency=medium
+
+  * update ZFS to 2.0.2
+
+ -- Proxmox Support Team <support@proxmox.com>  Sat, 06 Feb 2021 10:23:03 +0100
+
+zfs-linux (2.0.1-pve1) pve pmg; urgency=medium
+
+  * update ZFS to 2.0.1
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 13 Jan 2021 14:16:02 +0100
+
+zfs-linux (0.8.5-pve1) pve pmg; urgency=medium
+
+  * update ZFS to 0.8.5
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 08 Oct 2020 10:45:28 +0200
+
+zfs-linux (0.8.4-pve2) pve pmg; urgency=medium
+
+  * add systemd-unit for importing specific pools
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 29 Sep 2020 05:31:35 +0200
+
+zfs-linux (0.8.4-pve1) pve pmg; urgency=medium
+
+  * update ZFS to 0.8.4
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 14 May 2020 10:39:11 +0200
+
+zfs-linux (0.8.3-pve1) pve pmg; urgency=medium
+
+  * update ZFS to 0.8.3
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 24 Jan 2020 09:10:41 +0100
+
+zfs-linux (0.8.2-pve2) pve pmg; urgency=medium
+
+  * save and restore the FPU state using ZFS dedicated per-cpu FPU state
+    variables.
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 23 Oct 2019 17:14:22 +0200
+
+zfs-linux (0.8.2-pve1) pve pmg; urgency=medium
+
+  * update to new 0.8.2 upstream stable release
+
+ -- Proxmox Support Team <support@proxmox.com>  Sat, 28 Sep 2019 08:34:53 +0200
+
 zfs-linux (0.8.1-pve3) pve pmg; urgency=medium
 
   * [SIMD]: FPU register save/restore is also required on 5.0 kernel.

debian/compat

@@ -1 +0,0 @@
-10

debian/control

@@ -2,11 +2,17 @@ Source: zfs-linux
 Section: contrib/kernel
 Priority: optional
 Maintainer: Proxmox Support Team <support@proxmox.com>
-Build-Depends: debhelper (>= 10~),
+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,
@@ -14,28 +20,40 @@ Build-Depends: debhelper (>= 10~),
                python3-all-dev,
                uuid-dev,
                zlib1g-dev
-Standards-Version: 4.1.2
+Standards-Version: 4.5.1
 Homepage: https://www.zfsonlinux.org/
 Vcs-Git: https://git.proxmox.com/git/zfsonlinux.git
 Vcs-Browser: https://git.proxmox.com/?p=zfsonlinux.git;a=summary
 
-Package: libnvpair1linux
+Package: libnvpair3linux
 Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libnvpair1
-Replaces: libnvpair1
+Breaks: libnvpair1, libnvpair1linux, libnvpair2linux, libnvpair3
+Replaces: libnvpair1, libnvpair1linux, libnvpair2linux, libnvpair3
 Description: Solaris name-value library for Linux
  This library provides routines for packing and unpacking nv pairs for
  transporting data across process boundaries, transporting between
  kernel and userland, and possibly saving onto disk files.
 
-Package: libuutil1linux
+Package: libpam-zfs
+Section: contrib/admin
+Architecture: linux-any
+Depends: libpam-runtime, ${misc:Depends}, ${shlibs:Depends}
+Description: PAM module for managing encryption keys for ZFS
+ 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 provides a Pluggable Authentication Module (PAM) that automatically
+ unlocks encrypted ZFS datasets upon login.
+
+Package: libuutil3linux
 Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libuutil1
-Replaces: libuutil1
+Breaks: libuutil1, libuutil1linux, libuutil2linux, libuutil3
+Replaces: libuutil1, libuutil1linux, libuutil2linux, libuutil3
 Description: Solaris userland utility library for Linux
  This library provides a variety of glue functions for ZFS on Linux:
   * libspl: The Solaris Porting Layer userland library, which provides APIs
@@ -50,42 +68,60 @@ Description: Solaris userland utility library for Linux
 Package: libzfslinux-dev
 Section: contrib/libdevel
 Architecture: linux-any
-Depends: libnvpair1linux (= ${binary:Version}),
-         libuutil1linux (= ${binary:Version}),
-         libzfs2linux (= ${binary:Version}),
-         libzpool2linux (= ${binary:Version}),
+Depends: libssl-dev | libssl1.0-dev,
+         libnvpair3linux (= ${binary:Version}),
+         libuutil3linux (= ${binary:Version}),
+         libzfs4linux (= ${binary:Version}),
+         libzfsbootenv1linux (= ${binary:Version}),
+         libzpool5linux (= ${binary:Version}),
          ${misc:Depends}
 Provides: libnvpair-dev, libuutil-dev
 Description: OpenZFS filesystem development files for Linux
  Header files and static libraries for compiling software against
  libraries of OpenZFS filesystem.
  .
- This package includes the development files of libnvpair1, libuutil1,
- libzpool2 and libzfs2.
+ This package includes the development files of libnvpair3, libuutil3,
+ libzpool5 and libzfs4, libzfsbootenv1.
 
-Package: libzfs2linux
+Package: libzfs4linux
 Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libzfs2
-Replaces: libzfs2
-Description: OpenZFS filesystem library for Linux
- The Z file system is a pooled filesystem designed for maximum data
- integrity, supporting data snapshots, multiple copies, and data
- checksums.
+# 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
+ OpenZFS is a storage platform that encompasses the functionality of
+ traditional filesystems and volume managers. It supports data checksums,
+ compression, encryption, snapshots, and more.
  .
  The OpenZFS library provides support for managing OpenZFS filesystems.
 
-Package: libzpool2linux
+Package: libzfsbootenv1linux
 Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libzpool2
-Replaces: libzpool2
+Breaks: libzfs2, libzfs4
+Replaces: libzfs2, libzfs4
+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.
+ .
+ The zfsbootenv library provides support for modifying ZFS label information.
+
+Package: libzpool5linux
+Section: contrib/libs
+Architecture: linux-any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: libzpool2, libzpool2linux, libzpool3linux, libzpool4
+Replaces: libzpool2, libzpool2linux, libzpool3linux, libzpool4
 Description: OpenZFS pool library for Linux
- The Z file system is a pooled filesystem designed for maximum data
- integrity, supporting data snapshots, multiple copies, and data
- checksums.
+ 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 zpool library provides support for managing zpools.
 
@@ -143,27 +179,40 @@ Depends: busybox-initramfs | busybox-static | busybox,
 Breaks: zfsutils-linux (<= 0.7.11-pve1~bpo1)
 Replaces: zfsutils-linux (<= 0.7.11-pve1~bpo1)
 Description: OpenZFS root filesystem capabilities for Linux - initramfs
- The Z file system is a pooled filesystem designed for maximum data
- integrity, supporting data snapshots, multiple copies, and data
- checksums.
+ 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 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
 Depends: python3, ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}
-Recommends: lsb-base, zfs-zed
+Recommends: zfs-zed
 Suggests: nfs-kernel-server,
           samba-common-bin (>= 3.0.23),
           zfs-initramfs
 Conflicts: zfs, zfs-fuse
 Provides: zfsutils
 Description: command-line tools to manage OpenZFS filesystems
- The Z file system is a pooled filesystem designed for maximum data
- integrity, supporting data snapshots, multiple copies, and data
- checksums.
+ 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 provides the zfs and zpool commands to create and administer
  OpenZFS filesystems.
@@ -174,10 +223,16 @@ Architecture: linux-any
 Depends: zfsutils-linux (>= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
+Recommends: bsd-mailx | mailutils
 Description: OpenZFS Event Daemon
- The Z file system is a pooled filesystem designed for maximum data
- integrity, supporting data snapshots, multiple copies, and data
- checksums.
+ OpenZFS is a storage platform that encompasses the functionality of
+ traditional filesystems and volume managers. It supports data checksums,
+ compression, encryption, snapshots, and more.
+ .
+ ZED (ZFS Event Daemon) monitors events generated by the ZFS kernel
+ module. When a zevent (ZFS Event) is posted, ZED will run any ZEDLETs
+ (ZFS Event Daemon Linkage for Executable Tasks) that have been enabled
+ for the corresponding zevent class.
  .
  This package provides the OpenZFS Event Daemon (zed).
 
@@ -185,6 +240,7 @@ Package: zfs-test
 Section: contrib/admin
 Architecture: linux-any
 Depends: acl,
+         attr,
          bc,
          fio,
          ksh,
@@ -198,37 +254,19 @@ Depends: acl,
          zfsutils-linux (>=${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
+Recommends: nfs-kernel-server
 Breaks: zfsutils-linux (<= 0.7.9-2)
 Replaces: zfsutils-linux (<= 0.7.9-2)
 Conflicts: zutils
-Description: OpenZFS test infrastructure an support scripts
- The Z file system is a pooled filesystem designed for maximum data
- integrity, supporting data snapshots, multiple copies, and data
- checksums.
+Description: OpenZFS test infrastructure and support scripts
+ 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 provides the OpenZFS test infrastructure for destructively
  testing and validating a system using OpenZFS. It is entirely optional
  and should only be installed and used in test environments.
 
-Package: zfs-dbg
-Section: contrib/debug
-Priority: optional
-Architecture: linux-any
-Depends: libnvpair1linux (= ${binary:Version}),
-         libuutil1linux (= ${binary:Version}),
-         libzfs2linux (= ${binary:Version}),
-         libzpool2linux (= ${binary:Version}),
-         zfs-zed (= ${binary:Version}),
-         zfsutils-linux (= ${binary:Version}),
-         ${misc:Depends}
-Description: Debugging symbols for OpenZFS userland libraries and tools
- The Z file system is a pooled filesystem designed for maximum data
- integrity, supporting data snapshots, multiple copies, and data
- checksums.
- .
- This package contains the debugging symbols for libzpool2linux, libzfs2linux,
- libnvpair1linux, libuutil1linux, zfs-zed and zfsutils-linux.
-
 Package: spl
 Section: contrib/metapackages
 Architecture: all
@@ -247,3 +285,17 @@ Description: Solaris Porting Layer user-space utilities for Linux (dummy)
  to Linux primitives.
  .
  This is a transitional dummy package. It can safely be removed.
+
+Package: zfs-dbg
+Section: contrib/metapackages
+Architecture: all
+Suggests: libnvpair3linux-dbgsym,
+         libpam-zfs-dbgsym,
+         libuutil3linux-dbgsym,
+         libzfs4linux-dbgsym,
+         libzfsbootenv1linux-dbgsym,
+         libzpool5linux-dbgsym,
+         zfs-test-dbgsym,
+         zfsutils-linux-dbgsym,
+         zfs-zed-dbgsym,
+Description: Transitional package. It can be safely removed.

debian/libnvpair1linux.install

@@ -1 +0,0 @@
-lib/libnvpair.so.*

debian/libnvpair1linux.lintian-overrides

@@ -1 +0,0 @@
-libnvpair1linux: package-name-doesnt-match-sonames

debian/libnvpair3linux.install.in

@@ -0,0 +1 @@
+lib/@DEB_HOST_MULTIARCH@/libnvpair.so.*

debian/libnvpair3linux.lintian-overrides

@@ -0,0 +1 @@
+package-name-doesnt-match-sonames

debian/libpam-zfs.install

@@ -0,0 +1,2 @@
+lib/*/security/pam_zfs_key.so
+usr/share/pam-configs/zfs_key

debian/libpam-zfs.postinst

@@ -0,0 +1,6 @@
+#!/bin/sh
+set -e
+
+pam-auth-update --package
+
+#DEBHELPER#

debian/libpam-zfs.prerm

@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = remove ] ; then
+    pam-auth-update --package --remove zfs_key
+fi
+
+#DEBHELPER#

debian/libuutil1linux.install

@@ -1 +0,0 @@
-lib/libuutil.so.*

debian/libuutil1linux.lintian-overrides

@@ -1 +0,0 @@
-libuutil1linux: package-name-doesnt-match-sonames

debian/libuutil3linux.install.in

@@ -0,0 +1 @@
+lib/@DEB_HOST_MULTIARCH@/libuutil.so.*

debian/libuutil3linux.lintian-overrides

@@ -0,0 +1 @@
+package-name-doesnt-match-sonames

debian/libzfs2linux.install

@@ -1,2 +0,0 @@
-lib/libzfs.so.*
-lib/libzfs_core.so.*

debian/libzfs2linux.lintian-overrides

@@ -1 +0,0 @@
-libzfs2linux: package-name-doesnt-match-sonames

debian/libzfs4linux.install.in

@@ -0,0 +1,2 @@
+lib/@DEB_HOST_MULTIARCH@/libzfs.so.*
+lib/@DEB_HOST_MULTIARCH@/libzfs_core.so.*

debian/libzfs4linux.lintian-overrides

@@ -0,0 +1 @@
+package-name-doesnt-match-sonames

debian/libzfsbootenv1linux.install

@@ -0,0 +1 @@
+lib/libzfsbootenv.so.*

debian/libzfsbootenv1linux.install.in

@@ -0,0 +1 @@
+lib/@DEB_HOST_MULTIARCH@/libzfsbootenv.so.*

debian/libzfsbootenv1linux.lintian-overrides

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

debian/libzfslinux-dev.install

@@ -1,4 +0,0 @@
-lib/*.a usr/lib/
-usr/include
-usr/lib/*.so
-usr/share/pkgconfig/*.pc

debian/libzfslinux-dev.install.in

@@ -0,0 +1,4 @@
+lib/@DEB_HOST_MULTIARCH@/*.a usr/lib/@DEB_HOST_MULTIARCH@/
+usr/include
+usr/lib/@DEB_HOST_MULTIARCH@/*.so
+/usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/*.pc

debian/libzpool2linux.install

@@ -1 +0,0 @@
-lib/libzpool.so.*

debian/libzpool2linux.lintian-overrides

@@ -1 +0,0 @@
-libzpool2linux: package-name-doesnt-match-sonames

debian/libzpool5linux.docs

@@ -0,0 +1,2 @@
+COPYRIGHT
+LICENSE

debian/libzpool5linux.install.in

@@ -0,0 +1 @@
+lib/@DEB_HOST_MULTIARCH@/libzpool.so.*

debian/libzpool5linux.lintian-overrides

@@ -0,0 +1 @@
+package-name-doesnt-match-sonames

debian/not-installed

@@ -1,5 +1,6 @@
 usr/share/zfs/enum-extract.pl
 usr/share/zfs/zfs-helpers.sh
+etc/default/zfs
 etc/init.d
 etc/sudoers.d
 etc/zfs/vdev_id.conf.alias.example
@@ -9,3 +10,4 @@ etc/zfs/vdev_id.conf.sas_switch.example
 etc/zfs/vdev_id.conf.scsi.example
 usr/lib/dracut
 usr/share/zfs/enum-extract.pl
+etc/zfs/zfs-functions

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

@@ -4,12 +4,13 @@ From: Debian ZFS on Linux maintainers
 Date: Wed, 30 Jan 2019 15:12:04 +0100
 Subject: [PATCH] Check-for-META-and-DCH-consistency-in-autoconf
 
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 ---
  config/zfs-meta.m4 | 34 +++++++++++++++++++++++++++++-----
  1 file changed, 29 insertions(+), 5 deletions(-)
 
 diff --git a/config/zfs-meta.m4 b/config/zfs-meta.m4
-index aa0fc1420..f525e2010 100644
+index 20064a0fb..4d5f545ad 100644
 --- a/config/zfs-meta.m4
 +++ b/config/zfs-meta.m4
 @@ -1,9 +1,10 @@
@@ -66,4 +67,4 @@ index aa0fc1420..f525e2010 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}|cut -f3- -d'-'|sed 's/-/_/g')
+ 			_release=$(echo ${_alias}|sed "s/${ZFS_META_NAME}//"|cut -f3- -d'-'|tr - _)

debian/patches/0002-always-load-ZFS-module-on-boot.patch

@@ -13,14 +13,15 @@ not actually used.
 
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 ---
- etc/modules-load.d/zfs.conf.in | 2 +-
+ etc/modules-load.d/zfs.conf | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/etc/modules-load.d/zfs.conf.in b/etc/modules-load.d/zfs.conf.in
+diff --git a/etc/modules-load.d/zfs.conf b/etc/modules-load.d/zfs.conf
 index 44e1bb3ed..7509b03cb 100644
---- a/etc/modules-load.d/zfs.conf.in
-+++ b/etc/modules-load.d/zfs.conf.in
+--- a/etc/modules-load.d/zfs.conf
++++ b/etc/modules-load.d/zfs.conf
 @@ -1,3 +1,3 @@
  # The default behavior is to allow udev to load the kernel modules on demand.
  # Uncomment the following line to unconditionally load them at boot.

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

@@ -6,20 +6,22 @@ Subject: [PATCH] Fix the path to the zed binary on the systemd unit.
 We install zed into /usr/sbin manually meanwhile the upstream default is
 installing it into /sbin. Ubuntu packages also install zed to /usr/sbin, but
 they ship their own zfs-zed unit.
+
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 ---
  etc/systemd/system/zfs-zed.service.in | 2 +-
  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 f4313625e..444e776fd 100644
+index be80025a4..20ce8e632 100644
 --- a/etc/systemd/system/zfs-zed.service.in
 +++ b/etc/systemd/system/zfs-zed.service.in
-@@ -3,7 +3,7 @@ Description=ZFS Event Daemon (zed)
- Documentation=man:zed(8)
+@@ -4,7 +4,7 @@ Documentation=man:zed(8)
+ ConditionPathIsDirectory=/sys/module/zfs
  
  [Service]
 -ExecStart=@sbindir@/zed -F
 +ExecStart=/usr/sbin/zed -F
- Restart=on-abort
+ Restart=always
  
  [Install]

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

@@ -8,20 +8,21 @@ Content-Transfer-Encoding: 8bit
 
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 ---
  etc/systemd/system/zfs-import-scan.service.in | 2 +-
  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 4aae9f06e..ec5c45e63 100644
+index 598ef501b..e4f3a70c1 100644
 --- a/etc/systemd/system/zfs-import-scan.service.in
 +++ b/etc/systemd/system/zfs-import-scan.service.in
-@@ -11,7 +11,7 @@ ConditionPathExists=!@sysconfdir@/zfs/zpool.cache
+@@ -13,7 +13,7 @@ ConditionPathIsDirectory=/sys/module/zfs
  [Service]
  Type=oneshot
  RemainAfterExit=yes
--ExecStart=@sbindir@/zpool import -aN -o cachefile=none
-+ExecStart=@sbindir@/zpool import -aN -d /dev/disk/by-id -o cachefile=none
+-ExecStart=@sbindir@/zpool import -aN -o cachefile=none $ZPOOL_IMPORT_OPTS
++ExecStart=@sbindir@/zpool import -aN -d /dev/disk/by-id -o cachefile=none $ZPOOL_IMPORT_OPTS
  
  [Install]
  WantedBy=zfs-import.target

debian/patches/0004-increase-default-zcmd-allocation-to-256K.patch

@@ -1,75 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Colin Ian King <colin.king@canonical.com>
-Date: Tue, 31 Oct 2017 19:12:42 +0800
-Subject: [PATCH] increase-default-zcmd-allocation-to-256K
-
-Increase default zcmd allocation to 256K (LP: #567557)
-
-When creating hundreds of clones (for example using containers with
-LXD) cloning slows down as the number of clones increases over time.
-The reason for this is that the fetching of the clone information
-using a small zcmd buffer requires two ioctl calls, one to determine
-the size and a second to return the data. However, this requires
-gathering the data twice, once to determine the size and again to
-populate the zcmd buffer to return it to userspace.
-
-These are expensive ioctl() calls, so instead, make the default buffer
-size much larger: 256K. This may sound large, but on 64 bit systems
-running ZFS this is not a huge chunk of memory for the speed
-improvement we gains for large sets of clones:
-
-        16K zcmd        256K zcmd
-Clones	Time    Clones  Time    Clone   % improvement
-        (secs) 	per sec (secs)  per sec
-100	7	14.29	5	20.00	28.57
-200	10	20.00	9	22.22	10.00
-300	19	15.79	18	16.67	5.26
-400	22	18.18	22	18.18	0.00
-500	29	17.24	29	17.24	0.00
-600	39	15.38	39	15.38	0.00
-700	46	15.22	45	15.56	2.17
-800	58	13.79	51	15.69	12.07
-900	74	12.16	61	14.75	17.57
-1000	90	11.11	74	13.51	17.78
-1100	98	11.22	87	12.64	11.22
-1200	102	11.76	95	12.63	6.86
-1300	113	11.50	104	12.50	7.96
-1400	143	9.79	109	12.84	23.78
-1500	145	10.34	132	11.36	8.97
-1600	165	9.70	145	11.03	12.12
-1700	187	9.09	156	10.90	16.58
-1800	210	8.57	166	10.84	20.95
-1900	226	8.41	183	10.38	19.03
-2000	256	7.81	198	10.10	22.66
-2200	311	7.07	238	9.24	23.47
-2400	373	6.43	271	8.86	27.35
-2600	487	5.34	316	8.23	35.11
-3000	619	4.85	426	7.04	31.18
-3400	915	3.72	549	6.19	40.00
-4000	1332	3.00	923	4.33	30.71
-
-As one can see, with > 2000 clones we get 25-40% speed
-improvement.
-
-This patch was originally suggested by Brian Behlendorf
-(see https://github.com/zfsonlinux/zfs/issues/6372), however
-this fix is a more generic fix to cover all zcmd cases.
-
-Signed-off-by: Colin Ian King <colin.king@canonical.com>
----
- lib/libzfs/libzfs_util.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/libzfs/libzfs_util.c b/lib/libzfs/libzfs_util.c
-index 19bb57ad4..2a069ffe6 100644
---- a/lib/libzfs/libzfs_util.c
-+++ b/lib/libzfs/libzfs_util.c
-@@ -1134,7 +1134,7 @@ int
- zcmd_alloc_dst_nvlist(libzfs_handle_t *hdl, zfs_cmd_t *zc, size_t len)
- {
- 	if (len == 0)
--		len = 16 * 1024;
-+		len = 256 * 1024;
- 	zc->zc_nvlist_dst_size = len;
- 	zc->zc_nvlist_dst =
- 	    (uint64_t)(uintptr_t)zfs_alloc(hdl, zc->zc_nvlist_dst_size);

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

@@ -6,24 +6,17 @@ Subject: [PATCH] Enable zed emails
 The OpenZFS event daemon monitors pools. This patch enables the email sending
 function by default (if zed is installed). This is consistent with the default
 behavior of mdadm.
+
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 ---
- cmd/zed/zed.d/zed.rc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ cmd/zed/zed.d/zed.rc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/cmd/zed/zed.d/zed.rc b/cmd/zed/zed.d/zed.rc
-index 0ef706849..50632bfcb 100644
+index 1dfd43454..0180dd827 100644
 --- a/cmd/zed/zed.d/zed.rc
 +++ b/cmd/zed/zed.d/zed.rc
-@@ -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 @@
+@@ -42,7 +42,7 @@ ZED_EMAIL_ADDR="root"
  ##
  # Minimum number of seconds between notifications for a similar event.
  #

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

@@ -0,0 +1,31 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Antonio Russo <antonio.e.russo@gmail.com>
+Date: Fri, 20 Mar 2020 17:28:43 +0100
+Subject: [PATCH] dont symlink zed scripts
+
+(cherry picked and adapted from 5cee380324d74e640d5dd7a360faba3994c8007f [0])
+
+[0] https://salsa.debian.org/zfsonlinux-team/zfs.git
+
+Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
+
+Description: track default symlinks, instead of symlinking
+Forwarded: no need
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ cmd/zed/zed.d/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmd/zed/zed.d/Makefile.am b/cmd/zed/zed.d/Makefile.am
+index 1905a9207..6dc06252a 100644
+--- a/cmd/zed/zed.d/Makefile.am
++++ b/cmd/zed/zed.d/Makefile.am
+@@ -51,7 +51,7 @@ install-data-hook:
+ 	for f in $(zedconfdefaults); do \
+ 	  test -f "$(DESTDIR)$(zedconfdir)/$${f}" -o \
+ 	       -L "$(DESTDIR)$(zedconfdir)/$${f}" || \
+-	    ln -s "$(zedexecdir)/$${f}" "$(DESTDIR)$(zedconfdir)"; \
++	    echo "$${f}" >> "$(DESTDIR)$(zedexecdir)/DEFAULT-ENABLED" ; \
+ 	done
+ 	chmod 0600 "$(DESTDIR)$(zedconfdir)/zed.rc"
+ 

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

@@ -0,0 +1,67 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Stoiko Ivanov <s.ivanov@proxmox.com>
+Date: Tue, 15 Sep 2020 19:07:24 +0200
+Subject: [PATCH] Add systemd-unit for importing specific pools
+
+The unit can be instantiated with a specific poolname, which will get imported
+by scanning /dev/disk/by-id, irrespective of the existence and content of
+/etc/zfs/zpool.cache.
+
+the instance name is used unescaped (see systemd.unit(5)), since zpool names
+can contain characters which will be escaped by systemd.
+
+Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ etc/systemd/system/50-zfs.preset.in       |  1 +
+ etc/systemd/system/Makefile.am            |  1 +
+ etc/systemd/system/zfs-import@.service.in | 16 ++++++++++++++++
+ 3 files changed, 18 insertions(+)
+ create mode 100644 etc/systemd/system/zfs-import@.service.in
+
+diff --git a/etc/systemd/system/50-zfs.preset.in b/etc/systemd/system/50-zfs.preset.in
+index e4056a92c..030611419 100644
+--- a/etc/systemd/system/50-zfs.preset.in
++++ b/etc/systemd/system/50-zfs.preset.in
+@@ -1,6 +1,7 @@
+ # ZFS is enabled by default
+ enable zfs-import-cache.service
+ disable zfs-import-scan.service
++enable zfs-import@.service
+ enable zfs-import.target
+ 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
+--- a/etc/systemd/system/Makefile.am
++++ b/etc/systemd/system/Makefile.am
+@@ -7,6 +7,7 @@ systemdunit_DATA = \
+ 	zfs-zed.service \
+ 	zfs-import-cache.service \
+ 	zfs-import-scan.service \
++	zfs-import@.service \
+ 	zfs-mount.service \
+ 	zfs-share.service \
+ 	zfs-volume-wait.service \
+diff --git a/etc/systemd/system/zfs-import@.service.in b/etc/systemd/system/zfs-import@.service.in
+new file mode 100644
+index 000000000..9b4ee9371
+--- /dev/null
++++ b/etc/systemd/system/zfs-import@.service.in
+@@ -0,0 +1,16 @@
++[Unit]
++Description=Import ZFS pool %i
++Documentation=man:zpool(8)
++DefaultDependencies=no
++After=systemd-udev-settle.service
++After=cryptsetup.target
++After=multipathd.target
++Before=zfs-import.target
++
++[Service]
++Type=oneshot
++RemainAfterExit=yes
++ExecStart=@sbindir@/zpool import -N -d /dev/disk/by-id -o cachefile=none %I
++
++[Install]
++WantedBy=zfs-import.target

debian/patches/0007-Fix-race-in-parallel-mount-s-thread-dispatching-algo.patch

@@ -1,244 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Tomohiro Kusumi <kusumi.tomohiro@gmail.com>
-Date: Wed, 10 Jul 2019 01:31:46 +0900
-Subject: [PATCH] Fix race in parallel mount's thread dispatching algorithm
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Strategy of parallel mount is as follows.
-
-1) Initial thread dispatching is to select sets of mount points that
- don't have dependencies on other sets, hence threads can/should run
- lock-less and shouldn't race with other threads for other sets. Each
- thread dispatched corresponds to top level directory which may or may
- not have datasets to be mounted on sub directories.
-
-2) Subsequent recursive thread dispatching for each thread from 1)
- is to mount datasets for each set of mount points. The mount points
- within each set have dependencies (i.e. child directories), so child
- directories are processed only after parent directory completes.
-
-The problem is that the initial thread dispatching in
-zfs_foreach_mountpoint() can be multi-threaded when it needs to be
-single-threaded, and this puts threads under race condition. This race
-appeared as mount/unmount issues on ZoL for ZoL having different
-timing regarding mount(2) execution due to fork(2)/exec(2) of mount(8).
-`zfs unmount -a` which expects proper mount order can't unmount if the
-mounts were reordered by the race condition.
-
-There are currently two known patterns of input list `handles` in
-`zfs_foreach_mountpoint(..,handles,..)` which cause the race condition.
-
-1) #8833 case where input is `/a /a /a/b` after sorting.
- The problem is that libzfs_path_contains() can't correctly handle an
- input list with two same top level directories.
- There is a race between two POSIX threads A and B,
-  * ThreadA for "/a" for test1 and "/a/b"
-  * ThreadB for "/a" for test0/a
- and in case of #8833, ThreadA won the race. Two threads were created
- because "/a" wasn't considered as `"/a" contains "/a"`.
-
-2) #8450 case where input is `/ /var/data /var/data/test` after sorting.
- The problem is that libzfs_path_contains() can't correctly handle an
- input list containing "/".
- There is a race between two POSIX threads A and B,
-  * ThreadA for "/" and "/var/data/test"
-  * ThreadB for "/var/data"
- and in case of #8450, ThreadA won the race. Two threads were created
- because "/var/data" wasn't considered as `"/" contains "/var/data"`.
- In other words, if there is (at least one) "/" in the input list,
- the initial thread dispatching must be single-threaded since every
- directory is a child of "/", meaning they all directly or indirectly
- depend on "/".
-
-In both cases, the first non_descendant_idx() call fails to correctly
-determine "path1-contains-path2", and as a result the initial thread
-dispatching creates another thread when it needs to be single-threaded.
-Fix a conditional in libzfs_path_contains() to consider above two.
-
-Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Reviewed by: Sebastien Roy <sebastien.roy@delphix.com>
-Signed-off-by: Tomohiro Kusumi <kusumi.tomohiro@gmail.com>
-Closes #8450
-Closes #8833
-Closes #8878
-(cherry picked from commit ab5036df1ccbe1b18c1ce6160b5829e8039d94ce)
-Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
----
- .../functional/cli_root/zfs_mount/Makefile.am |   1 +
- lib/libzfs/libzfs_mount.c                     |   6 +-
- tests/runfiles/linux.run                      |   3 +-
- .../cli_root/zfs_mount/zfs_mount_test_race.sh | 116 ++++++++++++++++++
- 4 files changed, 123 insertions(+), 3 deletions(-)
- create mode 100755 tests/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_test_race.sh
-
-diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_mount/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zfs_mount/Makefile.am
-index b2de98934..c208a1c37 100644
---- a/tests/zfs-tests/tests/functional/cli_root/zfs_mount/Makefile.am
-+++ b/tests/zfs-tests/tests/functional/cli_root/zfs_mount/Makefile.am
-@@ -19,6 +19,7 @@ dist_pkgdata_SCRIPTS = \
- 	zfs_mount_all_mountpoints.ksh \
- 	zfs_mount_encrypted.ksh \
- 	zfs_mount_remount.ksh \
-+	zfs_mount_test_race.sh \
- 	zfs_multi_mount.ksh
- 
- dist_pkgdata_DATA = \
-diff --git a/lib/libzfs/libzfs_mount.c b/lib/libzfs/libzfs_mount.c
-index 649c232aa..d62801cfd 100644
---- a/lib/libzfs/libzfs_mount.c
-+++ b/lib/libzfs/libzfs_mount.c
-@@ -1302,12 +1302,14 @@ mountpoint_cmp(const void *arga, const void *argb)
- }
- 
- /*
-- * Return true if path2 is a child of path1.
-+ * Return true if path2 is a child of path1 or path2 equals path1 or
-+ * path1 is "/" (path2 is always a child of "/").
-  */
- static boolean_t
- libzfs_path_contains(const char *path1, const char *path2)
- {
--	return (strstr(path2, path1) == path2 && path2[strlen(path1)] == '/');
-+	return (strcmp(path1, path2) == 0 || strcmp(path1, "/") == 0 ||
-+	    (strstr(path2, path1) == path2 && path2[strlen(path1)] == '/'));
- }
- 
- /*
-diff --git a/tests/runfiles/linux.run b/tests/runfiles/linux.run
-index 22fc26212..4d673cc95 100644
---- a/tests/runfiles/linux.run
-+++ b/tests/runfiles/linux.run
-@@ -182,7 +182,8 @@ tests = ['zfs_mount_001_pos', 'zfs_mount_002_pos', 'zfs_mount_003_pos',
-     'zfs_mount_007_pos', 'zfs_mount_008_pos', 'zfs_mount_009_neg',
-     'zfs_mount_010_neg', 'zfs_mount_011_neg', 'zfs_mount_012_neg',
-     'zfs_mount_all_001_pos', 'zfs_mount_encrypted', 'zfs_mount_remount',
--    'zfs_multi_mount', 'zfs_mount_all_fail', 'zfs_mount_all_mountpoints']
-+    'zfs_multi_mount', 'zfs_mount_all_fail', 'zfs_mount_all_mountpoints',
-+    'zfs_mount_test_race']
- tags = ['functional', 'cli_root', 'zfs_mount']
- 
- [tests/functional/cli_root/zfs_program]
-diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_test_race.sh b/tests/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_test_race.sh
-new file mode 100755
-index 000000000..404770b27
---- /dev/null
-+++ b/tests/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_test_race.sh
-@@ -0,0 +1,116 @@
-+#!/bin/ksh
-+
-+#
-+# This file and its contents are supplied under the terms of the
-+# Common Development and Distribution License ("CDDL"), version 1.0.
-+# You may only use this file in accordance with the terms of version
-+# 1.0 of the CDDL.
-+#
-+# A full copy of the text of the CDDL should have accompanied this
-+# source.  A copy of the CDDL is also available via the Internet at
-+# http://www.illumos.org/license/CDDL.
-+#
-+
-+#
-+# Copyright (c) 2019 by Tomohiro Kusumi. All rights reserved.
-+#
-+
-+. $STF_SUITE/include/libtest.shlib
-+. $STF_SUITE/tests/functional/cli_root/zfs_mount/zfs_mount.cfg
-+
-+#
-+# DESCRIPTION:
-+# Verify parallel mount ordering is consistent.
-+#
-+# There was a bug in initial thread dispatching algorithm which put threads
-+# under race condition which resulted in undefined mount order.  The purpose
-+# of this test is to verify `zfs unmount -a` succeeds (not `zfs mount -a`
-+# succeeds, it always does) after `zfs mount -a`, which could fail if threads
-+# race.  See github.com/zfsonlinux/zfs/issues/{8450,8833,8878} for details.
-+#
-+# STRATEGY:
-+# 1. Create pools and filesystems.
-+# 2. Set same mount point for >1 datasets.
-+# 3. Unmount all datasets.
-+# 4. Mount all datasets.
-+# 5. Unmount all datasets (verify this succeeds).
-+#
-+
-+verify_runnable "both"
-+
-+TMPDIR=${TMPDIR:-$TEST_BASE_DIR}
-+MNTPT=$TMPDIR/zfs_mount_test_race_mntpt
-+DISK1="$TMPDIR/zfs_mount_test_race_disk1"
-+DISK2="$TMPDIR/zfs_mount_test_race_disk2"
-+
-+TESTPOOL1=zfs_mount_test_race_tp1
-+TESTPOOL2=zfs_mount_test_race_tp2
-+
-+export __ZFS_POOL_RESTRICT="$TESTPOOL1 $TESTPOOL2"
-+log_must zfs $unmountall
-+unset __ZFS_POOL_RESTRICT
-+
-+function cleanup
-+{
-+	zpool destroy $TESTPOOL1
-+	zpool destroy $TESTPOOL2
-+	rm -rf $MNTPT
-+	rm -rf /$TESTPOOL1
-+	rm -rf /$TESTPOOL2
-+	rm -f $DISK1
-+	rm -f $DISK2
-+	export __ZFS_POOL_RESTRICT="$TESTPOOL1 $TESTPOOL2"
-+	log_must zfs $mountall
-+	unset __ZFS_POOL_RESTRICT
-+}
-+log_onexit cleanup
-+
-+log_note "Verify parallel mount ordering is consistent"
-+
-+log_must truncate -s $MINVDEVSIZE $DISK1
-+log_must truncate -s $MINVDEVSIZE $DISK2
-+
-+log_must zpool create -f $TESTPOOL1 $DISK1
-+log_must zpool create -f $TESTPOOL2 $DISK2
-+
-+log_must zfs create $TESTPOOL1/$TESTFS1
-+log_must zfs create $TESTPOOL2/$TESTFS2
-+
-+log_must zfs set mountpoint=none $TESTPOOL1
-+log_must zfs set mountpoint=$MNTPT $TESTPOOL1/$TESTFS1
-+
-+# Note that unmount can fail (due to race condition on `zfs mount -a`) with or
-+# without `canmount=off`.  The race has nothing to do with canmount property,
-+# but turn it off for convenience of mount layout used in this test case.
-+log_must zfs set canmount=off $TESTPOOL2
-+log_must zfs set mountpoint=$MNTPT $TESTPOOL2
-+
-+# At this point, layout of datasets in two pools will look like below.
-+# Previously, on next `zfs mount -a`, pthreads assigned to TESTFS1 and TESTFS2
-+# could race, and TESTFS2 usually (actually always) won in ZoL.  Note that the
-+# problem is how two or more threads could initially be assigned to the same
-+# top level directory, not this specific layout.  This layout is just an example
-+# that can reproduce race, and is also the layout reported in #8833.
-+#
-+# NAME                  MOUNTED  MOUNTPOINT
-+# ----------------------------------------------
-+# /$TESTPOOL1           no       none
-+# /$TESTPOOL1/$TESTFS1  yes      $MNTPT
-+# /$TESTPOOL2           no       $MNTPT
-+# /$TESTPOOL2/$TESTFS2  yes      $MNTPT/$TESTFS2
-+
-+# Apparently two datasets must be mounted.
-+log_must ismounted $TESTPOOL1/$TESTFS1
-+log_must ismounted $TESTPOOL2/$TESTFS2
-+# This unmount always succeeds, because potential race hasn't happened yet.
-+log_must zfs unmount -a
-+# This mount always succeeds, whether threads are under race condition or not.
-+log_must zfs mount -a
-+
-+# Verify datasets are mounted (TESTFS2 fails if the race broke mount order).
-+log_must ismounted $TESTPOOL1/$TESTFS1
-+log_must ismounted $TESTPOOL2/$TESTFS2
-+# Verify unmount succeeds (fails if the race broke mount order).
-+log_must zfs unmount -a
-+
-+log_pass "Verify parallel mount ordering is consistent passed"

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

@@ -0,0 +1,52 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Stoiko Ivanov <s.ivanov@proxmox.com>
+Date: Thu, 4 Feb 2021 19:01:12 +0100
+Subject: [PATCH] Patch: move manpage arcstat(1) to arcstat(8).
+
+Originally-By: Mo Zhou <cdluminate@gmail.com>
+Originally-By: Antonio Russo <aerusso@aerusso.net>
+
+Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ man/Makefile.am                        | 2 +-
+ man/{man1/arcstat.1 => man8/arcstat.8} | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+ rename man/{man1/arcstat.1 => man8/arcstat.8} (99%)
+
+diff --git a/man/Makefile.am b/man/Makefile.am
+index 64650c2b9..95a66a62f 100644
+--- a/man/Makefile.am
++++ b/man/Makefile.am
+@@ -8,7 +8,6 @@ dist_man_MANS = \
+ 	man1/ztest.1 \
+ 	man1/raidz_test.1 \
+ 	man1/zvol_wait.1 \
+-	man1/arcstat.1 \
+ 	\
+ 	man5/vdev_id.conf.5 \
+ 	\
+@@ -22,6 +21,7 @@ dist_man_MANS = \
+ 	man7/zpoolconcepts.7 \
+ 	man7/zpoolprops.7 \
+ 	\
++	man8/arcstat.8 \
+ 	man8/fsck.zfs.8 \
+ 	man8/mount.zfs.8 \
+ 	man8/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
+--- a/man/man1/arcstat.1
++++ b/man/man8/arcstat.8
+@@ -13,7 +13,7 @@
+ .\" Copyright (c) 2020 by AJ Jordan. All rights reserved.
+ .\"
+ .Dd May 26, 2021
+-.Dt ARCSTAT 1
++.Dt ARCSTAT 8
+ .Os
+ .
+ .Sh NAME

debian/patches/0009-Fix-CONFIG_X86_DEBUG_FPU-build-failure.patch

@@ -1,44 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Brian Behlendorf <behlendorf1@llnl.gov>
-Date: Wed, 17 Jul 2019 09:14:36 -0700
-Subject: [PATCH] Fix CONFIG_X86_DEBUG_FPU build failure
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When CONFIG_X86_DEBUG_FPU is defined the alternatives_patched symbol
-is pulled in as a dependency which results in a build failure.  To
-prevent this undefine CONFIG_X86_DEBUG_FPU to disable the WARN_ON_FPU()
-macro and rely on WARN_ON_ONCE debugging checks which were previously
-added.
-
-Reviewed-by: Tony Hutter <hutter2@llnl.gov>
-Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Closes #9041
-Closes #9049
-(cherry picked from commit 095b5412b31c07cad5cec74a4eb5ace011c92b27)
-Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
----
- include/linux/simd_x86.h | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/include/linux/simd_x86.h b/include/linux/simd_x86.h
-index 2d7a1c3a5..5f243e0cc 100644
---- a/include/linux/simd_x86.h
-+++ b/include/linux/simd_x86.h
-@@ -82,6 +82,15 @@
- 
- #if defined(_KERNEL)
- 
-+/*
-+ * Disable the WARN_ON_FPU() macro to prevent additional dependencies
-+ * when providing the kfpu_* functions.  Relevant warnings are included
-+ * as appropriate and are unconditionally enabled.
-+ */
-+#if defined(CONFIG_X86_DEBUG_FPU) && !defined(KERNEL_EXPORTS_X86_FPU)
-+#undef CONFIG_X86_DEBUG_FPU
-+#endif
-+
- #if defined(HAVE_KERNEL_FPU_API_HEADER)
- #include <asm/fpu/api.h>
- #include <asm/fpu/internal.h>

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

@@ -0,0 +1,134 @@
+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 0128fd817..d2b2e28d1 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/0010-SIMD-FPU-register-save-restore-is-also-required-on-5.patch

@@ -1,57 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Thomas Lamprecht <t.lamprecht@proxmox.com>
-Date: Wed, 25 Sep 2019 10:48:48 +0200
-Subject: [PATCH] [SIMD]: FPU register save/restore is also required on 5.0
- kernels
-
-NOTE: the kernel needs to have the copy_kernel_to_xregs_err,
-copy_kernel_to_fxregs_err and copy_kernel_to_fregs_err funcitons
-backported for this to work.
-
-Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
----
- include/linux/simd_x86.h | 11 +----------
- 1 file changed, 1 insertion(+), 10 deletions(-)
-
-diff --git a/include/linux/simd_x86.h b/include/linux/simd_x86.h
-index 5f243e0cc..aac63d964 100644
---- a/include/linux/simd_x86.h
-+++ b/include/linux/simd_x86.h
-@@ -179,7 +179,6 @@ kfpu_begin(void)
- 	preempt_disable();
- 	local_irq_disable();
- 
--#if defined(HAVE_KERNEL_TIF_NEED_FPU_LOAD)
- 	/*
- 	 * The current FPU registers need to be preserved by kfpu_begin()
- 	 * and restored by kfpu_end().  This is required because we can
-@@ -188,20 +187,13 @@ kfpu_begin(void)
- 	 * context switch.
- 	 */
- 	copy_fpregs_to_fpstate(&current->thread.fpu);
--#elif defined(HAVE_KERNEL_FPU_INITIALIZED)
--	/*
--	 * There is no need to preserve and restore the FPU registers.
--	 * They will always be restored from the task's stored FPU state
--	 * when switching contexts.
--	 */
-+
- 	WARN_ON_ONCE(current->thread.fpu.initialized == 0);
--#endif
- }
- 
- static inline void
- kfpu_end(void)
- {
--#if defined(HAVE_KERNEL_TIF_NEED_FPU_LOAD)
- 	union fpregs_state *state = &current->thread.fpu.state;
- 	int error;
- 
-@@ -213,7 +205,6 @@ kfpu_end(void)
- 		error = copy_kernel_to_fregs_err(&state->fsave);
- 	}
- 	WARN_ON_ONCE(error);
--#endif
- 
- 	local_irq_enable();
- 	preempt_enable();

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

@@ -0,0 +1,113 @@
+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>
+Signed-off-by: Thomas Lamprecht <t.lamprecht@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 9d0c2d30d..fd2581ae2 100755
+--- a/cmd/arc_summary/arc_summary3
++++ b/cmd/arc_summary/arc_summary3
+@@ -609,13 +609,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()
+@@ -757,20 +757,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 d2b2e28d1..8004940b3 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/0011-Avoid-save-restoring-AMX-registers-to-avoid-a-SPR-er.patch

@@ -0,0 +1,87 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Rich Ercolani <214141+rincebrain@users.noreply.github.com>
+Date: Sat, 26 Aug 2023 14:25:46 -0400
+Subject: [PATCH] Avoid save/restoring AMX registers to avoid a SPR erratum
+
+Intel SPR erratum SPR4 says that if you trip into a vmexit while
+doing FPU save/restore, your AMX register state might misbehave...
+and by misbehave, I mean save all zeroes incorrectly, leading to
+explosions if you restore it.
+
+Since we're not using AMX for anything, the simple way to avoid
+this is to just not save/restore those when we do anything, since
+we're killing preemption of any sort across our save/restores.
+
+If we ever decide to use AMX, it's not clear that we have any
+way to mitigate this, on Linux...but I am not an expert.
+
+Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
+Signed-off-by: Rich Ercolani <rincebrain@gmail.com>
+Closes #14989
+Closes #15168
+(cherry picked from commit 277f2e587b085d1eb8aa48b4ac0768a9ef5745ab)
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ include/os/linux/kernel/linux/simd_x86.h | 19 ++++++++++++++-----
+ 1 file changed, 14 insertions(+), 5 deletions(-)
+
+diff --git a/include/os/linux/kernel/linux/simd_x86.h b/include/os/linux/kernel/linux/simd_x86.h
+index 660f0d42d..455167ac8 100644
+--- a/include/os/linux/kernel/linux/simd_x86.h
++++ b/include/os/linux/kernel/linux/simd_x86.h
+@@ -157,6 +157,15 @@
+ #endif
+ #endif
+ 
++#ifndef XFEATURE_MASK_XTILE
++/*
++ * For kernels where this doesn't exist yet, we still don't want to break
++ * by save/restoring this broken nonsense.
++ * See issue #14989 or Intel errata SPR4 for why
++ */
++#define	XFEATURE_MASK_XTILE	0x60000
++#endif
++
+ #include <linux/mm.h>
+ #include <linux/slab.h>
+ 
+@@ -319,18 +328,18 @@ kfpu_begin(void)
+ 	union fpregs_state *state = zfs_kfpu_fpregs[smp_processor_id()];
+ #if defined(HAVE_XSAVES)
+ 	if (static_cpu_has(X86_FEATURE_XSAVES)) {
+-		kfpu_do_xsave("xsaves", &state->xsave, ~0);
++		kfpu_do_xsave("xsaves", &state->xsave, ~XFEATURE_MASK_XTILE);
+ 		return;
+ 	}
+ #endif
+ #if defined(HAVE_XSAVEOPT)
+ 	if (static_cpu_has(X86_FEATURE_XSAVEOPT)) {
+-		kfpu_do_xsave("xsaveopt", &state->xsave, ~0);
++		kfpu_do_xsave("xsaveopt", &state->xsave, ~XFEATURE_MASK_XTILE);
+ 		return;
+ 	}
+ #endif
+ 	if (static_cpu_has(X86_FEATURE_XSAVE)) {
+-		kfpu_do_xsave("xsave", &state->xsave, ~0);
++		kfpu_do_xsave("xsave", &state->xsave, ~XFEATURE_MASK_XTILE);
+ 	} else if (static_cpu_has(X86_FEATURE_FXSR)) {
+ 		kfpu_save_fxsr(&state->fxsave);
+ 	} else {
+@@ -415,12 +424,12 @@ kfpu_end(void)
+ 	union fpregs_state *state = zfs_kfpu_fpregs[smp_processor_id()];
+ #if defined(HAVE_XSAVES)
+ 	if (static_cpu_has(X86_FEATURE_XSAVES)) {
+-		kfpu_do_xrstor("xrstors", &state->xsave, ~0);
++		kfpu_do_xrstor("xrstors", &state->xsave, ~XFEATURE_MASK_XTILE);
+ 		goto out;
+ 	}
+ #endif
+ 	if (static_cpu_has(X86_FEATURE_XSAVE)) {
+-		kfpu_do_xrstor("xrstor", &state->xsave, ~0);
++		kfpu_do_xrstor("xrstor", &state->xsave, ~XFEATURE_MASK_XTILE);
+ 	} else if (static_cpu_has(X86_FEATURE_FXSR)) {
+ 		kfpu_restore_fxsr(&state->fxsave);
+ 	} else {
+-- 
+2.39.2
+

debian/patches/series

@@ -1,10 +1,11 @@
 0001-Check-for-META-and-DCH-consistency-in-autoconf.patch
 0002-always-load-ZFS-module-on-boot.patch
 0003-Fix-the-path-to-the-zed-binary-on-the-systemd-unit.patch
-0004-increase-default-zcmd-allocation-to-256K.patch
-0005-import-with-d-dev-disk-by-id-in-scan-service.patch
-0006-Enable-zed-emails.patch
-0007-Fix-race-in-parallel-mount-s-thread-dispatching-algo.patch
-0008-Linux-5.0-compat-SIMD-compatibility.patch
-0009-Fix-CONFIG_X86_DEBUG_FPU-build-failure.patch
-0010-SIMD-FPU-register-save-restore-is-also-required-on-5.patch
+0004-import-with-d-dev-disk-by-id-in-scan-service.patch
+0005-Enable-zed-emails.patch
+0006-dont-symlink-zed-scripts.patch
+0007-Add-systemd-unit-for-importing-specific-pools.patch
+0008-Patch-move-manpage-arcstat-1-to-arcstat-8.patch
+0009-arcstat-Fix-integer-division-with-python3.patch
+0010-arc-stat-summary-guard-access-to-l2arc-MFU-MRU-stats.patch
+0011-Avoid-save-restoring-AMX-registers-to-avoid-a-SPR-er.patch

debian/rules

@@ -5,12 +5,12 @@ include /usr/share/dpkg/default.mk
 VERSION := $(DEB_VERSION_UPSTREAM)
 REVISION := $(shell echo $(DEB_VERSION) | cut -d- -f2)
 
-SPHINX_BUILD = $(shell dpkg -L python3-sphinx | grep "sphinx-build$$")
+SPHINX_BUILD = $(shell dpkg -L python3-sphinx | grep -m 1 "/sphinx-build$$")
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
-	dh $@ --with autoreconf,python3,systemd,sphinxdoc --parallel
+	dh $@ --with autoreconf,python3,sphinxdoc
 
 adapt_meta_file:
 	@# Embed the downstream version in the module.
@@ -28,17 +28,31 @@ override_dh_auto_configure:
 	dh_auto_configure -- \
 	  --bindir=/usr/bin \
 	  --sbindir=/sbin \
-	  --libdir=/lib \
+	  --libdir=/lib/"$(DEB_HOST_MULTIARCH)" \
 	  --with-udevdir=/lib/udev \
 	  --with-zfsexecdir=/usr/lib/zfs-linux \
 	  --enable-systemd \
 	  --enable-pyzfs \
+	  --with-python=python3 \
+	  --with-pammoduledir='/lib/$(DEB_HOST_MULTIARCH)/security' \
+	  --with-pkgconfigdir='/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig' \
 	  --with-systemdunitdir=/lib/systemd/system \
 	  --with-systemdpresetdir=/lib/systemd/system-preset \
 	  --with-systemdgeneratordir=/lib/systemd/system-generators \
 	  --with-config=user
 
+	for i in $(wildcard $(CURDIR)/debian/*.install.in) ; do \
+		basename "$$i" | grep _KVERS_ && continue ; \
+		sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' "$$i" > "$${i%%.in}" ; \
+	done
+
 override_dh_auto_test:
+override_dh_auto_test:
+ifeq (amd64,$(DEB_HOST_ARCH))
+	# Upstream provides an ABI guarantee that we validate here
+	-$(MAKE) checkabi
+endif
+
 	# The dh_auto_test rule is disabled because
 	# `make check` cannot run in an unprivileged build environment.
 
@@ -61,9 +75,9 @@ override_dh_auto_install:
 	@# Zed has dependencies outside of the system root.
 	mv '$(CURDIR)/debian/tmp/sbin/zed' '$(CURDIR)/debian/tmp/usr/sbin/zed'
 
-	mkdir -p $(CURDIR)/debian/tmp/usr/lib
-	for i in `ls $(CURDIR)/debian/tmp/lib/*.so`; do \
-		ln -s /lib/`readlink $${i}` $(CURDIR)/debian/tmp/usr/lib/`basename $${i}`; \
+	mkdir -p $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
+	for i in `ls $(CURDIR)/debian/tmp/lib/$(DEB_HOST_MULTIARCH)/*.so`; do \
+		ln -s /lib/$(DEB_HOST_MULTIARCH)/`readlink $${i}` $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/`basename $${i}`; \
 		rm $${i}; \
 	done
 
@@ -76,16 +90,9 @@ override_dh_python3:
 
 override_dh_makeshlibs:
 	dh_makeshlibs -a -V
-ifeq ($(BUILD_UDEB), true)
-	dh_makeshlibs -V -plibnvpair1linux
-	dh_makeshlibs -V -plibuutil1linux
-	dh_makeshlibs -V -plibzfs2linux
-	dh_makeshlibs -V -plibzpool2linux
-	dh_makeshlibs -V -pzfsutils-linux
-endif
 
 override_dh_strip:
-	dh_strip --dbg-package=zfs-dbg
+	dh_strip --dbgsym-migration='zfs-dbg (<< 2.0.4~)'
 
 override_dh_auto_clean:
 	find . -name .gitignore -delete
@@ -94,8 +101,19 @@ override_dh_auto_clean:
 	@if test -e META.orig; then mv META.orig META; fi
 
 override_dh_install:
-	find . -name lib*.la -delete
-	dh_install --fail-missing
+	find debian/tmp/lib -name *.la -delete
+	dh_install
+
+override_dh_missing:
+	dh_missing --fail-missing
+
+override_dh_installsystemd:
+	# these to lines prevent the restarting of all systemd services, except
+	# zfs-zed - they should not be restarted (importing, mounting, creating
+	# links in /dev, and can cause erros in the log
+	# (upon major.minor change)
+	dh_installsystemd --no-stop-on-upgrade -X zfs-zed.service
+	dh_installsystemd --name zfs-zed
 
 override_dh_installdocs:
 	dh_installdocs

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

@@ -1,9 +1,45 @@
 #!/bin/sh -eu
 
-# Scrub all healthy pools.
+# directly exit successfully when zfs module is not loaded
+if ! [ -d /sys/module/zfs ]; then
+	exit 0
+fi
+
+# [auto] / enable / disable
+PROPERTY_NAME="org.debian:periodic-scrub"
+
+get_property () {
+	# Detect the ${PROPERTY_NAME} property on a given pool.
+	# We are abusing user-defined properties on the root dataset,
+	# 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 || return 1
+}
+
+scrub_if_not_scrub_in_progress () {
+	pool="$1"
+	if ! zpool status "${pool}" | grep -q "scrub in progress"; then
+		# Ignore errors and continue with scrubbing other pools.
+		zpool scrub "${pool}" || true
+	fi
+}
+
+# Scrub all healthy pools that are not already scrubbing as per their configs.
 zpool list -H -o health,name 2>&1 | \
-	awk 'BEGIN {FS="\t"} {if ($1 ~ /^ONLINE/) print $2}' | \
+	awk -F'\t' '$1 == "ONLINE" {print $2}' | \
 while read pool
 do
-	zpool scrub "$pool"
+	# read user-defined config
+	ret=$(get_property "${pool}")
+	if [ $? -ne 0 ] || [ "disable" = "${ret}" ]; then
+		:
+	elif [ "-" = "${ret}" ] || [ "auto" = "${ret}" ] || [ "enable" = "${ret}" ]; then
+		scrub_if_not_scrub_in_progress "${pool}"
+	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
+	fi
 done

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

@@ -0,0 +1,69 @@
+#!/bin/sh -u
+
+# directly exit successfully when zfs module is not loaded
+if ! [ -d /sys/module/zfs ]; then
+	exit 0
+fi
+
+# [auto] / enable / disable
+PROPERTY_NAME="org.debian:periodic-trim"
+
+get_property () {
+	# Detect the ${PROPERTY_NAME} property on a given pool.
+	# We are abusing user-defined properties on the root dataset,
+	# 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
+}
+
+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
+		zpool trim "${pool}"
+	fi
+}
+
+# Walk up the kernel parent names:
+# this will catch devices from LVM &a.
+get_transp () {
+	dev="$1"
+	while pd="$(lsblk -dnr -o PKNAME "$dev")"; do
+		if [ -z "$pd" ]; then
+			break
+		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
+do
+	# read user-defined config
+	ret=$(get_property "${pool}") || continue
+	case "${ret}" in
+		disable);;
+		enable)	trim_if_not_already_trimming "${pool}" ;;
+		-|auto)	if pool_is_nvme_only "${pool}"; then trim_if_not_already_trimming "${pool}"; fi ;;
+		*)	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
+done

debian/zfs-dracut.install

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

debian/zfs-initramfs.lintian-overrides

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

debian/zfs-initramfs.triggers

@@ -1 +0,0 @@
-activate update-initramfs

debian/zfs-test.lintian-overrides

@@ -1 +1,13 @@
-zfs-test: arch-dependent-file-in-usr-share
+arch-dependent-file-in-usr-share
+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*
+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/common.sh*
+script-not-executable *usr/share/zfs/zfs-tests/include/default.cfg*
+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/cli_root/zpool_wait/zpool_wait.kshlib*
+script-not-executable *usr/share/zfs/zfs-tests/tests/functional/l2arc/l2arc.cfg*
+script-not-executable *usr/share/zfs/zfs-tests/tests/functional/redacted_send/redacted.kshlib*

debian/zfs-zed.lintian-overrides

@@ -0,0 +1,4 @@
+
+script-not-executable
+# https://github.com/zfsonlinux/zfs/issues/8064
+systemd-service-file-refers-to-unusual-wantedby-target

debian/zfs-zed.postinst

@@ -0,0 +1,20 @@
+#!/bin/sh
+set -e
+
+zedd="/usr/lib/zfs-linux/zed.d"
+etcd="/etc/zfs/zed.d"
+
+# enable all default zedlets that are not overridden
+while read -r file ; do
+    etcfile="${etcd}/${file}"
+    [ -e "${etcfile}" ] && continue
+    ln -sfT "${zedd}/${file}" "${etcfile}"
+done < "${zedd}/DEFAULT-ENABLED"
+
+# remove the overrides created in prerm
+find "${etcd}" -maxdepth 1 -lname '/dev/null' -delete
+# remove any dangling symlinks to old zedlets
+find "${etcd}" -maxdepth 1 -lname "${zedd}/*" -xtype l  -delete
+
+#DEBHELPER#
+

debian/zfs-zed.postrm

@@ -0,0 +1,17 @@
+#!/bin/sh
+set -e
+
+zedd="/usr/lib/zfs-linux/zed.d"
+etcd="/etc/zfs/zed.d"
+
+if [ "$1" = "purge" ] && [ -d "$etcd" ] ; then
+    # remove the overrides created in prerm
+    find "${etcd}" -maxdepth 1 -lname '/dev/null' -delete
+    # remove any dangling symlinks to old zedlets
+    find "${etcd}" -maxdepth 1 -lname "${zedd}/*" -xtype l  -delete
+    # clean up any empty directories
+    ( rmdir "$etcd" && rmdir "/etc/zfs" ) || true
+fi
+
+#DEBHELPER#
+

debian/zfs-zed.prerm

@@ -0,0 +1,16 @@
+#!/bin/sh
+set -e
+
+zedd="/usr/lib/zfs-linux/zed.d"
+etcd="/etc/zfs/zed.d"
+
+if [ "$1" != "failed-upgrade" ] && [ -d "${etcd}" ] && [ -d "${zedd}" ] ; then
+    while read -r file ; do
+        etcfile="${etcd}/${file}"
+        ( [ -L "${etcfile}" ] || [ -e "${etcfile}" ] ) && continue
+        ln -sT /dev/null "${etcfile}"
+    done < "${zedd}/DEFAULT-ENABLED"
+fi
+
+#DEBHELPER#
+

debian/zfsutils-linux.cron.d

@@ -1,4 +1,7 @@
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 
+# TRIM the first Sunday of every month.
+24 0 1-7 * * root if [ $(date +\%w) -eq 0 ] && [ -x /usr/lib/zfs-linux/trim ]; then /usr/lib/zfs-linux/trim; fi
+
 # Scrub the second Sunday of every month.
-24 0 8-14 * * root [ $(date +\%w) -eq 0 ] && [ -x /usr/lib/zfs-linux/scrub ] && /usr/lib/zfs-linux/scrub
+24 0 8-14 * * root if [ $(date +\%w) -eq 0 ] && [ -x /usr/lib/zfs-linux/scrub ]; then /usr/lib/zfs-linux/scrub; fi

debian/zfsutils-linux.install

@@ -5,9 +5,17 @@ etc/zfs/zpool.d/
 lib/systemd/system-preset/
 lib/systemd/system/zfs-import-cache.service
 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
 lib/systemd/system/zfs.target
 lib/systemd/system-generators/zfs-mount-generator
 lib/udev/
@@ -15,25 +23,110 @@ sbin/fsck.zfs
 sbin/mount.zfs
 sbin/zdb
 sbin/zfs
+sbin/zfs_ids_to_path
+sbin/zgenhostid
 sbin/zhack
 sbin/zpool
+sbin/zstream
 sbin/zstreamdump
-usr/bin/zgenhostid
+usr/bin/zvol_wait
 usr/lib/modules-load.d/ lib/
+usr/lib/zfs-linux/zfs_prepare_disk
 usr/lib/zfs-linux/zpool.d/
+usr/lib/zfs-linux/zpool_influxdb
 usr/sbin/arc_summary
 usr/sbin/arcstat
 usr/sbin/dbufstat
 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
 usr/share/man/man8/zdb.8
-usr/share/man/man8/zfs.8
+usr/share/man/man8/zfs-allow.8
+usr/share/man/man8/zfs-bookmark.8
+usr/share/man/man8/zfs-change-key.8
+usr/share/man/man8/zfs-clone.8
+usr/share/man/man8/zfs-create.8
+usr/share/man/man8/zfs-destroy.8
+usr/share/man/man8/zfs-diff.8
+usr/share/man/man8/zfs-get.8
+usr/share/man/man8/zfs-groupspace.8
+usr/share/man/man8/zfs-hold.8
+usr/share/man/man8/zfs-inherit.8
+usr/share/man/man8/zfs-jail.8
+usr/share/man/man8/zfs-list.8
+usr/share/man/man8/zfs-load-key.8
 usr/share/man/man8/zfs-mount-generator.8
+usr/share/man/man8/zfs-mount.8
+usr/share/man/man8/zfs_prepare_disk.8
 usr/share/man/man8/zfs-program.8
+usr/share/man/man8/zfs-project.8
+usr/share/man/man8/zfs-projectspace.8
+usr/share/man/man8/zfs-promote.8
+usr/share/man/man8/zfs-receive.8
+usr/share/man/man8/zfs-recv.8
+usr/share/man/man8/zfs-redact.8
+usr/share/man/man8/zfs-release.8
+usr/share/man/man8/zfs-rename.8
+usr/share/man/man8/zfs-rollback.8
+usr/share/man/man8/zfs-send.8
+usr/share/man/man8/zfs-set.8
+usr/share/man/man8/zfs-share.8
+usr/share/man/man8/zfs-snapshot.8
+usr/share/man/man8/zfs-unallow.8
+usr/share/man/man8/zfs-unjail.8
+usr/share/man/man8/zfs-unload-key.8
+usr/share/man/man8/zfs-unmount.8
+usr/share/man/man8/zfs-upgrade.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/zgenhostid.8
+usr/share/man/man8/zpool-add.8
+usr/share/man/man8/zpool-attach.8
+usr/share/man/man8/zpool-checkpoint.8
+usr/share/man/man8/zpool-clear.8
+usr/share/man/man8/zpool-create.8
+usr/share/man/man8/zpool-destroy.8
+usr/share/man/man8/zpool-detach.8
+usr/share/man/man8/zpool-events.8
+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
+usr/share/man/man8/zpool-list.8
+usr/share/man/man8/zpool-offline.8
+usr/share/man/man8/zpool-online.8
+usr/share/man/man8/zpool-reguid.8
+usr/share/man/man8/zpool-remove.8
+usr/share/man/man8/zpool-reopen.8
+usr/share/man/man8/zpool-replace.8
+usr/share/man/man8/zpool-resilver.8
+usr/share/man/man8/zpool-scrub.8
+usr/share/man/man8/zpool-set.8
+usr/share/man/man8/zpool-split.8
+usr/share/man/man8/zpool-status.8
+usr/share/man/man8/zpool-sync.8
+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/zstream.8
 usr/share/man/man8/zstreamdump.8
+usr/share/zfs/compatibility.d/

debian/zfsutils-linux.links

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

debian/zfsutils-linux.lintian-overrides

@@ -1 +1,13 @@
+spare-manual-page
 systemd-service-file-refers-to-unusual-wantedby-target
+binary-without-manpage *usr/sbin/dbufstat*
+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-scan.service*
+spelling-error-in-manpage
+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*
+extra-license-file *usr/share/doc/zfsutils-linux/LICENSE.gz*