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>
bump version to 2.0.7-pve1
2022-01-12 19:39:12 +01:00 · 2022-01-12 18:48:41 +01:00 · 2022-01-12 18:46:00 +01:00 · 2022-01-12 18:46:00 +01:00 · 2021-09-28 09:19:31 +02:00 · 2021-09-28 09:18:24 +02:00
37 changed files with 368 additions and 1298 deletions
@@ -1,7 +0,0 @@
 /*.build
 /*.buildinfo
 /*.changes
 /*.deb
 /*.dsc
 /*.tar*
 /zfs-utils-*.*/
@@ -1,93 +1,82 @@
 include /usr/share/dpkg/default.mk
 # source form https://github.com/zfsonlinux/
-PACKAGE = zfs-linux
+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
-SRCDIR = upstream
+ZFS_DEB1= libnvpair3linux_${ZFSPKGVER}_amd64.deb
 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		\
+libpam-zfs_${ZFSPKGVER}_amd64.deb		\
-libuutil3linux_$(DEB_VERSION)_amd64.deb		\
+libuutil3linux_${ZFSPKGVER}_amd64.deb		\
-libzfs4linux_$(DEB_VERSION)_amd64.deb		\
+libzfs4linux_${ZFSPKGVER}_amd64.deb		\
-libzfsbootenv1linux_$(DEB_VERSION)_amd64.deb	\
+libzfsbootenv1linux_${ZFSPKGVER}_amd64.deb	\
-libzpool5linux_$(DEB_VERSION)_amd64.deb		\
+libzpool4linux_${ZFSPKGVER}_amd64.deb		\
-zfs-test_$(DEB_VERSION)_amd64.deb			\
+zfs-test_${ZFSPKGVER}_amd64.deb			\
-zfsutils-linux_$(DEB_VERSION)_amd64.deb		\
+zfsutils-linux_${ZFSPKGVER}_amd64.deb		\
-zfs-zed_$(DEB_VERSION)_amd64.deb
+zfs-zed_${ZFSPKGVER}_amd64.deb
-ZFS_DBG_DEBS = $(patsubst %_$(DEB_VERSION)_amd64.deb, %-dbgsym_$(DEB_VERSION)_amd64.deb, $(ZFS_DEB1) $(ZFS_DEB_BINARY))
+ZFS_DBG_DEBS = $(patsubst %_${ZFSPKGVER}_amd64.deb, %-dbgsym_${ZFSPKGVER}_amd64.deb, ${ZFS_DEB1} ${ZFS_DEB_BINARY})
-ZFS_DEB2= $(ZFS_DEB_BINARY)			\
+ZFS_DEB2= ${ZFS_DEB_BINARY}			\
-libzfslinux-dev_$(DEB_VERSION)_amd64.deb		\
+libzfslinux-dev_${ZFSPKGVER}_amd64.deb		\
-python3-pyzfs_$(DEB_VERSION)_amd64.deb		\
+python3-pyzfs_${ZFSPKGVER}_amd64.deb		\
-pyzfs-doc_$(DEB_VERSION)_all.deb			\
+pyzfs-doc_${ZFSPKGVER}_all.deb			\
-spl_$(DEB_VERSION)_all.deb			\
+spl_${ZFSPKGVER}_all.deb			\
-zfs-initramfs_$(DEB_VERSION)_all.deb
+zfs-initramfs_${ZFSPKGVER}_all.deb
-DEBS= $(ZFS_DEB1) $(ZFS_DEB2) $(ZFS_DBG_DEBS)
+DEBS= ${ZFS_DEB1} ${ZFS_DEB2} ${ZFS_DBG_DEBS}
-ZFS_DSC = zfs-linux_$(DEB_VERSION).dsc
+ZFS_DSC = zfs-linux_${ZFSPKGVER}.dsc
 all: deb
-
+.PHONY: deb
-.PHONY: deb dsc
+deb: ${DEBS}
-deb: $(DEBS)
+.PHONY: dsc
-
+dsc: ${ZFS_DSC}
 dsc:
 	rm -rf *.dsc $(BUILDDIR)
 	$(MAKE) $(ZFS_DSC)
 	lintian $(ZFS_DSC)
 # called from pve-kernel's Makefile to get patched sources
 .PHONY: kernel
-kernel: $(ZFS_DSC)
+kernel: dsc
-	dpkg-source -x $(ZFS_DSC) ../pkg-zfs
+	dpkg-source -x ${ZFS_DSC} ../pkg-zfs
-	$(MAKE) -C ../pkg-zfs -f debian/rules adapt_meta_file
+	${MAKE} -C ../pkg-zfs -f debian/rules adapt_meta_file
 .PHONY: dinstall
-dinstall: $(DEBS)
+dinstall: ${DEBS}
-	dpkg -i $(DEBS)
+	dpkg -i ${DEBS}
 .PHONY: submodule
 submodule:
-	test -f "$(SRCDIR)/README.md" || git submodule update --init
+	test -f "${ZFSSRC}/README.md" || git submodule update --init
-
+${ZFSSRC}/README.md: submodule
 $(SRCDIR)/README.md: submodule
 .PHONY: zfs
-zfs: $(DEBS)
+zfs: ${DEBS}
-$(ZFS_DEB2) $(ZFS_DBG_DEBS): $(ZFS_DEB1)
+${ZFS_DEB2}: ${ZFS_DEB1}
-$(ZFS_DEB1): $(BUILDDIR)
+${ZFS_DEB1}: ${ZFSDIR}
-	cd $(BUILDDIR); dpkg-buildpackage -b -uc -us
+	cd ${ZFSDIR}; dpkg-buildpackage -b -uc -us
-	lintian $(DEBS)
+	lintian ${DEBS}
-$(ORIG_SRC_TAR): $(BUILDDIR)
+${ZFS_DSC}: ${ZFSDIR}
-	tar czf $(ORIG_SRC_TAR) --exclude="$(BUILDDIR)/debian" $(BUILDDIR)
+	tar czf zfs-linux_${ZFSVER}.orig.tar.gz ${ZFSDIR}
 	cd ${ZFSDIR}; dpkg-buildpackage -S -uc -us -d
 	lintian $@
-$(ZFS_DSC): $(BUILDDIR) $(ORIG_SRC_TAR)
+${ZFSDIR}: ${ZFSSRC}/README.md ${ZFSSRC} ${ZFSPKG}
-	cd $(BUILDDIR); dpkg-buildpackage -S -uc -us -d
+	rm -rf ${ZFSDIR} ${ZFSDIR}.tmp
 	cp -a ${ZFSSRC} ${ZFSDIR}.tmp
 	cp -a ${ZFSPKG} ${ZFSDIR}.tmp/debian
 	mv ${ZFSDIR}.tmp ${ZFSDIR}
 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 $(PACKAGE)-[0-9]*/
+	rm -rf *~ *.deb *.changes *.buildinfo *.dsc *.orig.tar.* *.debian.tar.* ${ZFSDIR}
 	rm -f *~ *.deb *.changes *.buildinfo *.build *.dsc *.orig.tar.* *.debian.tar.*
 .PHONY: distclean
 distclean: clean
 .PHONY: upload
-upload: UPLOAD_DIST ?= $(DEB_DISTRIBUTION)
+upload: ${DEBS}
-upload: $(DEBS)
+	tar -cf - ${DEBS} | ssh repoman@repo.proxmox.com -- upload --product pve,pmg,pbs --dist buster --arch amd64
 	tar -cf - $(DEBS) | ssh repoman@repo.proxmox.com -- upload --product pve,pmg,pbs --dist $(UPLOAD_DIST) --arch $(DEB_HOST_ARCH)
@@ -1,142 +1,20 @@
-zfs-linux (2.2.0-pve3) bookworm; urgency=medium
+zfs-linux (2.0.7-pve1) buster; urgency=medium
-  * pick bug-fixes staged for 2.2.1:
+  * update ZFS to 2.0.7
    - add a tunable to disable BRT support and disable it by default
    - fix block cloning between unencrypted and encrypted datasets
    - disable block cloning by default
- -- Proxmox Support Team <support@proxmox.com>  Fri, 17 Nov 2023 17:32:58 +0100
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 12 Jan 2022 18:46:26 +0100
-zfs-linux (2.2.0-pve2) bookworm; urgency=medium
+zfs-linux (2.0.6-pve1~bpo10+1) buster; urgency=medium
-  * avoid error from zfs-mount when /etc/exports.d does not exist (yet)
+  * update ZFS to 2.0.6
-  * ensure vdev_stat struct layout compat between 2.1 and 2.2, avoiding
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 28 Sep 2021 09:19:18 +0200
    false-positive detection of the non-allocating feature from 2.2 when the
    kernel still used the 2.1 module.
- -- Proxmox Support Team <support@proxmox.com>  Sun, 12 Nov 2023 16:02:02 +0100
+zfs-linux (2.0.5-pve1~bpo10+1) buster; urgency=medium
-zfs-linux (2.2.0-pve1) bookworm; urgency=medium
+  * Rebuild for buster based releases
-  * update ZFS to 2.2.0
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 21 Jul 2021 18:01:07 +0200
  * zfsutils-linux:
    - install new systemd units to trim a pool periodically
    - ship new `zilstat` binary
    - and new man pages for zfs lock, zfs unlock and vdev properties
    - remove man pages for zfs jail and zfs unjail, those are for FreeBSD only
      and the respective commands where never exposed for Linux
  * fix #5014: re-enable blk-mq optimization
 -- Proxmox Support Team <support@proxmox.com>  Sun, 15 Oct 2023 12:09:24 +0200
 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
@@ -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}
@@ -151,7 +145,6 @@ Section: contrib/doc
 Architecture: all
 Depends:
 ${sphinxdoc:Depends},
 ${sphinxdoc:Built-Using},
 ${misc:Depends}
 Recommends:
 python3-pyzfs
@@ -187,24 +180,11 @@ 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
-Depends: python3, ${misc:Depends}, ${shlibs:Depends}
+Depends: python3, ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}
-Recommends: zfs-zed
+Recommends: lsb-base, zfs-zed
 Suggests: nfs-kernel-server,
          samba-common-bin (>= 3.0.23),
          zfs-initramfs
@@ -224,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,
@@ -286,3 +265,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,
         libzpool4linux-dbgsym,
         zfs-test-dbgsym,
         zfsutils-linux-dbgsym,
         zfs-zed-dbgsym,
 Description: Transitional package. It can be safely removed.
@@ -37,26 +37,25 @@ Copyright: 2011, 2013, Nexenta Systems, Inc.
           2007, 2009, Sun Microsystems, Inc.
 License: CDDL-1.0
-Files: cmd/arc_summary
+Files: cmd/arc_summary/*
 Copyright:
  2010, 2011, Jason J. Hellenthal <jhell@DataIX.net>
  2010, Martin Matuska <mm@FreeBSD.org>
  2008, Ben Rockwood <benr@cuddletech.com>
  2017, Scot W. Stevenson <scot.stevenson@gmail.com>
 License: BSD-2-clause
-Files: cmd/arcstat.in
+Files: cmd/arcstat/*
 Source: http://github.com/mharsch/arcstat
 Copyright:
  2007, Oracle and/or its affiliates.
  2010-2015, Mike Harsch
 License: CDDL-1.0
-Files: cmd/dbufstat.in
+Files: cmd/dbufstat/*
 Copyright: 2013, Lawrence Livermore National Security, LLC
 License: CDDL-1.0
-Files: cmd/mount_zfs.c
+Files: cmd/mount_zfs/*
 Copyright: 2011, Lawrence Livermore National Security, LLC
           2005, 2010, Oracle and/or its affiliates.
 License: CDDL-1.0
@@ -65,7 +64,7 @@ Files: cmd/raidz_test/*
 Copyright: 2016 Gvozden Nešković.
 License: CDDL-1.0
-Files: udev/vdev_id
+Files: cmd/vdev_id/*
 Copyright: 2011, 2013, Nexenta Systems, Inc.
           2007, 2009, Sun Microsystems, Inc.
 License: CDDL-1.0
@@ -107,7 +106,7 @@ Copyright:
  2018 Datto Inc.
 License: CDDL-1.0
-Files: cmd/zhack.c
+Files: cmd/zhack/*
 Copyright: 2013, Steven Hartland.
           2011, 2012, 2014, Delphix.
 License: CDDL-1.0
@@ -133,14 +132,14 @@ Copyright:
 2017, Intel Corporation.
 License: CDDL-1.0
-Files: cmd/zstream/*
+Files: cmd/zstreamdump/*
 Copyright:
-  2013, 2015 Delphix.
+  2013, Delphix.
  2012, Martin Matuska <martin@matuska.org>
  2010, Sun Microsystems, Inc.
 License: CDDL-1.0
-Files: cmd/ztest.c
+Files: cmd/ztest/*
 Copyright:
  2005, 2010, Oracle and/or its affiliates.
  2011, 2018 by Delphix.
@@ -151,7 +150,7 @@ Copyright:
  2017, Intel Corporation.
 License: CDDL-1.0
-Files: udev/zvol_id.c
+Files: cmd/zvol_id/*
 Copyright: 2011, Fajar A. Nugraha.
 License: CDDL-1.0
@@ -159,6 +158,27 @@ Files: config/*
 Copyright: 1996-2012, Free Software Foundation, Inc.
 License: GPL-2+ with autoconf exception
 Files: config/ltoptions.m4
       config/lt~obsolete.m4
       config/ltversion.m4
       config/libtool.m4
       config/ltsugar.m4
 Copyright: 1996-2012, Free Software Foundation, Inc.
 License: PERMISSIVE
 This file is free software; the Free Software Foundation gives
 unlimited permission to copy and/or distribute it, with or without
 modifications, as long as this notice is preserved.
 Files: config/install-sh
 Copyright: 1994, X Consortium
 License: Expat
 Files: configure
 Copyright: 1992-1996, 1998-2010, Free Software
 License: PERMISSIVE2
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 Files: contrib/bash_completion.d/*
 Copyright: 2010, 2013, Aneurin Price <aneurin.price@gmail.com>
 License: Expat
@@ -181,8 +201,14 @@ Copyright:
 2011-2013, Darik Horn <dajhorn@vanadac.com>
 2018-2019, Mo Zhou <cdluminate@gmail.com>
 2018-2020, Mo Zhou <lumin@debian.org>
 2015-2021 Proxmox Server Solutions GmbH <support@proxmox.com>
 License: GPL-2+
 Files: debian/po/*
 Copyright:
 2013, The Debian po file translators.
 License: CDDL-1.0
 Files: etc/init.d/zfs-*.in
 Copyright:
  2016, Carlo Landmeter <clandmeter@gmail.com>
@@ -373,7 +399,12 @@ Copyright: 2009, Oracle and/or its affiliates.
  2009, Michael Gebetsroither <michael.geb@gmx.at>
 License: CDDL-1.0
-Files: man/man7/zpool-features.7
+Files: man/man5/zfs-events.5
       man/man5/zfs-module-parameters.5
 Copyright: 2013, Turbo Fredriksson <turbo@bayour.com>
 License: CDDL-1.0
 Files: man/man5/zpool-features.5
 Copyright:
  2013, Delphix
  2013, Saso Kiselkov
@@ -396,12 +427,16 @@ Copyright: 2007, Sun Microsystems, Inc.
  2013, Delphix
 License: CDDL-1.0
 Files: man/man8/zstreamdump.8
 Copyright: 2009, Sun Microsystems, Inc.
 License: CDDL-1.0
 Files: module/*
 Copyright: 2011-2014, Delphix.
  2007, 2009, 2010, Sun Microsystems, Inc.
 License: CDDL-1.0
-Files: module/lua/*
+Files: module/lua
 Copyright: 1994-2015 Lua.org, PUC-Rio.
 License: Expat
@@ -448,7 +483,7 @@ Copyright: 2013, Saso Kiselkov.
  2005, 2010, Oracle and/or its affiliates.
 License: CDDL-1.0
-Files: module/os/linux/zfs/zfs_uio.c
+Files: module/zcommon/zfs_uio.c
 Copyright: 2007, 2009, 2010, Sun Microsystems, Inc.
  1983-1989, AT&T
  1982, 1986, 1988, The Regents of the University of California
@@ -548,6 +583,7 @@ Files: module/zfs/dmu_zfetch.c
  module/zfs/rrwlock.c
  module/zfs/space_map.c
  module/zfs/space_reftree.c
  module/zfs/vdev_cache.c
  module/zfs/vdev_mirror.c
  module/zfs/vdev_missing.c
  module/zfs/vdev_queue.c
@@ -615,16 +651,14 @@ Copyright: 2013, Steven Hartland.
 License: CDDL-1.0
 Files: module/zfs/gzip.c
  module/zfs/sha256.c
  module/zfs/spa_boot.c
  module/zfs/unique.c
  module/zfs/zfs_byteswap.c
  module/zfs/zle.c
 Copyright: 2005-2010, Sun Microsystems, Inc.
 License: CDDL-1.0
 Files: module/icp/algs/sha2/*
 Copyright: 2022, Tino Reichardt <milky-zfs@mcmilk.de>
 License: CDDL-1.0
 Files: module/zfs/lz4.c
 Copyright: 2011-2013, Yann Collet
 License: BSD-2-clause
@@ -663,14 +697,13 @@ Copyright: 2011, 2014, Nexenta Systems, Inc.
  2005, 2010, Oracle and/or its affiliates.
 License: CDDL-1.0
-Files: module/os/linux/zfs/vdev_disk.c
+Files: module/zfs/vdev_disk.c
 Copyright: 2012, 2014, Delphix.
  2008-2010, Lawrence Livermore National Security, LLC
 License: CDDL-1.0
-Files: module/os/freebsd/zfs/zfs_ctldir.c
+Files: module/zfs/zfs_ctldir.c
-  module/os/linux/zfs/zfs_ctldir.c
+Copyright: 2013, Delphix.
 Copyright: 2013, 2015 Delphix.
  2011, Lawrence Livermore National Security, LLC
  2005, 2010, Oracle and/or its affiliates.
 License: CDDL-1.0
@@ -693,8 +726,7 @@ Copyright: 2013, Delphix.
  2005, 2010, Oracle and/or its affiliates.
 License: CDDL-1.0
-Files: module/os/freebsd/zfs/zfs_vfsops.c
+Files: module/zfs/zfs_vfsops.c
  module/os/linux/zfs/zfs_vfsops.c
  module/zfs/zil.c
 Copyright: 2011-2014, Delphix.
  2010, Robert Milkowski
@@ -709,9 +741,8 @@ Copyright: 2015, Chunwei Chen.
  2005, 2010, Oracle and/or its affiliates.
 License: CDDL-1.0
-Files: module/os/freebsd/zfs/zfs_znode.c
+Files: module/zfs/zfs_znode.c
-  module/os/linux/zfs/zfs_znode.c
+Copyright: 2013, Delphix.
 Copyright: 2013, 2015 Delphix.
  2007, Jeremy Teo
  2005, 2010, Oracle and/or its affiliates.
 License: CDDL-1.0
@@ -722,20 +753,20 @@ Copyright: 2013, Saso Kiselkov.
  2009, Sun Microsystems, Inc.
 License: CDDL-1.0
-Files: module/os/linux/zfs/zpl_ctldir.c
+Files: module/zfs/zpl_ctldir.c
-  module/os/linux/zfs/zpl_super.c
+  module/zfs/zpl_super.c
-  module/os/linux/zfs/zpl_xattr.c
+  module/zfs/zpl_xattr.c
  module/zfs/zvol.c
 Copyright: 2008-2011, Lawrence Livermore National Security, LLC
 License: CDDL-1.0
-Files: module/os/linux/zfs/zpl_export.c
+Files: module/zfs/zpl_export.c
 Copyright: 2012, Cyril Plisko.
  2011, Gunnar Beutner
 License: CDDL-1.0
-Files: module/os/linux/zfs/zpl_file.c
+Files: module/zfs/zpl_file.c
-  module/os/linux/zfs/zpl_inode.c
+  module/zfs/zpl_inode.c
 Copyright: 2015, Chunwei Chen.
  2011, Lawrence Livermore National Security, LLC
 License: CDDL-1.0
@@ -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
@@ -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')
@@ -13,15 +13,15 @@ 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 be2fc6734..7606604ec 100644
+index 008075138..570e27707 100644
 --- a/etc/systemd/system/zfs-zed.service.in
 +++ b/etc/systemd/system/zfs-zed.service.in
-@@ -5,7 +5,7 @@ ConditionPathIsDirectory=/sys/module/zfs
+@@ -4,7 +4,7 @@ Documentation=man:zed(8)
 ConditionPathIsDirectory=/sys/module/zfs
 [Service]
 EnvironmentFile=-@initconfdir@/zfs
 -ExecStart=@sbindir@/zed -F
 +ExecStart=/usr/sbin/zed -F
- Restart=always
+ Restart=on-abort
 [Install]
@@ -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 c5dd45d87..1c792edf0 100644
+index f0317e23e..9a5e9cb17 100644
 --- a/etc/systemd/system/zfs-import-scan.service.in
 +++ b/etc/systemd/system/zfs-import-scan.service.in
-@@ -14,7 +14,7 @@ ConditionPathIsDirectory=/sys/module/zfs
+@@ -13,7 +13,7 @@ ConditionPathIsDirectory=/sys/module/zfs
 [Service]
 Type=oneshot
 RemainAfterExit=yes
- EnvironmentFile=-@initconfdir@/zfs
+-ExecStart=@sbindir@/zpool import -aN -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
 +ExecStart=@sbindir@/zpool import -aN -d /dev/disk/by-id -o cachefile=none $ZPOOL_IMPORT_OPTS
 [Install]
 WantedBy=zfs-import.target
@@ -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 78dc1afc7..41d5539ea 100644
+index 1c278b2ef..41c075c09 100644
 --- a/cmd/zed/zed.d/zed.rc
 +++ b/cmd/zed/zed.d/zed.rc
-@@ -41,7 +41,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.
 #
@@ -3,44 +3,27 @@ From: Antonio Russo <antonio.e.russo@gmail.com>
 Date: Fri, 20 Mar 2020 17:28:43 +0100
 Subject: [PATCH] dont symlink zed scripts
-Of the zedlet scripts shipped by upstream, a subset are enabled by
+(cherry picked and adapted from 5cee380324d74e640d5dd7a360faba3994c8007f [0])
 default, by creating symlinks in /etc/zfs/zed.d.  These symlinks are
 shipped in the zfs-zed package.  dpkg, however, does not support
 conffile handling of symlinks, and therefore any changes (removals) to
 the symlinks are not preserved on package upgrade.
-To address this policy violation, we:
+[0] https://salsa.debian.org/zfsonlinux-team/zfs.git
- 1. During package build, create a list of enabled-by-default zedlets,
+Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
    instead of creating symlinks.
 2. On package removal, identify all enabled-by-default zedlets whose
    symlinks do not exist (i.e., were removed by the user). This is done
    by creating "whiteout" links to /dev/null in their place).
 3. On package installation, create links to enabled-by-default zedlets
    UNLESS there is already a file there (i.e., abort if there is a
    whiteout link).
 4. We also clean up broken symlinks to removed zedlets at package
    postinst.
 Description: track default symlinks, instead of symlinking
 Forwarded: no need
 (cherry picked from https://salsa.debian.org/zfsonlinux-team/zfs/-/commit/5cee380324d7)
 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 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 812558cf6..f802cf140 100644
+index 8b2d0c200..118c96547 100644
 --- a/cmd/zed/zed.d/Makefile.am
 +++ b/cmd/zed/zed.d/Makefile.am
-@@ -48,7 +48,7 @@ zed-install-data-hook:
+@@ -48,6 +48,6 @@ install-data-hook:
- 	set -x; for f in $(zedconfdefaults); do \
+ 	for f in $(zedconfdefaults); do \
- 	  [ -f "$(DESTDIR)$(zedconfdir)/$${f}" ] ||\
+ 	  test -f "$(DESTDIR)$(zedconfdir)/$${f}" -o \
- 	    [ -L "$(DESTDIR)$(zedconfdir)/$${f}" ] || \
+ 	       -L "$(DESTDIR)$(zedconfdir)/$${f}" || \
-	    $(LN_S) "$(zedexecdir)/$${f}" "$(DESTDIR)$(zedconfdir)"; \
+-	    ln -s "$(zedexecdir)/$${f}" "$(DESTDIR)$(zedconfdir)"; \
 +	    echo "$${f}" >> "$(DESTDIR)$(zedexecdir)/DEFAULT-ENABLED" ; \
 	done
- 
+ 	chmod 0600 "$(DESTDIR)$(zedconfdir)/zed.rc"
 SHELLCHECKSCRIPTS += $(dist_zedconf_DATA) $(dist_zedexec_SCRIPTS) $(nodist_zedexec_SCRIPTS)
@@ -0,0 +1,55 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Antonio Russo <antonio.e.russo@gmail.com>
 Date: Tue, 5 May 2020 22:15:16 -0600
 Subject: [PATCH] Use installed python3
 ---
 .../functional/cli_root/zfs_program/zfs_program_json.ksh    | 6 +++---
 .../tests/functional/rsend/send_encrypted_files.ksh         | 2 +-
 .../tests/functional/rsend/send_realloc_dnode_size.ksh      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
 diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_program/zfs_program_json.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_program/zfs_program_json.ksh
 index 3788543b0..c7ee4ae9a 100755
 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_program/zfs_program_json.ksh
 +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_program/zfs_program_json.ksh
@@ -100,10 +100,10 @@ typeset -a pos_cmds_out=(
 # the same as the input and the --sort-keys option was added.  Detect when
 # --sort-keys is supported and apply the option to ensure the expected order.
 #
 -if python -m json.tool --sort-keys <<< "{}"; then
 -	JSON_TOOL_CMD="python -m json.tool --sort-keys"
 +if python3 -m json.tool --sort-keys <<< "{}"; then
 +	JSON_TOOL_CMD="python3 -m json.tool --sort-keys"
 else
 -	JSON_TOOL_CMD="python -m json.tool"
 +	JSON_TOOL_CMD="python3 -m json.tool"
 fi
 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 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
 # 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' | \
 +log_must eval "python3 -c 'print \"a\" * 4096' | \
 	set_xattr_stdin bigval /$TESTPOOL/$TESTFS2/attrs"
 log_must zfs set compression=off xattr=on $TESTPOOL/$TESTFS2
 diff --git a/tests/zfs-tests/tests/functional/rsend/send_realloc_dnode_size.ksh b/tests/zfs-tests/tests/functional/rsend/send_realloc_dnode_size.ksh
 index 551ed15db..bd30488ea 100755
 --- a/tests/zfs-tests/tests/functional/rsend/send_realloc_dnode_size.ksh
 +++ b/tests/zfs-tests/tests/functional/rsend/send_realloc_dnode_size.ksh
@@ -88,7 +88,7 @@ log_must zfs snapshot $POOL/fs@c
 # 4. Create an empty file and add xattrs to it to exercise reclaiming a
 #    dnode that requires more than 1 slot for its bonus buffer (Zol #7433)
 log_must zfs set compression=on xattr=sa $POOL/fs
 -log_must eval "python -c 'print \"a\" * 512' |
 +log_must eval "python3 -c 'print \"a\" * 512' |
     set_xattr_stdin bigval /$POOL/fs/attrs"
 log_must zfs snapshot $POOL/fs@d
@@ -11,30 +11,17 @@ 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/Makefile.am                           |  1 +
+ etc/systemd/system/50-zfs.preset.in       |  1 +
- etc/systemd/system/50-zfs.preset          |  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/Makefile.am b/etc/Makefile.am
+diff --git a/etc/systemd/system/50-zfs.preset.in b/etc/systemd/system/50-zfs.preset.in
 index 7187762d3..de131dc87 100644
 --- a/etc/Makefile.am
 +++ b/etc/Makefile.am
@@ -54,6 +54,7 @@ dist_systemdpreset_DATA = \
 systemdunit_DATA = \
 	%D%/systemd/system/zfs-import-cache.service \
 	%D%/systemd/system/zfs-import-scan.service \
 +	%D%/systemd/system/zfs-import@.service \
 	%D%/systemd/system/zfs-import.target \
 	%D%/systemd/system/zfs-mount.service \
 	%D%/systemd/system/zfs-scrub-monthly@.timer \
 diff --git a/etc/systemd/system/50-zfs.preset b/etc/systemd/system/50-zfs.preset
 index e4056a92c..030611419 100644
--- a/etc/systemd/system/50-zfs.preset
+--- a/etc/systemd/system/50-zfs.preset.in
-+++ b/etc/systemd/system/50-zfs.preset
+++ b/etc/systemd/system/50-zfs.preset.in
@@ -1,6 +1,7 @@
 # ZFS is enabled by default
 enable zfs-import-cache.service
@@ -43,6 +30,18 @@ index e4056a92c..030611419 100644
 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 c374a52ac..25d1b99d7 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
@@ -1,52 +0,0 @@
 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 36c1aede1..94fd96e58 100644
 --- a/man/Makefile.am
 +++ b/man/Makefile.am
@@ -2,7 +2,6 @@ dist_noinst_man_MANS = \
 	%D%/man1/cstyle.1
 dist_man_MANS = \
 -	%D%/man1/arcstat.1 \
 	%D%/man1/raidz_test.1 \
 	%D%/man1/test-runner.1 \
 	%D%/man1/zhack.1 \
@@ -22,6 +21,7 @@ dist_man_MANS = \
 	%D%/man7/zpoolconcepts.7 \
 	%D%/man7/zpoolprops.7 \
 	\
 +	%D%/man8/arcstat.8 \
 	%D%/man8/fsck.zfs.8 \
 	%D%/man8/mount.zfs.8 \
 	%D%/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 82358fa68..a8fb55498 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 December 23, 2022
 -.Dt ARCSTAT 1
 +.Dt ARCSTAT 8
 .Os
 .
 .Sh NAME
@@ -0,0 +1,54 @@
 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>
 ---
 man/man1/Makefile.am                   | 2 +-
 man/man8/Makefile.am                   | 1 +
 man/{man1/arcstat.1 => man8/arcstat.8} | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
 rename man/{man1/arcstat.1 => man8/arcstat.8} (99%)
 diff --git a/man/man1/Makefile.am b/man/man1/Makefile.am
 index 8d7457a3e..101af7b6c 100644
 --- a/man/man1/Makefile.am
 +++ b/man/man1/Makefile.am
@@ -1,4 +1,4 @@
 -dist_man_MANS = zhack.1 ztest.1 raidz_test.1 zvol_wait.1 arcstat.1
 +dist_man_MANS = zhack.1 ztest.1 raidz_test.1 zvol_wait.1
 EXTRA_DIST = cstyle.1
 if BUILD_LINUX
 diff --git a/man/man8/Makefile.am b/man/man8/Makefile.am
 index 07f6aefa6..a757b1c62 100644
 --- a/man/man8/Makefile.am
 +++ b/man/man8/Makefile.am
@@ -1,6 +1,7 @@
 include $(top_srcdir)/config/Substfiles.am
 dist_man_MANS = \
 +	arcstat.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 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.
 .\"
 -.TH ARCSTAT 1 "Oct 20, 2020" OpenZFS
 +.TH ARCSTAT 8 "Oct 20, 2020" OpenZFS
 .SH NAME
 arcstat \- report ZFS ARC and L2ARC statistics
 .SH SYNOPSIS
@@ -1,113 +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>
 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 ---
 cmd/arc_summary | 28 ++++++++++++++--------------
 cmd/arcstat.in  | 14 +++++++-------
 2 files changed, 21 insertions(+), 21 deletions(-)
 diff --git a/cmd/arc_summary b/cmd/arc_summary
 index 426e02070..9de198150 100755
 --- a/cmd/arc_summary
 +++ b/cmd/arc_summary
@@ -655,13 +655,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()
@@ -851,20 +851,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.in b/cmd/arcstat.in
 index 8df1c62f7..833348d0e 100755
 --- a/cmd/arcstat.in
 +++ b/cmd/arcstat.in
@@ -565,8 +565,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
@@ -581,11 +581,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"]
@@ -1,99 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tony Hutter <hutter2@llnl.gov>
 Date: Mon, 23 Oct 2023 14:45:06 -0700
 Subject: [PATCH] zvol: Remove broken blk-mq optimization
 This fix removes a dubious optimization in zfs_uiomove_bvec_rq()
 that saved the iterator contents of a rq_for_each_segment().  This
 optimization allowed restoring the "saved state" from a previous
 rq_for_each_segment() call on the same uio so that you wouldn't
 need to iterate though each bvec on every zfs_uiomove_bvec_rq() call.
 However, if the kernel is manipulating the requests/bios/bvecs under
 the covers between zfs_uiomove_bvec_rq() calls, then it could result
 in corruption from using the "saved state".  This optimization
 results in an unbootable system after installing an OS on a zvol
 with blk-mq enabled.
 Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Signed-off-by: Tony Hutter <hutter2@llnl.gov>
 Closes #15351
 (cherry picked from commit 7c9b6fed16ed5034fd1cdfdaedfad93dc97b1557)
 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 ---
 include/os/linux/spl/sys/uio.h |  8 --------
 module/os/linux/zfs/zfs_uio.c  | 29 -----------------------------
 2 files changed, 37 deletions(-)
 diff --git a/include/os/linux/spl/sys/uio.h b/include/os/linux/spl/sys/uio.h
 index cce097e16..a4b600004 100644
 --- a/include/os/linux/spl/sys/uio.h
 +++ b/include/os/linux/spl/sys/uio.h
@@ -73,13 +73,6 @@ typedef struct zfs_uio {
 	size_t		uio_skip;
 	struct request	*rq;
 -
 -	/*
 -	 * Used for saving rq_for_each_segment() state between calls
 -	 * to zfs_uiomove_bvec_rq().
 -	 */
 -	struct req_iterator iter;
 -	struct bio_vec bv;
 } zfs_uio_t;
@@ -138,7 +131,6 @@ zfs_uio_bvec_init(zfs_uio_t *uio, struct bio *bio, struct request *rq)
 	} else {
 		uio->uio_bvec = NULL;
 		uio->uio_iovcnt = 0;
 -		memset(&uio->iter, 0, sizeof (uio->iter));
 	}
 	uio->uio_loffset = io_offset(bio, rq);
 diff --git a/module/os/linux/zfs/zfs_uio.c b/module/os/linux/zfs/zfs_uio.c
 index 3efd4ab15..c2ed67c43 100644
 --- a/module/os/linux/zfs/zfs_uio.c
 +++ b/module/os/linux/zfs/zfs_uio.c
@@ -204,22 +204,6 @@ zfs_uiomove_bvec_rq(void *p, size_t n, zfs_uio_rw_t rw, zfs_uio_t *uio)
 	this_seg_start = orig_loffset;
 	rq_for_each_segment(bv, rq, iter) {
 -		if (uio->iter.bio) {
 -			/*
 -			 * If uio->iter.bio is present, then we know we've saved
 -			 * uio->iter from a previous call to this function, and
 -			 * we can skip ahead in this rq_for_each_segment() loop
 -			 * to where we last left off.  That way, we don't need
 -			 * to iterate over tons of segments we've already
 -			 * processed - we can just restore the "saved state".
 -			 */
 -			iter = uio->iter;
 -			bv = uio->bv;
 -			this_seg_start = uio->uio_loffset;
 -			memset(&uio->iter, 0, sizeof (uio->iter));
 -			continue;
 -		}
 -
 		/*
 		 * Lookup what the logical offset of the last byte of this
 		 * segment is.
@@ -260,19 +244,6 @@ zfs_uiomove_bvec_rq(void *p, size_t n, zfs_uio_rw_t rw, zfs_uio_t *uio)
 			copied = 1;	/* We copied some data */
 		}
 -		if (n == 0) {
 -			/*
 -			 * All done copying.  Save our 'iter' value to the uio.
 -			 * This allows us to "save our state" and skip ahead in
 -			 * the rq_for_each_segment() loop the next time we call
 -			 * call zfs_uiomove_bvec_rq() on this uio (which we
 -			 * will be doing for any remaining data in the uio).
 -			 */
 -			uio->iter = iter; /* make a copy of the struct data */
 -			uio->bv = bv;
 -			return (0);
 -		}
 -
 		this_seg_start = this_seg_end + 1;
 	}
@@ -1,123 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tony Hutter <hutter2@llnl.gov>
 Date: Mon, 23 Oct 2023 14:39:59 -0700
 Subject: [PATCH] Revert "zvol: Temporally disable blk-mq"
 This reverts commit aefb6a2bd6c24597cde655e9ce69edd0a4c34357.
 aefb6a2bd temporally disabled blk-mq until we could fix a fix for
 Signed-off-by: Tony Hutter <hutter2@llnl.gov>
 Closes #15439
 (cherry picked from commit 05c4710e8958832afc2868102c9535a4f18115be)
 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 ---
 man/man4/zfs.4                       | 57 ++++++++++++++++++++++++++++
 module/os/linux/zfs/zvol_os.c        | 12 ++++++
 tests/zfs-tests/include/tunables.cfg |  2 +-
 3 files changed, 70 insertions(+), 1 deletion(-)
 diff --git a/man/man4/zfs.4 b/man/man4/zfs.4
 index 71a3e67ee..cfadd79d8 100644
 --- a/man/man4/zfs.4
 +++ b/man/man4/zfs.4
@@ -2317,6 +2317,63 @@ If
 .Sy zvol_threads
 to the number of CPUs present or 32 (whichever is greater).
 .
 +.It Sy zvol_blk_mq_threads Ns = Ns Sy 0 Pq uint
 +The number of threads per zvol to use for queuing IO requests.
 +This parameter will only appear if your kernel supports
 +.Li blk-mq
 +and is only read and assigned to a zvol at zvol load time.
 +If
 +.Sy 0
 +(the default) then internally set
 +.Sy zvol_blk_mq_threads
 +to the number of CPUs present.
 +.
 +.It Sy zvol_use_blk_mq Ns = Ns Sy 0 Ns | Ns 1 Pq uint
 +Set to
 +.Sy 1
 +to use the
 +.Li blk-mq
 +API for zvols.
 +Set to
 +.Sy 0
 +(the default) to use the legacy zvol APIs.
 +This setting can give better or worse zvol performance depending on
 +the workload.
 +This parameter will only appear if your kernel supports
 +.Li blk-mq
 +and is only read and assigned to a zvol at zvol load time.
 +.
 +.It Sy zvol_blk_mq_blocks_per_thread Ns = Ns Sy 8 Pq uint
 +If
 +.Sy zvol_use_blk_mq
 +is enabled, then process this number of
 +.Sy volblocksize Ns -sized blocks per zvol thread.
 +This tunable can be use to favor better performance for zvol reads (lower
 +values) or writes (higher values).
 +If set to
 +.Sy 0 ,
 +then the zvol layer will process the maximum number of blocks
 +per thread that it can.
 +This parameter will only appear if your kernel supports
 +.Li blk-mq
 +and is only applied at each zvol's load time.
 +.
 +.It Sy zvol_blk_mq_queue_depth Ns = Ns Sy 0 Pq uint
 +The queue_depth value for the zvol
 +.Li blk-mq
 +interface.
 +This parameter will only appear if your kernel supports
 +.Li blk-mq
 +and is only applied at each zvol's load time.
 +If
 +.Sy 0
 +(the default) then use the kernel's default queue depth.
 +Values are clamped to the kernel's
 +.Dv BLKDEV_MIN_RQ
 +and
 +.Dv BLKDEV_MAX_RQ Ns / Ns Dv BLKDEV_DEFAULT_RQ
 +limits.
 +.
 .It Sy zvol_volmode Ns = Ns Sy 1 Pq uint
 Defines zvol block devices behaviour when
 .Sy volmode Ns = Ns Sy default :
 diff --git a/module/os/linux/zfs/zvol_os.c b/module/os/linux/zfs/zvol_os.c
 index 76521c959..7a95b54bd 100644
 --- a/module/os/linux/zfs/zvol_os.c
 +++ b/module/os/linux/zfs/zvol_os.c
@@ -1620,6 +1620,18 @@ MODULE_PARM_DESC(zvol_prefetch_bytes, "Prefetch N bytes at zvol start+end");
 module_param(zvol_volmode, uint, 0644);
 MODULE_PARM_DESC(zvol_volmode, "Default volmode property value");
 +#ifdef HAVE_BLK_MQ
 +module_param(zvol_blk_mq_queue_depth, uint, 0644);
 +MODULE_PARM_DESC(zvol_blk_mq_queue_depth, "Default blk-mq queue depth");
 +
 +module_param(zvol_use_blk_mq, uint, 0644);
 +MODULE_PARM_DESC(zvol_use_blk_mq, "Use the blk-mq API for zvols");
 +
 +module_param(zvol_blk_mq_blocks_per_thread, uint, 0644);
 +MODULE_PARM_DESC(zvol_blk_mq_blocks_per_thread,
 +    "Process volblocksize blocks per thread");
 +#endif
 +
 #ifndef HAVE_BLKDEV_GET_ERESTARTSYS
 module_param(zvol_open_timeout_ms, uint, 0644);
 MODULE_PARM_DESC(zvol_open_timeout_ms, "Timeout for ZVOL open retries");
 diff --git a/tests/zfs-tests/include/tunables.cfg b/tests/zfs-tests/include/tunables.cfg
 index 8010a9451..80e7bcb3b 100644
 --- a/tests/zfs-tests/include/tunables.cfg
 +++ b/tests/zfs-tests/include/tunables.cfg
@@ -89,7 +89,7 @@ VDEV_VALIDATE_SKIP		vdev.validate_skip		vdev_validate_skip
 VOL_INHIBIT_DEV			UNSUPPORTED			zvol_inhibit_dev
 VOL_MODE			vol.mode			zvol_volmode
 VOL_RECURSIVE			vol.recursive			UNSUPPORTED
 -VOL_USE_BLK_MQ			UNSUPPORTED			UNSUPPORTED
 +VOL_USE_BLK_MQ			UNSUPPORTED			zvol_use_blk_mq
 XATTR_COMPAT			xattr_compat			zfs_xattr_compat
 ZEVENT_LEN_MAX			zevent.len_max			zfs_zevent_len_max
 ZEVENT_RETAIN_MAX		zevent.retain_max		zfs_zevent_retain_max
@@ -1,76 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: siv0 <github@nomore.at>
 Date: Tue, 31 Oct 2023 21:57:54 +0100
 Subject: [PATCH] Fix nfs_truncate_shares without /etc/exports.d
 Calling nfs_reset_shares on Linux prints a warning:
 `failed to lock /etc/exports.d/zfs.exports.lock: No such file or
 directory`
 when /etc/exports.d does not exist. The directory gets created, when a
 filesystem is actually exported through nfs_toggle_share and
 nfs_init_share. The truncation of /etc/exports.d/zfs.exports happens
 unconditionally when calling `zfs mount -a` (via zfs_do_mount and
 share_mount in `cmd/zfs/zfs_main.c`).
 Fixing the issue only in the Linux part, since the exports file on
 freebsd is in `/etc/zfs/`, which seems present on 2 FreeBSD systems I
 have access to (through `/etc/zfs/compatibility.d/`), while a Debian
 box does not have the directory even if `/usr/sbin/exportfs` is
 present through the `nfs-kernel-server` package.
 The code for exports_available is copied from nfs_available above.
 Fixes: ede037cda73675f42b1452187e8dd3438fafc220
 ("Make zfs-share service resilient to stale exports")
 Reviewed-by: Brian Atkinson <batkinson@lanl.gov>
 Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 Closes #15369
 Closes #15468
 (cherry picked from commit 41e55b476bcfc90f1ad81c02c5375367fdace9e9)
 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 ---
 lib/libshare/os/linux/nfs.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 diff --git a/lib/libshare/os/linux/nfs.c b/lib/libshare/os/linux/nfs.c
 index 004946b0c..3dce81840 100644
 --- a/lib/libshare/os/linux/nfs.c
 +++ b/lib/libshare/os/linux/nfs.c
@@ -47,6 +47,7 @@
 static boolean_t nfs_available(void);
 +static boolean_t exports_available(void);
 typedef int (*nfs_shareopt_callback_t)(const char *opt, const char *value,
     void *cookie);
@@ -539,6 +540,8 @@ nfs_commit_shares(void)
 static void
 nfs_truncate_shares(void)
 {
 +	if (!exports_available())
 +		return;
 	nfs_reset_shares(ZFS_EXPORTS_LOCK, ZFS_EXPORTS_FILE);
 }
@@ -566,3 +569,18 @@ nfs_available(void)
 	return (avail == 1);
 }
 +
 +static boolean_t
 +exports_available(void)
 +{
 +	static int avail;
 +
 +	if (!avail) {
 +		if (access(ZFS_EXPORTS_DIR, F_OK) != 0)
 +			avail = -1;
 +		else
 +			avail = 1;
 +	}
 +
 +	return (avail == 1);
 +}
@@ -1,72 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tony Hutter <hutter2@llnl.gov>
 Date: Thu, 9 Nov 2023 16:43:35 -0800
 Subject: [PATCH] Workaround UBSAN errors for variable arrays
 This gets around UBSAN errors when using arrays at the end of
 structs.  It converts some zero-length arrays to variable length
 arrays and disables UBSAN checking on certain modules.
 It is based off of the patch from #15460.
 Addresses: #15145
 Signed-off-by: Tony Hutter <hutter2@llnl.gov>
 Co-authored-by: Tony Hutter <hutter2@llnl.gov>
 Co-authored-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 ---
 include/os/linux/spl/sys/kmem_cache.h | 2 +-
 include/sys/vdev_raidz_impl.h         | 4 ++--
 module/Kbuild.in                      | 4 ++++
 3 files changed, 7 insertions(+), 3 deletions(-)
 diff --git a/include/os/linux/spl/sys/kmem_cache.h b/include/os/linux/spl/sys/kmem_cache.h
 index 20eeadc46..82d50b603 100644
 --- a/include/os/linux/spl/sys/kmem_cache.h
 +++ b/include/os/linux/spl/sys/kmem_cache.h
@@ -108,7 +108,7 @@ typedef struct spl_kmem_magazine {
 	uint32_t		skm_refill;	/* Batch refill size */
 	struct spl_kmem_cache	*skm_cache;	/* Owned by cache */
 	unsigned int		skm_cpu;	/* Owned by cpu */
 -	void			*skm_objs[0];	/* Object pointers */
 +	void			*skm_objs[];	/* Object pointers */
 } spl_kmem_magazine_t;
 typedef struct spl_kmem_obj {
 diff --git a/include/sys/vdev_raidz_impl.h b/include/sys/vdev_raidz_impl.h
 index c1037fa12..73c26dff1 100644
 --- a/include/sys/vdev_raidz_impl.h
 +++ b/include/sys/vdev_raidz_impl.h
@@ -130,7 +130,7 @@ typedef struct raidz_row {
 	uint64_t rr_offset;		/* Logical offset for *_io_verify() */
 	uint64_t rr_size;		/* Physical size for *_io_verify() */
 #endif
 -	raidz_col_t rr_col[0];		/* Flexible array of I/O columns */
 +	raidz_col_t rr_col[];		/* Flexible array of I/O columns */
 } raidz_row_t;
 typedef struct raidz_map {
@@ -139,7 +139,7 @@ typedef struct raidz_map {
 	int rm_nskip;			/* RAIDZ sectors skipped for padding */
 	int rm_skipstart;		/* Column index of padding start */
 	const raidz_impl_ops_t *rm_ops;	/* RAIDZ math operations */
 -	raidz_row_t *rm_row[0];		/* flexible array of rows */
 +	raidz_row_t *rm_row[];		/* flexible array of rows */
 } raidz_map_t;
 diff --git a/module/Kbuild.in b/module/Kbuild.in
 index c13217159..b9c284a24 100644
 --- a/module/Kbuild.in
 +++ b/module/Kbuild.in
@@ -488,6 +488,10 @@ zfs-$(CONFIG_ARM64) += $(addprefix zfs/,$(ZFS_OBJS_ARM64))
 zfs-$(CONFIG_PPC)   += $(addprefix zfs/,$(ZFS_OBJS_PPC_PPC64))
 zfs-$(CONFIG_PPC64) += $(addprefix zfs/,$(ZFS_OBJS_PPC_PPC64))
 +UBSAN_SANITIZE_zap_leaf.o := n
 +UBSAN_SANITIZE_zap_micro.o := n
 +UBSAN_SANITIZE_sa.o := n
 +
 # Suppress incorrect warnings from versions of objtool which are not
 # aware of x86 EVEX prefix instructions used for AVX512.
 OBJECT_FILES_NON_STANDARD_vdev_raidz_math_avx512bw.o := y
@@ -1,66 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Thomas Lamprecht <t.lamprecht@proxmox.com>
 Date: Sun, 12 Nov 2023 15:52:25 +0100
 Subject: [PATCH] zpool status: tighten bounds for noalloc stat availabillity
 When running zfs 2.2.0 userspace utilities with a kernel that still
 has 2.1.13 modules zpool status adds `(non-allocating)` next to the
 disk name of a single-disk pool.
 The reason for this seems to be that the patch adding the `vs_pspace` field was
 backported, but the one adding `vs_noalloc` was not.
 Itself that is not a problem, but in 2.2 `noalloc` was added before `psspace`,
 so the struct layout between 2.1.13 and 2.2.0 do NOT match anymore...
 I.e., the struct looks like the following at the end for ZFS 2.1.x:
 ```
 typedef struct vdev_stat {
    hrtime_t        vs_timestamp;           /* time since vdev load */
    // snip
    uint64_t        vs_logical_ashift;      /* vdev_logical_ashift  */
    uint64_t        vs_physical_ashift;     /* vdev_physical_ashift */
    uint64_t        vs_pspace;              /* physical capacity */
 } vdev_stat_t;
 ```
 And like the following on ZFS 2.2.x:
 ```
 typedef struct vdev_stat {
    hrtime_t        vs_timestamp;           /* time since vdev load */
    // snip
    uint64_t        vs_logical_ashift;      /* vdev_logical_ashift  */
    uint64_t        vs_physical_ashift;     /* vdev_physical_ashift */
    uint64_t        vs_noalloc;             /* allocations halted?  */
    uint64_t        vs_pspace;              /* physical capacity */
 } vdev_stat_t;
 ```
 Resulting in 2.2.x user-space tooling interpreting the `vs_pspace` field from
 the 2.1.x kernel module as `vs_noalloc` field.
 For now, work-around that discrepancy by coupling the availability of
 the vs_noalloc field with the one of the vs_pspace one, as when both
 are returned from the module we can be sure that our struct layout
 matches again.
 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 ---
 cmd/zpool/zpool_main.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
 diff --git a/cmd/zpool/zpool_main.c b/cmd/zpool/zpool_main.c
 index 5507f9d3f..98970abfe 100644
 --- a/cmd/zpool/zpool_main.c
 +++ b/cmd/zpool/zpool_main.c
@@ -2478,7 +2478,8 @@ print_status_config(zpool_handle_t *zhp, status_cbdata_t *cb, const char *name,
 	if (vs->vs_scan_removing != 0) {
 		(void) printf(gettext("  (removing)"));
 -	} else if (VDEV_STAT_VALID(vs_noalloc, vsc) && vs->vs_noalloc != 0) {
 +	} else if (VDEV_STAT_VALID(vs_pspace, vsc)
 +		       && VDEV_STAT_VALID(vs_noalloc, vsc) && vs->vs_noalloc != 0) {
 		(void) printf(gettext("  (non-allocating)"));
 	}
@@ -1,44 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Martin=20Matu=C5=A1ka?= <mm@FreeBSD.org>
 Date: Tue, 31 Oct 2023 21:49:41 +0100
 Subject: [PATCH] Fix block cloning between unencrypted and encrypted datasets
 Block cloning from an encrypted dataset into an unencrypted dataset
 and vice versa is not possible. The current code did allow cloning
 unencrypted files into an encrypted dataset causing a panic when
 these were accessed. Block cloning between encrypted and encrypted
 is currently supported on the same filesystem only.
 Reviewed-by: Alexander Motin <mav@FreeBSD.org>
 Reviewed-by: Kay Pedersen <mail@mkwg.de>
 Reviewed-by: Rob N <robn@despairlabs.com>
 Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Signed-off-by: Martin Matuska <mm@FreeBSD.org>
 Closes #15464
 Closes #15465
 (cherry picked from commit 459c99ff2339a4a514abcf2255f9b3e5324ef09e)
 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 ---
 module/zfs/zfs_vnops.c | 9 +++++++++
 1 file changed, 9 insertions(+)
 diff --git a/module/zfs/zfs_vnops.c b/module/zfs/zfs_vnops.c
 index 40d6c87a7..84e6b10ef 100644
 --- a/module/zfs/zfs_vnops.c
 +++ b/module/zfs/zfs_vnops.c
@@ -1094,6 +1094,15 @@ zfs_clone_range(znode_t *inzp, uint64_t *inoffp, znode_t *outzp,
 	ASSERT(!outzfsvfs->z_replay);
 +	/*
 +	 * Block cloning from an unencrypted dataset into an encrypted
 +	 * dataset and vice versa is not supported.
 +	 */
 +	if (inos->os_encrypted != outos->os_encrypted) {
 +		zfs_exit_two(inzfsvfs, outzfsvfs, FTAG);
 +		return (SET_ERROR(EXDEV));
 +	}
 +
 	error = zfs_verify_zp(inzp);
 	if (error == 0)
 		error = zfs_verify_zp(outzp);
@@ -1,201 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Rich Ercolani <214141+rincebrain@users.noreply.github.com>
 Date: Thu, 16 Nov 2023 14:35:22 -0500
 Subject: [PATCH] Add a tunable to disable BRT support.
 Copy the disable parameter that FreeBSD implemented, and extend it to
 work on Linux as well, until we're sure this is stable.
 Reviewed-by: Alexander Motin <mav@FreeBSD.org>
 Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Signed-off-by: Rich Ercolani <rincebrain@gmail.com>
 Closes #15529
 (cherry picked from commit 87e9e828655c250ce064874ff5df16f870c0a52e)
 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 ---
 include/os/freebsd/zfs/sys/zfs_vfsops_os.h        |  1 +
 include/os/linux/zfs/sys/zfs_vfsops_os.h          |  2 ++
 man/man4/zfs.4                                    |  5 +++++
 module/os/freebsd/zfs/zfs_vfsops.c                |  4 ++++
 module/os/freebsd/zfs/zfs_vnops_os.c              |  5 +++++
 module/os/linux/zfs/zfs_vnops_os.c                |  4 ++++
 module/os/linux/zfs/zpl_file_range.c              |  5 +++++
 tests/zfs-tests/include/libtest.shlib             | 15 +++++++++++++++
 tests/zfs-tests/include/tunables.cfg              |  1 +
 .../tests/functional/block_cloning/cleanup.ksh    |  4 ++++
 .../tests/functional/block_cloning/setup.ksh      |  5 +++++
 11 files changed, 51 insertions(+)
 diff --git a/include/os/freebsd/zfs/sys/zfs_vfsops_os.h b/include/os/freebsd/zfs/sys/zfs_vfsops_os.h
 index 24bb03575..56a0ac96a 100644
 --- a/include/os/freebsd/zfs/sys/zfs_vfsops_os.h
 +++ b/include/os/freebsd/zfs/sys/zfs_vfsops_os.h
@@ -286,6 +286,7 @@ typedef struct zfid_long {
 extern uint_t zfs_fsyncer_key;
 extern int zfs_super_owner;
 +extern int zfs_bclone_enabled;
 extern void zfs_init(void);
 extern void zfs_fini(void);
 diff --git a/include/os/linux/zfs/sys/zfs_vfsops_os.h b/include/os/linux/zfs/sys/zfs_vfsops_os.h
 index b4d5db21f..220466550 100644
 --- a/include/os/linux/zfs/sys/zfs_vfsops_os.h
 +++ b/include/os/linux/zfs/sys/zfs_vfsops_os.h
@@ -45,6 +45,8 @@ extern "C" {
 typedef struct zfsvfs zfsvfs_t;
 struct znode;
 +extern int zfs_bclone_enabled;
 +
 /*
  * This structure emulates the vfs_t from other platforms.  It's purpose
  * is to facilitate the handling of mount options and minimize structural
 diff --git a/man/man4/zfs.4 b/man/man4/zfs.4
 index cfadd79d8..32f1765a5 100644
 --- a/man/man4/zfs.4
 +++ b/man/man4/zfs.4
@@ -1137,6 +1137,11 @@ Selecting any option other than
 results in vector instructions
 from the respective CPU instruction set being used.
 .
 +.It Sy zfs_bclone_enabled Ns = Ns Sy 1 Ns | Ns 0 Pq int
 +Enable the experimental block cloning feature.
 +If this setting is 0, then even if feature@block_cloning is enabled,
 +attempts to clone blocks will act as though the feature is disabled.
 +.
 .It Sy zfs_blake3_impl Ns = Ns Sy fastest Pq string
 Select a BLAKE3 implementation.
 .Pp
 diff --git a/module/os/freebsd/zfs/zfs_vfsops.c b/module/os/freebsd/zfs/zfs_vfsops.c
 index e8b9ada13..09e18de81 100644
 --- a/module/os/freebsd/zfs/zfs_vfsops.c
 +++ b/module/os/freebsd/zfs/zfs_vfsops.c
@@ -89,6 +89,10 @@ int zfs_debug_level;
 SYSCTL_INT(_vfs_zfs, OID_AUTO, debug, CTLFLAG_RWTUN, &zfs_debug_level, 0,
 	"Debug level");
 +int zfs_bclone_enabled = 1;
 +SYSCTL_INT(_vfs_zfs, OID_AUTO, bclone_enabled, CTLFLAG_RWTUN,
 +	&zfs_bclone_enabled, 0, "Enable block cloning");
 +
 struct zfs_jailparam {
 	int mount_snapshot;
 };
 diff --git a/module/os/freebsd/zfs/zfs_vnops_os.c b/module/os/freebsd/zfs/zfs_vnops_os.c
 index c498a1328..f672deed3 100644
 --- a/module/os/freebsd/zfs/zfs_vnops_os.c
 +++ b/module/os/freebsd/zfs/zfs_vnops_os.c
@@ -6243,6 +6243,11 @@ zfs_freebsd_copy_file_range(struct vop_copy_file_range_args *ap)
 	int error;
 	uint64_t len = *ap->a_lenp;
 +	if (!zfs_bclone_enabled) {
 +		mp = NULL;
 +		goto bad_write_fallback;
 +	}
 +
 	/*
 	 * TODO: If offset/length is not aligned to recordsize, use
 	 * vn_generic_copy_file_range() on this fragment.
 diff --git a/module/os/linux/zfs/zfs_vnops_os.c b/module/os/linux/zfs/zfs_vnops_os.c
 index 33baac9db..76fac3a02 100644
 --- a/module/os/linux/zfs/zfs_vnops_os.c
 +++ b/module/os/linux/zfs/zfs_vnops_os.c
@@ -4229,4 +4229,8 @@ EXPORT_SYMBOL(zfs_map);
 module_param(zfs_delete_blocks, ulong, 0644);
 MODULE_PARM_DESC(zfs_delete_blocks, "Delete files larger than N blocks async");
 +/* CSTYLED */
 +module_param(zfs_bclone_enabled, uint, 0644);
 +MODULE_PARM_DESC(zfs_bclone_enabled, "Enable block cloning");
 +
 #endif
 diff --git a/module/os/linux/zfs/zpl_file_range.c b/module/os/linux/zfs/zpl_file_range.c
 index c47fe99da..73476ff40 100644
 --- a/module/os/linux/zfs/zpl_file_range.c
 +++ b/module/os/linux/zfs/zpl_file_range.c
@@ -31,6 +31,8 @@
 #include <sys/zfs_vnops.h>
 #include <sys/zfeature.h>
 +int zfs_bclone_enabled = 1;
 +
 /*
  * Clone part of a file via block cloning.
  *
@@ -50,6 +52,9 @@ __zpl_clone_file_range(struct file *src_file, loff_t src_off,
 	fstrans_cookie_t cookie;
 	int err;
 +	if (!zfs_bclone_enabled)
 +		return (-EOPNOTSUPP);
 +
 	if (!spa_feature_is_enabled(
 	    dmu_objset_spa(ITOZSB(dst_i)->z_os), SPA_FEATURE_BLOCK_CLONING))
 		return (-EOPNOTSUPP);
 diff --git a/tests/zfs-tests/include/libtest.shlib b/tests/zfs-tests/include/libtest.shlib
 index 844caa17d..d5d7bb6c8 100644
 --- a/tests/zfs-tests/include/libtest.shlib
 +++ b/tests/zfs-tests/include/libtest.shlib
@@ -3334,6 +3334,21 @@ function set_tunable_impl
 	esac
 }
 +function save_tunable
 +{
 +	[[ ! -d $TEST_BASE_DIR ]] && return 1
 +	[[ -e $TEST_BASE_DIR/tunable-$1 ]] && return 2
 +	echo "$(get_tunable """$1""")" > "$TEST_BASE_DIR"/tunable-"$1"
 +}
 +
 +function restore_tunable
 +{
 +	[[ ! -e $TEST_BASE_DIR/tunable-$1 ]] && return 1
 +	val="$(cat $TEST_BASE_DIR/tunable-"""$1""")"
 +	set_tunable64 "$1" "$val"
 +	rm $TEST_BASE_DIR/tunable-$1
 +}
 +
 #
 # Get a global system tunable
 #
 diff --git a/tests/zfs-tests/include/tunables.cfg b/tests/zfs-tests/include/tunables.cfg
 index 80e7bcb3b..a0edad14d 100644
 --- a/tests/zfs-tests/include/tunables.cfg
 +++ b/tests/zfs-tests/include/tunables.cfg
@@ -90,6 +90,7 @@ VOL_INHIBIT_DEV			UNSUPPORTED			zvol_inhibit_dev
 VOL_MODE			vol.mode			zvol_volmode
 VOL_RECURSIVE			vol.recursive			UNSUPPORTED
 VOL_USE_BLK_MQ			UNSUPPORTED			zvol_use_blk_mq
 +BCLONE_ENABLED			zfs_bclone_enabled		zfs_bclone_enabled
 XATTR_COMPAT			xattr_compat			zfs_xattr_compat
 ZEVENT_LEN_MAX			zevent.len_max			zfs_zevent_len_max
 ZEVENT_RETAIN_MAX		zevent.retain_max		zfs_zevent_retain_max
 diff --git a/tests/zfs-tests/tests/functional/block_cloning/cleanup.ksh b/tests/zfs-tests/tests/functional/block_cloning/cleanup.ksh
 index 7ac13adb6..b985445a5 100755
 --- a/tests/zfs-tests/tests/functional/block_cloning/cleanup.ksh
 +++ b/tests/zfs-tests/tests/functional/block_cloning/cleanup.ksh
@@ -31,4 +31,8 @@ verify_runnable "global"
 default_cleanup_noexit
 +if tunable_exists BCLONE_ENABLED ; then
 +	log_must restore_tunable BCLONE_ENABLED
 +fi
 +
 log_pass
 diff --git a/tests/zfs-tests/tests/functional/block_cloning/setup.ksh b/tests/zfs-tests/tests/functional/block_cloning/setup.ksh
 index 512f5a064..58441bf8f 100755
 --- a/tests/zfs-tests/tests/functional/block_cloning/setup.ksh
 +++ b/tests/zfs-tests/tests/functional/block_cloning/setup.ksh
@@ -33,4 +33,9 @@ fi
 verify_runnable "global"
 +if tunable_exists BCLONE_ENABLED ; then
 +    log_must save_tunable BCLONE_ENABLED
 +    log_must set_tunable32 BCLONE_ENABLED 1
 +fi
 +
 log_pass
@@ -1,42 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tony Hutter <hutter2@llnl.gov>
 Date: Thu, 16 Nov 2023 11:42:19 -0800
 Subject: [PATCH] zfs-2.2.1: Disable block cloning by default
 Disable block cloning by default to mitigate possible data corruption
 (see #15529 and #15526).
 Signed-off-by: Tony Hutter <hutter2@llnl.gov>
 (cherry picked from commit 479dca51c66a731e637bd2d4f9bba01a05f9ac9f)
 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 ---
 module/os/freebsd/zfs/zfs_vfsops.c   | 2 +-
 module/os/linux/zfs/zpl_file_range.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 diff --git a/module/os/freebsd/zfs/zfs_vfsops.c b/module/os/freebsd/zfs/zfs_vfsops.c
 index 09e18de81..0ac670ed9 100644
 --- a/module/os/freebsd/zfs/zfs_vfsops.c
 +++ b/module/os/freebsd/zfs/zfs_vfsops.c
@@ -89,7 +89,7 @@ int zfs_debug_level;
 SYSCTL_INT(_vfs_zfs, OID_AUTO, debug, CTLFLAG_RWTUN, &zfs_debug_level, 0,
 	"Debug level");
 -int zfs_bclone_enabled = 1;
 +int zfs_bclone_enabled = 0;
 SYSCTL_INT(_vfs_zfs, OID_AUTO, bclone_enabled, CTLFLAG_RWTUN,
 	&zfs_bclone_enabled, 0, "Enable block cloning");
 diff --git a/module/os/linux/zfs/zpl_file_range.c b/module/os/linux/zfs/zpl_file_range.c
 index 73476ff40..139c51cf4 100644
 --- a/module/os/linux/zfs/zpl_file_range.c
 +++ b/module/os/linux/zfs/zpl_file_range.c
@@ -31,7 +31,7 @@
 #include <sys/zfs_vnops.h>
 #include <sys/zfeature.h>
 -int zfs_bclone_enabled = 1;
 +int zfs_bclone_enabled = 0;
 /*
  * Clone part of a file via block cloning.
@@ -4,14 +4,6 @@
 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
+0007-Use-installed-python3.patch
-0008-Patch-move-manpage-arcstat-1-to-arcstat-8.patch
+0008-Add-systemd-unit-for-importing-specific-pools.patch
-0009-arc-stat-summary-guard-access-to-l2arc-MFU-MRU-stats.patch
+0009-Patch-move-manpage-arcstat-1-to-arcstat-8.patch
 0010-zvol-Remove-broken-blk-mq-optimization.patch
 0011-Revert-zvol-Temporally-disable-blk-mq.patch
 0012-Fix-nfs_truncate_shares-without-etc-exports.d.patch
 0013-Workaround-UBSAN-errors-for-variable-arrays.patch
 0014-zpool-status-tighten-bounds-for-noalloc-stat-availab.patch
 0015-Fix-block-cloning-between-unencrypted-and-encrypted-.patch
 0016-Add-a-tunable-to-disable-BRT-support.patch
 0017-zfs-2.2.1-Disable-block-cloning-by-default.patch
@@ -10,7 +10,7 @@ SPHINX_BUILD = $(shell dpkg -L python3-sphinx | grep -m 1 "/sphinx-build$$")
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 %:
-	dh $@ --with autoreconf,python3,sphinxdoc
+	dh $@ --with autoreconf,python3,sphinxdoc --parallel
 adapt_meta_file:
 	@# Embed the downstream version in the module.
@@ -60,6 +60,10 @@ override_dh_auto_install:
 	@# Install the utilities.
 	$(MAKE) install DESTDIR='$(CURDIR)/debian/tmp'
 	# Use upstream's bash completion
 	install -D -t '$(CURDIR)/debian/tmp/usr/share/bash-completion/completions/' \
 		'$(CURDIR)/contrib/bash_completion.d/zfs'
 	# Move from bin_dir to /usr/sbin
 	# Remove suffix (.py) as per policy 10.4 - Scripts
 	# https://www.debian.org/doc/debian-policy/ch-files.html#s-scripts
@@ -79,6 +83,7 @@ override_dh_auto_install:
 	chmod a-x '$(CURDIR)/debian/tmp/etc/zfs/zfs-functions'
 	chmod a-x '$(CURDIR)/debian/tmp/etc/default/zfs'
 	chmod a-x '$(CURDIR)/debian/tmp/usr/share/bash-completion/completions/zfs'
 override_dh_python3:
 	dh_python3 -p python3-pyzfs
@@ -86,6 +91,9 @@ override_dh_python3:
 override_dh_makeshlibs:
 	dh_makeshlibs -a -V
 override_dh_strip:
 	dh_strip --dbgsym-migration='zfs-dbg (<< 2.0.4~)'
 override_dh_auto_clean:
 	find . -name .gitignore -delete
 	rm -rf zfs-$(DEB_VERSION_UPSTREAM)
@@ -93,7 +101,7 @@ override_dh_auto_clean:
 	@if test -e META.orig; then mv META.orig META; fi
 override_dh_install:
-	find debian/tmp/lib -name '*.la' -delete
+	find debian/tmp/lib -name *.la -delete
 	dh_install
 override_dh_missing:
@@ -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)	if pool_is_nvme_only "${pool}"; then trim_if_not_already_trimming "${pool}"; fi ;;
+		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
@@ -1,2 +0,0 @@
 usr/lib/dracut
 usr/share/man/man7/dracut.zfs.7
@@ -1 +0,0 @@
 executable-not-elf-or-script *usr/share/initramfs-tools/scripts/zfs*
@@ -1,10 +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/*
+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/*]
+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/redacted_send/redacted.kshlib
 package-contains-documentation-outside-usr-share-doc usr/share/zfs/zfs-tests/*
@@ -8,15 +8,8 @@ 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-trim-monthly@.timer
 lib/systemd/system/zfs-trim-weekly@.timer
 lib/systemd/system/zfs-trim@.service
 lib/systemd/system/zfs-volume-wait.service
 lib/systemd/system/zfs-volumes.target
 lib/systemd/system/zfs.target
@@ -33,10 +26,8 @@ sbin/zpool
 sbin/zstream
 sbin/zstreamdump
 usr/bin/zvol_wait
 usr/bin/zilstat
 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
@@ -44,15 +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/vdevprops.7
 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
@@ -68,6 +51,7 @@ 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
@@ -87,14 +71,16 @@ 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-unzone.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/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
@@ -108,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
@@ -128,8 +113,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/zfs-zone.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/
@@ -1,3 +0,0 @@
 sbin/zfs      bin/zfs
 sbin/zpool    bin/zpool
 usr/lib/zfs-linux/zpool_influxdb  bin/zpool_influxdb
@@ -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
Author	SHA1	Message	Date
Thomas Lamprecht	8748101cc1	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>	2022-01-12 19:39:12 +01:00
Thomas Lamprecht	ff279e6b9b	bump version to 2.0.7-pve1 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2022-01-12 18:48:41 +01:00
Aron Xu	9b036161c8	d/rules: allow abigail to fail (cherry picked from debian upstream [0] commit 5ae98b5499022c2c127d546a7b5aeb906f6f2a6b) [0] https://salsa.debian.org/zfsonlinux-team/zfs Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>	2022-01-12 18:46:00 +01:00
Stoiko Ivanov	407d5004a2	update submodule and patches to ZFS 2.0.7 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>	2022-01-12 18:46:00 +01:00
Thomas Lamprecht	b7ce537d24	bump version to 2.0.6-pve1~bpo10+1 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2021-09-28 09:19:31 +02:00
Thomas Lamprecht	6eb925bd8a	drop already applied patches Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2021-09-28 09:18:24 +02:00
Thomas Lamprecht	a542d21db8	update submodule to zfs-2.0.6 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2021-09-28 09:16:51 +02:00
Thomas Lamprecht	19953df19b	cherry-pick "Revert Consolidate arc_buf allocation checks" see https://github.com/openzfs/zfs/issues/11531 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2021-09-08 16:20:54 +02:00
Thomas Lamprecht	337bdb0b13	bump version to 2.0.5-pve1~bpo10+1 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2021-07-21 18:12:55 +02:00
Thomas Lamprecht	bc8bb69f8c	buildsys: move upload target back to buster for oldstable backport Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2021-07-21 17:57:48 +02:00
`@@ -1,2 +1,2 @@`
	`package-name-doesnt-match-sonames`	`package-name-doesnt-match-sonames`
	`extra-license-file usr/share/doc/libzfsbootenv1linux/LICENSE.gz`	`extra-license-file usr/share/doc/libzfsbootenv1linux/LICENSE.gz`
		`@@ -1,2 +0,0 @@`
			`usr/lib/dracut`
			`usr/share/man/man7/dracut.zfs.7`
		`@@ -1 +0,0 @@`
			`executable-not-elf-or-script usr/share/initramfs-tools/scripts/zfs`