bump version to 2.1.15-pve1

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
d/zfsutils-linux.install: add zfs_prepare_disk and manpage
2024-03-29 15:22:26 +01:00 · 2024-03-29 15:22:26 +01:00 · 2024-03-29 15:18:12 +01:00 · 2023-12-01 14:37:07 +01:00 · 2023-12-01 13:47:21 +01:00 · 2023-12-01 13:46:48 +01:00
101 changed files with 5071 additions and 7113 deletions
@@ -0,0 +1,7 @@
 /*.build
 /*.buildinfo
 /*.changes
 /*.deb
 /*.dsc
 /*.tar*
 /zfs-utils-*.*/
@@ -1,6 +1,3 @@
-[submodule "zfs-debian"]
+[submodule "zfs/upstream"]
-	path = zfs-debian
+	path = upstream
-	url = ../mirror_zfs-debian
+	url = ../mirror_zfs
 [submodule "spl-debian"]
 	path = spl-debian
 	url = ../mirror_spl-debian
@@ -1,83 +1,93 @@
-RELEASE=5.1
+include /usr/share/dpkg/default.mk
 # source form https://github.com/zfsonlinux/
-ZFSVER=0.7.12
+PACKAGE = zfs-linux
 ZFSPKGREL=pve1~bpo1
 SPLPKGREL=pve1~bpo1
 ZFSPKGVER=${ZFSVER}-${ZFSPKGREL}
 SPLPKGVER=${ZFSVER}-${SPLPKGREL}
-SPLDIR=spl-build
+SRCDIR = upstream
-SPLSRC=spl-debian
+BUILDDIR ?= $(PACKAGE)-$(DEB_VERSION_UPSTREAM)
-ZFSDIR=zfs-build
+ORIG_SRC_TAR = $(PACKAGE)_$(DEB_VERSION_UPSTREAM).orig.tar.gz
 ZFSSRC=zfs-debian
-SPL_DEB = 					\
+ZFS_DEB1= libnvpair3linux_$(DEB_VERSION)_amd64.deb
 spl_${SPLPKGVER}_amd64.deb
-ZFS_DEB1= libnvpair1linux_${ZFSPKGVER}_amd64.deb
+ZFS_DEB_BINARY =				\
-ZFS_DEB2= 					\
+libpam-zfs_$(DEB_VERSION)_amd64.deb		\
-libuutil1linux_${ZFSPKGVER}_amd64.deb		\
+libuutil3linux_$(DEB_VERSION)_amd64.deb		\
-libzfs2linux_${ZFSPKGVER}_amd64.deb		\
+libzfs4linux_$(DEB_VERSION)_amd64.deb		\
-libzfslinux-dev_${ZFSPKGVER}_amd64.deb		\
+libzfsbootenv1linux_$(DEB_VERSION)_amd64.deb	\
-libzpool2linux_${ZFSPKGVER}_amd64.deb		\
+libzpool5linux_$(DEB_VERSION)_amd64.deb		\
-zfs-dbg_${ZFSPKGVER}_amd64.deb			\
+zfs-test_$(DEB_VERSION)_amd64.deb			\
-zfs-zed_${ZFSPKGVER}_amd64.deb			\
+zfsutils-linux_$(DEB_VERSION)_amd64.deb		\
-zfs-initramfs_${ZFSPKGVER}_all.deb		\
+zfs-zed_$(DEB_VERSION)_amd64.deb
 zfs-test_${ZFSPKGVER}_amd64.deb		\
 zfsutils-linux_${ZFSPKGVER}_amd64.deb
 ZFS_DEBS= $(ZFS_DEB1) $(ZFS_DEB2)
-DEBS=${SPL_DEB} ${ZFS_DEBS}
+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
-deb: ${DEBS}
+
 .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: $(ZFS_DSC)
 	dpkg-source -x $(ZFS_DSC) ../pkg-zfs
 	$(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 "${ZFSSRC}/debian/changelog" || git submodule update --init
+	test -f "$(SRCDIR)/README.md" || git submodule update --init
 	test -f "${SPLSRC}/debian/changelog" || git submodule update --init
-.PHONY: spl
+$(SRCDIR)/README.md: submodule
 spl: ${SPL_DEB}
 ${SPL_DEB}: ${SPLSRC}
 	rm -rf ${SPLDIR}
 	mkdir ${SPLDIR}
 	cp -a ${SPLSRC}/* ${SPLDIR}/
 	mv ${SPLDIR}/debian/changelog ${SPLDIR}/debian/changelog.org
 	cat spl-changelog.Debian ${SPLDIR}/debian/changelog.org > ${SPLDIR}/debian/changelog
 	cd ${SPLDIR}; ln -s ../spl-patches patches
 	cd ${SPLDIR}; quilt push -a
 	cd ${SPLDIR}; rm -rf .pc ./patches
 	cd ${SPLDIR}; dpkg-buildpackage -b -uc -us
 .PHONY: zfs
-zfs: $(ZFS_DEBS)
+zfs: $(DEBS)
-$(ZFS_DEB2): $(ZFS_DEB1)
+$(ZFS_DEB2) $(ZFS_DBG_DEBS): $(ZFS_DEB1)
-$(ZFS_DEB1): $(ZFSSRC)
+$(ZFS_DEB1): $(BUILDDIR)
-	rm -rf ${ZFSDIR}
+	cd $(BUILDDIR); dpkg-buildpackage -b -uc -us
-	mkdir ${ZFSDIR}
+	lintian $(DEBS)
-	cp -a ${ZFSSRC}/* ${ZFSDIR}/
+
-	mv ${ZFSDIR}/debian/changelog ${ZFSDIR}/debian/changelog.org
+$(ORIG_SRC_TAR): $(BUILDDIR)
-	cat zfs-changelog.Debian ${ZFSDIR}/debian/changelog.org > ${ZFSDIR}/debian/changelog
+	tar czf $(ORIG_SRC_TAR) --exclude="$(BUILDDIR)/debian" $(BUILDDIR)
-	cd ${ZFSDIR}; ln -s ../zfs-patches patches
+
-	cd ${ZFSDIR}; quilt push -a
+$(ZFS_DSC): $(BUILDDIR) $(ORIG_SRC_TAR)
-	cd ${ZFSDIR}; rm -rf .pc ./patches
+	cd $(BUILDDIR); dpkg-buildpackage -S -uc -us -d
-	cd ${ZFSDIR}; dpkg-buildpackage -b -uc -us
+
 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 ${ZFSDIR} ${SPLDIR}
+	rm -rf $(PACKAGE)-[0-9]*/
 	rm -f *~ *.deb *.changes *.buildinfo *.build *.dsc *.orig.tar.* *.debian.tar.*
 .PHONY: distclean
 distclean: clean
 .PHONY: upload
-upload: ${DEBS}
+upload: UPLOAD_DIST ?= $(DEB_DISTRIBUTION)
-	tar -cf - ${DEBS} | ssh repoman@repo.proxmox.com -- upload --product pve,pmg --dist stretch --arch amd64
+upload: $(DEBS)
 	tar -cf - $(DEBS) | ssh repoman@repo.proxmox.com -- upload --product pve,pmg,pbs --dist $(UPLOAD_DIST) --arch $(DEB_HOST_ARCH)
@@ -2,8 +2,8 @@ Proxmox VE packaging for ZFS on Linux
 This is based on code from:
-https://github.com/zfsonlinux/pkg-spl.git
+https://salsa.debian.org/zfsonlinux-team/zfs
-https://github.com/zfsonlinux/pkg-zfs.git
+https://salsa.debian.org/zfsonlinux-team/spl
 We removed the dkms/modules related code, because we ship the
 modules with the kernel.
@@ -0,0 +1,930 @@
 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.
    strict kernel module release, user space tooling is not touched
 -- Proxmox Support Team <support@proxmox.com>  Fri, 27 Sep 2019 14:37:32 +0200
 zfs-linux (0.8.1-pve2) pve pmg; urgency=medium
  * cherry-pick parallel mount fix
  * cherry-pick SIMD compat patches
 -- Proxmox Support Team <support@proxmox.com>  Tue, 20 Aug 2019 17:10:11 +0200
 zfs-linux (0.8.1-pve1) pve pmg; urgency=medium
  * update ZFS to 0.8.1
 -- Proxmox Support Team <support@proxmox.com>  Fri, 14 Jun 2019 20:43:10 +0200
 zfs-linux (0.8.0-pve1) pve pmg; urgency=medium
  * update ZFS to 0.8.0
  * SPL is now included in upstream ZFS packaging.
    Build dummy spl and spl-dkms packages to ease transition on upgrades.
  * Build pyzfs+documentation package
  * Use arc_summary3.py to provide arc_summary.
  * shipped python scripts now use python3
 -- Proxmox Support Team <support@proxmox.com>  Fri, 24 May 2019 12:05:22 +0200
 zfs-linux (0.7.13-pve2~bpo2) pve pmg; urgency=medium
  * rebuild for PVE 6.0 / Debian Buster
 -- Proxmox Support Team <support@proxmox.com>  Tue, 21 May 2019 20:08:45 +0200
 zfs-linux (0.7.13-pve1~bpo2) unstable; urgency=medium
  * remove conflict with insserv  (<< 1.18)
 -- Proxmox Support Team <support@proxmox.com>  Wed, 27 Mar 2019 09:56:15 +0100
 zfs-linux (0.7.13-pve1~bpo1) unstable; urgency=medium
  * update ZFS to 0.7.13
  * base zfs-linux on upstream ZOL instead of debian
 -- Proxmox Support Team <support@proxmox.com>  Fri, 08 Mar 2019 06:53:00 +0100
 zfs-linux (0.7.12-pve1~bpo1) unstable; urgency=medium
  * update ZFS to 0.7.12
 -- Proxmox Support Team <support@proxmox.com>  Wed, 14 Nov 2018 17:51:59 +0100
 zfs-linux (0.7.11-pve2~bpo1) unstable; urgency=medium
  * update ZFS to debian/0.7.11-3
  * Cherry-pick two fixes planned for 0.7.12
  * Backport deadlock fix between mm_sem and tx assign in zfs_write() and page
    fault
  * Fix missing Breaks/Replaces in zfs-initramfs
 -- Proxmox Support Team <support@proxmox.com>  Mon, 29 Oct 2018 13:45:49 +0100
 zfs-linux (0.7.11-pve1~bpo1) unstable; urgency=medium
  * update ZFS to 0.7.11
 -- Proxmox Support Team <support@proxmox.com>  Mon, 10 Sep 2018 15:47:31 +0200
 zfs-linux (0.7.9-pve3~bpo9) unstable; urgency=medium
  *  Cherry-pick fix for deadlock umount/snapentry_expire
 -- Proxmox Support Team <support@proxmox.com>  Fri, 03 Aug 2018 11:41:11 +0200
 zfs-linux (0.7.9-pve2~bpo9) unstable; urgency=medium
  * Cherry-pick fix for zpl_mount deadlock
 -- Proxmox Support Team <support@proxmox.com>  Fri, 12 Jul 2018 12:37:50 +0200
 zfs-linux (0.7.9-pve1~bpo9) unstable; urgency=medium
  * update ZFS to 0.7.9
 -- Proxmox Support Team <support@proxmox.com>  Fri, 18 May 2018 13:49:09 +0200
 zfs-linux (0.7.8-pve1~bpo9) unstable; urgency=medium
  * update ZFS to 0.7.8 (no changes)
 -- Proxmox Support Team <support@proxmox.com>  Mon, 30 Apr 2018 13:47:22 +0200
 zfs-linux (0.7.7-pve2~bpo9) unstable; urgency=medium
  * (temporarily) revert likely cause of #7401
 -- Proxmox Support Team <support@proxmox.com>  Mon, 9 Apr 2018 09:49:27 +0200
 zfs-linux (0.7.7-pve1~bpo9) unstable; urgency=medium
  * update ZFS to 0.7.7
 -- Proxmox Support Team <support@proxmox.com>  Tue, 3 Apr 2018 14:28:35 +0200
 zfs-linux (0.7.6-pve1~bpo9) unstable; urgency=medium
  * update ZFS to 0.7.6
 -- Proxmox Support Team <support@proxmox.com>  Wed, 21 Feb 2018 09:48:29 +0100
 zfs-linux (0.7.4-pve2~bpo9) unstable; urgency=medium
  * cherry-pick ARC hit rate fix from 0.7.6
  * always load ZFS modules on boot
 -- Proxmox Support Team <support@proxmox.com>  Fri, 19 Jan 2018 11:31:14 +0100
 zfs-linux (0.7.4-pve1~bpo9) unstable; urgency=medium
  * update ZFS to 0.7.4
 -- Proxmox Support Team <support@proxmox.com>  Tue, 19 Dec 2017 12:52:42 +0100
 zfs-linux (0.7.3-pve1~bpo9) unstable; urgency=medium
  * update ZFS to 0.7.3
  * include fix for user namespace setgid issue (#6800 upstream)
 -- Proxmox Support Team <support@proxmox.com>  Mon, 6 Nov 2017 09:14:19 +0100
 zfs-linux (0.7.2-pve1~bpo90) unstable; urgency=medium
  * update zfs to 0.7.2
  * add PR 6616 - zfs send/recv compatibility with 0.6.5
  * add PR 6695 - zfs recv: don't skip over objects which should be freed
  * various small fixes
  * split test suite into zfs-test package
 -- Proxmox Support Team <support@proxmox.com>  Thu, 12 Oct 2017 13:34:05 +0200
 zfs-linux (0.6.5.11-pve18~bpo90) unstable; urgency=medium
  * fix #1509: arc_summary error with L2ARC
 -- Proxmox Support Team <support@proxmox.com>  Mon, 2 Oct 2017 09:30:41 +0200
 zfs-linux (0.6.5.11-pve17~bpo90) unstable; urgency=medium
  * update zfs to debian/0.6.5.11-1
 -- Proxmox Support Team <support@proxmox.com>  Thu, 27 Jul 2017 13:11:45 +0200
 zfs-linux (0.6.5.9-pve16~bpo90) unstable; urgency=medium
  * drop transitional packages
  * convert python scripts to python 3, drop .py suffix
  * rebuild for PVE 5.0 / Debian Stretch
 -- Proxmox Support Team <support@proxmox.com>  Fri, 10 Mar 2017 09:45:52 +0100
 zfs-linux (0.6.5.9-pve15~bpo80) unstable; urgency=medium
  * update zfs to debian/0.6.5.9-1
 -- Proxmox Support Team <support@proxmox.com>  Mon, 6 Feb 2017 12:39:10 +0100
 zfs-linux (0.6.5.8-pve14~bpo80) unstable; urgency=medium
  * update zfs to debian/0.6.5.8-3
 -- Proxmox Support Team <support@proxmox.com>  Wed, 11 Jan 2017 09:34:58 +0100
 zfs-linux (0.6.5.8-pve13~bpo80) unstable; urgency=medium
  * fix #1184: zfs-share.service has wrong path to 'rm' command
 -- Proxmox Support Team <support@proxmox.com>  Thu, 27 Oct 2016 11:25:47 +0200
 zfs-linux (0.6.5.8-pve12~bpo80) unstable; urgency=medium
  * import with "-d /dev/disk/by-id" in systemd service
 -- Proxmox Support Team <support@proxmox.com>  Mon, 24 Oct 2016 13:48:08 +0200
 zfs-linux (0.6.5.8-pve11~bpo80) unstable; urgency=medium
  * update zfs to debian/0.6.5.8-1
  * switch package upstream sources to Debian (Jessie)
  * add transitional packages for upgrades
 -- Proxmox Support Team <support@proxmox.com>  Wed, 12 Oct 2016 11:16:02 +0200
 zfs-linux (0.6.5.7-pve10~bpo80) unstable; urgency=medium
  * update to pkg-zfs jessie/0.6.5.7-8
  * change package versioning to allow upgrades from PVE3/wheezy
 -- Proxmox Support Team <support@proxmox.com>  Tue, 28 Jun 2016 09:50:00 +0200
 zfs-linux (0.6.5-pve9~jessie) unstable; urgency=medium
  * Update to pkg-zfs jessie/0.6.5.6-3
 -- Proxmox Support Team <support@proxmox.com>  Tue, 12 Apr 2016 09:51:35 +0200
 zfs-linux (0.6.5-pve8~jessie) unstable; urgency=medium
  * update to zfs-0.6.5.6
 -- Proxmox Support Team <support@proxmox.com>  Wed, 30 Mar 2016 10:50:22 +0200
 zfs-linux (0.6.5-pve7~jessie) unstable; urgency=medium
  * update to zfs-0.6.5.4
 -- Proxmox Support Team <support@proxmox.com>  Thu, 14 Jan 2016 10:51:17 +0100
 zfs-linux (0.6.5-pve6~jessie) unstable; urgency=medium
  * Prepare to tag zfs-0.6.5.3
 -- Proxmox Support Team <support@proxmox.com>  Thu, 05 Nov 2015 07:21:44 +0100
 zfs-linux (0.6.5-pve5~jessie) unstable; urgency=medium
  * Illumos 6267 - dn_bonus evicted too early
  * Fix use-after-free in vdev_disk_physio_completion
 -- Proxmox Support Team <support@proxmox.com>  Wed, 04 Nov 2015 17:42:42 +0100
 zfs-linux (0.6.5-pve4~jessie) unstable; urgency=medium
  * update to master/debian/jessie/0.6.5.2-2
 -- Proxmox Support Team <support@proxmox.com>  Mon, 05 Oct 2015 17:56:45 +0200
 zfs-linux (0.6.5-pve3~jessie) unstable; urgency=medium
  * do not install /etc/init.d/zfs-zed script to avoid double startup
    with systemd
 -- Proxmox Support Team <support@proxmox.com>  Mon, 28 Sep 2015 10:14:40 +0200
 zfs-linux (0.6.5-pve2~jessie) unstable; urgency=medium
  * update to master/debian/jessie/0.6.5.1-4
 -- Proxmox Support Team <support@proxmox.com>  Thu, 24 Sep 2015 12:45:33 +0200
 zfs-linux (0.6.5-pve1~jessie) unstable; urgency=medium
  * update to master/debian/jessie/0.6.5.1-2
 -- Proxmox Support Team <support@proxmox.com>  Mon, 21 Sep 2015 10:02:41 +0200
 zfs-linux (0.6.4-pve3~jessie) unstable; urgency=medium
  * update to snapshot/debian/jessie/0.6.4-24-6bec43
 -- Proxmox Support Team <support@proxmox.com>  Mon, 24 Aug 2015 06:13:44 +0200
 zfs-linux (0.6.4-pve2~jessie) unstable; urgency=medium
  * update to 0.6.4.2 (snapshot/debian/jessie/0.6.4-21-53b1d9)
 -- Proxmox Support Team <support@proxmox.com>  Tue, 21 Jul 2015 11:03:21 +0200
 zfs-linux (0.6.4-pve1~jessie) unstable; urgency=medium
  * update to 0.6.4 (use upstream zol package definitions)
 -- Proxmox Support Team <support@proxmox.com>  Tue, 14 Apr 2015 10:19:22 +0200
 zfs-linux (0.6.3-pve3~jessie) unstable; urgency=medium
  * ignore zfs-import-scan errors
 -- Proxmox Support Team <support@proxmox.com>  Tue, 31 Mar 2015 17:52:40 +0200
 zfs-linux (0.6.3-pve2~jessie) unstable; urgency=medium
  * use systemd for service startup
  * install zed configuration file /etc/zfs/zed.d/zed.rc
 -- Proxmox Support Team <support@proxmox.com>  Sun, 15 Mar 2015 15:52:54 +0100
 zfs-linux (0.6.3-pve1~jessie) unstable; urgency=medium
  * recompile on jessie
 -- Proxmox Support Team <support@proxmox.com>  Sat, 28 Feb 2015 16:02:08 +0100
 zfs-linux (0.6.3-2~wheezy) unstable; urgency=low
  * use /sbin/modprobe to avoid warning inside initrd
  * fix warning about undefined values inside initrd
 -- Proxmox Support Team <support@proxmox.com>  Wed, 14 Jan 2015 19:03:04 +0100
 zfs-linux (0.6.3-1~wheezy) unstable; urgency=low
  * first version for Proxmox VE
 -- Proxmox Support Team <support@proxmox.com>  Sat, 10 Jan 2015 14:06:34 +0100
 zfs-linux (0.7.12-2) unstable; urgency=medium
  [ Colin Ian King ]
  * Only run autopkgtests for amd64, arm64, ppc64el and s390x (LP#1805627).
  [ Martin Bagge / brother ]
  * [INTL:sv] Swedish strings for zfs-linux debconf (Closes: #918020)
  [ Anders Jonsson ]
  * sv.po: typo fix
  [ Mo Zhou ]
  * Change init script's behaviour to default during postinst.
  * Add ${perl:Depends} to zfs-dkms's Depends.
  * Add autopkgtest script to test zfs-dkms build.
  * autopkgtest: minor fix
  [ Aron Xu ]
  * Add XS-Autobuild: yes to d/control
  * Conflicts with insserv << 1.18 (Closes: #915831)
 -- Aron Xu <aron@debian.org>  Fri, 11 Jan 2019 21:32:06 +0800
 zfs-linux (0.7.12-1) unstable; urgency=medium
  [ Stoiko Ivanov ]
  * Add Breaks/Replaces to zfs-initramfs
  [ Mo Zhou ]
  * New upstream version 0.7.12
  * Drop unnecessary patch init-start-stop-dep-on-local-fs.patch .
  * Override init.d-script-missing-dependency-on-local_fs for zfs-zed.
  * Bump linux compatibility to 4.19 .
 -- Mo Zhou <cdluminate@gmail.com>  Mon, 19 Nov 2018 11:32:44 +0000
 zfs-linux (0.7.11-3) unstable; urgency=medium
  [ Antonio Russo ]
  + https://salsa.debian.org/zfsonlinux-team/zfs/merge_requests/9
  * Break/Replace upstream .deb packages (Closes: #839921)
  * Install upstream bash completion file instead of embedded one.
  * Modify META before autoreconf.
  * Make dkms distdir before build to avoid including build artifacts.
  * Remove ZFS_AC_PACKAGE macros from DKMS sources.
    This removes dpkg-dev dependency from zfs-dkms package.
  * Use upstream's dkms.mkconf script to produce dkms.conf .
  * Ship initramfs zdev hook in zfs-initramfs (Closes: #902052)
  [ Nicolas Braud-Santoni ]
  * Update debian/copyright, removing unused wildcards.
  [ Nicholas D Steeves ]
  * Change -dbg package's priority from extra to optional.
  [ Mo Zhou ]
  * Fix FTBFS on architecture=all due to FileNotFound. (Closes: #911937)
  * Add isolation-machine restriction to autopkgtest because the tests
    needs to interact with the kernel, i.e. loading kernel module.
 -- Mo Zhou <cdluminate@gmail.com>  Sun, 28 Oct 2018 10:28:52 +0000
 zfs-linux (0.7.11-2) unstable; urgency=medium
  * Support Devuan in dkms script. (Closes: #900089)
    Thanks to Chris Dos <chris@chrisdos.com>
  * Install init scripts to support non-systemd setups. (Closes: #826994)
    Thanks to Chris Dos <chris@chrisdos.com>
  * Override init.d-script-does-not-source-init-functions for
    zfsutils-linux and zfs-zed.
  * Patch upstream init scripts to make them work for Debian+OpenRC setup.
  * Patch upstream init script to fix missing dependency on local_fs.
 -- Mo Zhou <cdluminate@gmail.com>  Fri, 26 Oct 2018 09:32:06 +0000
 zfs-linux (0.7.11-1) unstable; urgency=medium
  [ Aron Xu ]
  * Add dpkg-dev to Depends of zfs-dkms (Closes: #900714)
  [ Nicolas Braud-Santoni ]
  * Use canonical HTTPS format URL for Vcs-Git (Closes: #895873)
  [ Mo Zhou ]
  * New upstream version 0.7.11 (Closes: #908290)
  * Bump linux_compat to 4.18 .
  * Replace get_next.sh with one-liner awk script in rules.
  * Append myself to Uploaders and refresh auto-generated control.
  * Use HTTPS format URI in watch file.
  * Recommends linux-libc-dev (<< LINUX_NEXT~) instead of (<< LINUX_NEXT).
 -- Mo Zhou <cdluminate@gmail.com>  Wed, 19 Sep 2018 08:45:18 +0000
 zfs-linux (0.7.9-3) unstable; urgency=medium
  [ Antonio Russo ]
  * Expand zfs-test and add Breaks/Conflicts (Closes: #899047)
  [ Aron Xu ]
  * d/control: migrate to alioth-lists (Closes: #899756)
 -- Aron Xu <aron@debian.org>  Mon, 28 May 2018 18:22:02 +0800
 zfs-linux (0.7.9-2) unstable; urgency=medium
  [ Aron Xu ]
  * Move more zfs test tools to zfs-test package (Closes: #868653)
  * New upstream version 0.7.9
  * d/rules: add --enable-systemd
  * Fix lintian obsolete-relation-form-in-source
  * Bump supported linux version to 4.16
  [ Antonio Russo ]
  * Install enum-extract.pl with dkms
  * Handle /proc/kallsym obfuscation (Closes: #891936)
 -- Aron Xu <aron@debian.org>  Thu, 17 May 2018 23:47:29 +0800
 zfs-linux (0.7.6-1) unstable; urgency=medium
  [ Lev Lamberov ]
  * [INTL:ru] Updated Russian translation of debconf (Closes: #885990)
  [ Aron Xu]
  * New upstream release (Closes: #889795, #890576)
  * 0001-Fix-bug-in-distclean-which-removes-needed-files.patch:
    removed, applied upstream
  * Update VCS-* URL to salsa.debian.org
  * Apply wrap-and-sort
  * Recommends: linux-libc-dev (< ${LINUX_NEXT}):
    Tries to prevent unexpected upgrades of kernel that is not known to
    be supported by the packaged version of ZFS/SPL. (Closes: #849420)
 -- Aron Xu <aron@debian.org>  Mon, 26 Feb 2018 16:32:29 +0800
 zfs-linux (0.7.5-1) unstable; urgency=medium
  [ Aron Xu ]
  * New upstream version 0.7.5 (Closes: #884812)
  [ Antonio Russo ]
  * Add version dependency on zfsutils-linux package (Closes: #880889)
 -- Aron Xu <aron@debian.org>  Fri, 19 Jan 2018 15:39:23 +0800
 zfs-linux (0.7.4-1) unstable; urgency=medium
  * New upstream version 0.7.4 (Closes: #884287, #883832)
  * Require debhelper >= 10.2
  * cherry-pick: fix distclean which removes needed files (Closes: #884706)
  * Refresh patches
  * Update stdver to 4.1.2, no change required
  * Install zfs-import.target
 -- Aron Xu <aron@debian.org>  Mon, 18 Dec 2017 22:48:59 +0800
 zfs-linux (0.7.3-3) unstable; urgency=medium
  [ Antonio Russo ]
  * Add maximum version dependency on spl-dkms (Closes: #883008)
 -- Aron Xu <aron@debian.org>  Thu, 30 Nov 2017 00:34:30 +0800
 zfs-linux (0.7.3-2) unstable; urgency=medium
  [ Fabian Grünbichler ]
  * d/rules: remove obsolete calls to dpkg-architecture (Closes: #882209)
  * zfs-test: add proper Breaks+Replaces (Closes: #880902)
  * build: add implicit version to dh_makeshlibs (Closes: #880709)
  [ Aron Xu ]
  * Depend on matching version of spl-dkms (Closes: ##881013)
 -- Aron Xu <aron@debian.org>  Tue, 28 Nov 2017 16:16:34 +0800
 zfs-linux (0.7.3-1) unstable; urgency=medium
  [ Antonio Russo ]
  * Refresh manual builds DKMS prevention patch
  [ Fabian Grünbichler ]
  * zfs-test package
  * add files to debian/not-installed
  * dh_install: switch to --fail-missing
  * add new files from 0.7 to install
  * dkms: build icp module as well
  [ Antonio Russo ]
  * dracut: make module-setup.sh shebang explicit
  * add man page reference to systemd units
  * Fix install path of zpool.d scripts
  * Incorporate DebianPT.org Portuguese translation
  * Fix typo in debconf templates
  * Drop dependency on dh-systemd
  [ Aron Xu ]
  * Drop merged patches, update remainders
  * Update std-ver to 4.1.1
  * New upstream version 0.7.3
  * Update debconf pot file
  * Update control.in for dh-systemd deprecation
  * Add lintian override for zfs-test
  [ Colin King ]
  * Improve cloning performance for large numbers of clones (LP: #1567557)
    Bump zcmd buffer from 16K to 256K.
 -- Aron Xu <aron@debian.org>  Tue, 31 Oct 2017 18:52:01 +0800
 zfs-linux (0.6.5.11-1) unstable; urgency=medium
  [ Aron Xu ]
  * Imported Upstream version 0.6.5.11
  [ Fabian Grünbichler ]
  * fix rm path in zfs-share.service
 -- Aron Xu <aron@debian.org>  Fri, 14 Jul 2017 16:33:23 +0800
 zfs-linux (0.6.5.10-1) unstable; urgency=medium
  * Add kernel version to depmod cmd (Closes: #860958)
  * New upstream version 0.6.5.10
 -- Aron Xu <aron@debian.org>  Wed, 05 Jul 2017 18:11:39 +0800
 zfs-linux (0.6.5.9-5) unstable; urgency=medium
  * Add zfs initramfs conf for root pool setup
    (Closes: #848157, LP: #1673197)
 -- Aron Xu <aron@debian.org>  Sun, 19 Mar 2017 18:14:57 +0800
 zfs-linux (0.6.5.9-4) unstable; urgency=medium
  * autopkgtest: load zfs module before running tests
 -- Aron Xu <aron@debian.org>  Tue, 14 Mar 2017 11:38:08 +0800
 zfs-linux (0.6.5.9-3) unstable; urgency=medium
  [ Petter Reinholdtsen ]
  * Updated German debconf translation by Helge Kreutzmann. (Closes: #857528)
  * Updated metadata on a few patches.
  [ Aron Xu ]
  * Cherry-pick upstream fix for merged /usr/lib and /lib
  * Manually maintain adt test Depends
 -- Aron Xu <aron@debian.org>  Mon, 13 Mar 2017 12:23:32 +0800
 zfs-linux (0.6.5.9-2) unstable; urgency=medium
  [ Fabian Grünbichler ]
  * fix zed-service-bindir patch
 -- Aron Xu <aron@debian.org>  Tue, 07 Feb 2017 17:22:02 +0800
 zfs-linux (0.6.5.9-1) unstable; urgency=medium
  [ Aron Xu ]
  * Imported Upstream version 0.6.5.9 (Closes: #851513)
  [ Lukas Wunner ]
  * Cherry picks for root zpool with dracut (Closes: #849969)
  * Fix installation path of systemd files
  * Fix build breakage caused by nonstandard umask
  [ Fabian Grünbichler ]
  * fix python script install path (Closes: #842237)
 -- Aron Xu <aron@debian.org>  Mon, 06 Feb 2017 15:57:50 +0800
 zfs-linux (0.6.5.8-3) unstable; urgency=medium
  * Fix the path on the zfs-zed unit file (Closes: #849813)
 -- Carlos Alberto Lopez Perez <clopez@igalia.com>  Thu, 05 Jan 2017 16:23:16 +0100
 zfs-linux (0.6.5.8-2) unstable; urgency=medium
  [ Richard Laager ]
  * Remove .py extension from utilities in /usr/sbin as per policy
    10.4 Scripts (LP: #1628279)
  [ Colin Ian King ]
  * Use python3 for arcstat.py, arc_summary.py & dbufstat.py (LP: #1627909)
  [ Richard Laager ]
  * Set PATH in cron.d job to fix monthly scrubs. (LP: #1548009)
  [ Aron Xu ]
  * Install zed into /usr/sbin
  * Rename zfsutils path to follow the package name
  * Add missing part in python3 move
  * Install zed to /usr/sbin
  [ Petter Reinholdtsen ]
  * Updated Italian debconf translation by Beatrice Torracca.
    (Closes: #846928)
  * Added patch 1003-linux-4.9-compat.patch from upstream to build with
    Linux kernel 4.9. (Closes: #847018)
 -- Aron Xu <aron@debian.org>  Sat, 17 Dec 2016 17:42:21 +0800
 zfs-linux (0.6.5.8-1) unstable; urgency=medium
  [ Carlos Alberto Lopez Perez ]
  * Reflow changelog from last upload to avoid lintian warning.
  [ Aron Xu ]
  * Imported Upstream version 0.6.5.8 (Closes: #838192)
  * Conflicts with zutils (Closes: #836853)
  [ Zhou Mo ]
  * Patch: remove merged patches.
  * Upstream renamed zed.service to zfs-zed.service .
  * Avoid installing zfs-zed.service twice.
 -- Aron Xu <aron@debian.org>  Tue, 20 Sep 2016 15:20:21 +0800
 zfs-linux (0.6.5.7-2) unstable; urgency=medium
  [ Aron Xu ]
  * Add busybox to zfs-initramfs list of dependencies. (Closes: #824976)
  [ Petter Reinholdtsen ]
  * Updated Danish debconf translation by Joe Hansen. (Closes: #830652)
  * Added Dutch (nl) debconf translation by Frans Spiesschaert.
    (Closes: #832280)
  * Norwegian Bokmål (nb) debconf template translation by Petter Reinholdtsen.
  [ Eric Desrochers ]
  * Change utilities path (bindir) to /usr/sbin. (Closes: #832938)
  [ Carlos Alberto Lopez Perez]
  * Add tunable to ignore hole_birth, and enable it by default.
    (Closes: #830824)
 -- Carlos Alberto Lopez Perez <clopez@igalia.com>  Tue, 16 Aug 2016 17:43:48 +0200
 zfs-linux (0.6.5.7-1) unstable; urgency=medium
  [ YunQiang Su ]
  * 1002-fix-mips-build.patch: fix builds on mips* archs
  [ Aron Xu ]
  * New upstream release.
  * 1001-Fix-aarch64-compilation.patch: dropped, not needed anymore
  * Merge patches from Ubuntu:
    - 0002-Check-for-META-and-DCH-consistency-in-autoconf.patch
    - 0003-Add-libuutil-to-LIBADD-for-libzfs-and-libzfs_core.patch
    - enable-zed.patch
 -- Aron Xu <aron@debian.org>  Tue, 31 May 2016 14:10:49 +0800
 zfs-linux (0.6.5.6-2) unstable; urgency=medium
  [ Aron Xu ]
  * Adding smoke testing scripts from Ubuntu
  * Fix binary module builds
  * Add libblkid-dev, libattr1-dev to build-dep
  * Re-sync source tree
  * Add dh-python to b-d
  * Remove .gitignore files and clean build tree
  * Scrub all healthy pools monthly from Richard Laager
  [ Petter Reinholdtsen ]
  * Copied 1000-ppc64el-endian-support.patch from Ubuntu to fix endian
    build problem on ppc64el
  * Copied 1001-Fix-aarch64-compilation.patch from Ubuntu to fix build
    problem on arm64.
  * Copied 0001-Prevent-manual-builds-in-the-DKMS-source.patch from
    Ubuntu to block manual building in the DKMS source tree.
  * Updated Standards-Version from 3.9.7 to 3.9.8.
  * Bring some files back to the upstream tarball content to get gbp
    buildpackage working.
 -- Petter Reinholdtsen <pere@debian.org>  Thu, 12 May 2016 12:19:55 +0200
 zfs-linux (0.6.5.6-1) unstable; urgency=medium
  [ Aron Xu ]
  * New upstream version 0.6.5.6.
  [ Petter Reinholdtsen ]
  * Generated new copyright.cme file based on version 0.6.5.6.
  * Updated d/copyright file, add missing BSD licensed init.d scripts, and
    new copyright holders in the new upstream version.
  * Updated Standards-Version from 3.9.6 to 3.9.7.
  * Added myself as uploader.
  * Updated debconf po files based on newest pot file.
  * Correct URL to git repo in d/control.
 -- Petter Reinholdtsen <pere@debian.org>  Sat, 26 Mar 2016 07:08:11 +0000
 zfs-linux (0.6.5.5-1) unstable; urgency=medium
  * Initial Release (Closes: #686447)
 -- Aron Xu <aron@debian.org>  Sun, 20 Mar 2016 22:57:06 +0800
@@ -0,0 +1,301 @@
 Source: zfs-linux
 Section: contrib/kernel
 Priority: optional
 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,
               python3-sphinx,
               python3-all-dev,
               uuid-dev,
               zlib1g-dev
 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: libnvpair3linux
 Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 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: 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, 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
    that make it possible to run Solaris user code in a Linux environment
    with relatively minimal modification.
  * libavl: The Adelson-Velskii Landis balanced binary tree manipulation
    library.
  * libefi: The Extensible Firmware Interface library for GUID disk
    partitioning.
  * libshare: NFS, SMB, and iSCSI service integration for ZFS.
 Package: libzfslinux-dev
 Section: contrib/libdevel
 Architecture: linux-any
 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 libnvpair3, libuutil3,
 libzpool5 and libzfs4, libzfsbootenv1.
 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
 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: libzfsbootenv1linux
 Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 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
 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.
 Package: python3-pyzfs
 Section: contrib/python
 Architecture: linux-any
 Depends: ${misc:Depends},
         ${python3:Depends},
         python3-cffi,
         zfsutils-linux (= ${binary:Version})
 Description: wrapper for libzfs_core C library
 libzfs_core is intended to be a stable interface for programmatic
 administration of ZFS. This wrapper provides one-to-one wrappers for
 libzfs_core API functions, but the signatures and types are more natural to
 Python.
 .
 nvlists are wrapped as dictionaries or lists depending on their usage.
 Some parameters have default values depending on typical use for
 increased convenience. Enumerations and bit flags become strings and lists
 of strings in Python. Errors are reported as exceptions rather than integer
 errno-style error codes.  The wrapper takes care to provide one-to-many
 mapping of the error codes to the exceptions by interpreting a context
 in which the error code is produced.
 Package: pyzfs-doc
 Section: contrib/doc
 Architecture: all
 Depends:
 ${sphinxdoc:Depends},
 ${misc:Depends}
 Recommends:
 python3-pyzfs
 Description: wrapper for libzfs_core C library (documentation)
 libzfs_core is intended to be a stable interface for programmatic
 administration of ZFS. This wrapper provides one-to-one wrappers for
 libzfs_core API functions, but the signatures and types are more natural to
 Python.
 .
 nvlists are wrapped as dictionaries or lists depending on their usage.
 Some parameters have default values depending on typical use for
 increased convenience. Enumerations and bit flags become strings and lists
 of strings in Python. Errors are reported as exceptions rather than integer
 errno-style error codes.  The wrapper takes care to provide one-to-many
 mapping of the error codes to the exceptions by interpreting a context
 in which the error code is produced.
 .
 This package contains the documentation.
 Package: zfs-initramfs
 Architecture: all
 Depends: busybox-initramfs | busybox-static | busybox,
         initramfs-tools,
         zfsutils-linux (>= ${binary:Version}),
         ${misc:Depends}
 Breaks: zfsutils-linux (<= 0.7.11-pve1~bpo1)
 Replaces: zfsutils-linux (<= 0.7.11-pve1~bpo1)
 Description: OpenZFS root filesystem capabilities for Linux - initramfs
 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: 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
 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.
 Package: zfs-zed
 Section: contrib/admin
 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,
 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).
 Package: zfs-test
 Section: contrib/admin
 Architecture: linux-any
 Depends: acl,
         attr,
         bc,
         fio,
         ksh,
         lsscsi,
         mdadm,
         parted,
         python3,
         python3-pyzfs,
         sudo,
         sysstat,
         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 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: spl
 Section: contrib/metapackages
 Architecture: all
 Depends: ${misc:Depends},
 Suggests: zfs-test
 Description: Solaris Porting Layer user-space utilities for Linux (dummy)
 The Solaris Porting Layer (SPL) is a Linux kernel module which provides
 many of the Solaris kernel APIs. This shim layer makes it possible to
 run Solaris kernel code in the Linux kernel with relatively minimal
 modification. The Solaris Porting LAyer Tests (SPLAT) is a Linux kernel
 module which provides a testing harness for the SPL module.
 .
 SPL can be particularly useful when you want to track upstream Illumos
 (or any other OpenSolaris fork) development closely and don't want the
 overhead of maintaining a large patch which converts Solaris primitives
 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.
@@ -0,0 +1,2 @@
 COPYRIGHT
 LICENSE
@@ -0,0 +1 @@
 lib/@DEB_HOST_MULTIARCH@/libnvpair.so.*
@@ -0,0 +1 @@
 package-name-doesnt-match-sonames
@@ -0,0 +1,2 @@
 lib/*/security/pam_zfs_key.so
 usr/share/pam-configs/zfs_key
@@ -0,0 +1,6 @@
 #!/bin/sh
 set -e
 pam-auth-update --package
 #DEBHELPER#
@@ -0,0 +1,8 @@
 #!/bin/sh
 set -e
 if [ "$1" = remove ] ; then
    pam-auth-update --package --remove zfs_key
 fi
 #DEBHELPER#
@@ -0,0 +1,2 @@
 COPYRIGHT
 LICENSE
@@ -0,0 +1 @@
 lib/@DEB_HOST_MULTIARCH@/libuutil.so.*
@@ -0,0 +1 @@
 package-name-doesnt-match-sonames
@@ -0,0 +1,2 @@
 COPYRIGHT
 LICENSE
@@ -0,0 +1,2 @@
 lib/@DEB_HOST_MULTIARCH@/libzfs.so.*
 lib/@DEB_HOST_MULTIARCH@/libzfs_core.so.*
@@ -0,0 +1 @@
 package-name-doesnt-match-sonames
@@ -0,0 +1,2 @@
 COPYRIGHT
 LICENSE
@@ -0,0 +1 @@
 lib/libzfsbootenv.so.*
@@ -0,0 +1 @@
 lib/@DEB_HOST_MULTIARCH@/libzfsbootenv.so.*
@@ -0,0 +1,2 @@
 package-name-doesnt-match-sonames
 extra-license-file *usr/share/doc/libzfsbootenv1linux/LICENSE.gz*
@@ -0,0 +1,2 @@
 COPYRIGHT
 LICENSE
@@ -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
@@ -0,0 +1,2 @@
 COPYRIGHT
 LICENSE
@@ -0,0 +1 @@
 lib/@DEB_HOST_MULTIARCH@/libzpool.so.*
@@ -0,0 +1 @@
 package-name-doesnt-match-sonames
@@ -0,0 +1,13 @@
 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
 etc/zfs/vdev_id.conf.multipath.example
 etc/zfs/vdev_id.conf.sas_direct.example
 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
@@ -0,0 +1,70 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Debian ZFS on Linux maintainers
 <pkg-zfsonlinux-devel@alioth-lists.debian.net>
 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 20064a0fb..4d5f545ad 100644
 --- a/config/zfs-meta.m4
 +++ b/config/zfs-meta.m4
@@ -1,9 +1,10 @@
 dnl #
 dnl # DESCRIPTION:
 -dnl # Read meta data from the META file.  When building from a git repository
 -dnl # the ZFS_META_RELEASE field will be overwritten if there is an annotated
 -dnl # tag matching the form ZFS_META_NAME-ZFS_META_VERSION-*.  This allows
 -dnl # for working builds to be uniquely identified using the git commit hash.
 +dnl # Read meta data from the META file or the debian/changelog file if it
 +dnl # exists.  When building from a git repository the ZFS_META_RELEASE field
 +dnl # will be overwritten if there is an annotated tag matching the form
 +dnl # ZFS_META_NAME-ZFS_META_VERSION-*.  This allows for working builds to be
 +dnl # uniquely identified using the git commit hash.
 dnl #
 dnl #    The META file format is as follows:
 dnl #      ^[ ]*KEY:[ \t]+VALUE$
@@ -49,6 +50,7 @@ AC_DEFUN([ZFS_AC_META], [
 	_zfs_ac_meta_type="none"
 	if test -f "$META"; then
 		_zfs_ac_meta_type="META file"
 +		_dpkg_parsechangelog=$(dpkg-parsechangelog 2>/dev/null)
 		ZFS_META_NAME=_ZFS_AC_META_GETVAL([(Name|Project|Package)]);
 		if test -n "$ZFS_META_NAME"; then
@@ -69,8 +71,30 @@ AC_DEFUN([ZFS_AC_META], [
 			AC_SUBST([ZFS_META_VERSION])
 		fi
 +		if test -n "${_dpkg_parsechangelog}"; then
 +			_dpkg_version=$(echo "${_dpkg_parsechangelog}" \
 +				| $AWK '$[]1 == "Version:" { print $[]2; }' \
 +				| cut -d- -f1)
 +			if test "${_dpkg_version}" != "$ZFS_META_VERSION"; then
 +				AC_MSG_ERROR([
 +	*** Version $ZFS_META_VERSION in the META file is different than
 +	*** version $_dpkg_version in the debian/changelog file. DKMS and DEB
 +	*** packaging require that these files have the same version.
 +				])
 +			fi
 +		fi
 +
 		ZFS_META_RELEASE=_ZFS_AC_META_GETVAL([Release]);
 -		if test ! -f ".nogitrelease" && git rev-parse --git-dir > /dev/null 2>&1; then
 +
 +		if test -n "${_dpkg_parsechangelog}"; then
 +			_dpkg_release=$(echo "${_dpkg_parsechangelog}" \
 +				| $AWK '$[]1 == "Version:" { print $[]2; }' \
 +				| cut -d- -f2-)
 +			if test -n "${_dpkg_release}"; then
 +				ZFS_META_RELEASE=${_dpkg_release}
 +				_zfs_ac_meta_type="dpkg-parsechangelog"
 +			fi
 +		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 - _)
@@ -13,16 +13,17 @@ 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 8b41baa3..59b058c9 100644
+index 44e1bb3ed..7509b03cb 100644
--- a/etc/modules-load.d/zfs.conf.in
+--- a/etc/modules-load.d/zfs.conf
-+++ b/etc/modules-load.d/zfs.conf.in
+++ b/etc/modules-load.d/zfs.conf
@@ -1,3 +1,3 @@
- # Always load kernel modules at boot.  The default behavior is to load the
+ # The default behavior is to allow udev to load the kernel modules on demand.
- # kernel modules in the zfs-import-*.service or when blkid(8) detects a pool.
+ # Uncomment the following line to unconditionally load them at boot.
 -#zfs
 +zfs
@@ -0,0 +1,27 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
 Date: Mon, 6 Feb 2017 12:04:35 +0100
 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 be80025a4..20ce8e632 100644
 --- a/etc/systemd/system/zfs-zed.service.in
 +++ b/etc/systemd/system/zfs-zed.service.in
@@ -4,7 +4,7 @@ Documentation=man:zed(8)
 ConditionPathIsDirectory=/sys/module/zfs
 [Service]
 -ExecStart=@sbindir@/zed -F
 +ExecStart=/usr/sbin/zed -F
 Restart=always
 [Install]
@@ -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 abc8e8e6..8fe2c107 100644
+index 598ef501b..e4f3a70c1 100644
 --- a/etc/systemd/system/zfs-import-scan.service.in
 +++ b/etc/systemd/system/zfs-import-scan.service.in
-@@ -12,7 +12,7 @@ ConditionPathExists=!@sysconfdir@/zfs/zpool.cache
+@@ -13,7 +13,7 @@ ConditionPathIsDirectory=/sys/module/zfs
 [Service]
 Type=oneshot
 RemainAfterExit=yes
- ExecStartPre=-/sbin/modprobe zfs
+-ExecStart=@sbindir@/zpool import -aN -o cachefile=none $ZPOOL_IMPORT_OPTS
-ExecStart=@sbindir@/zpool import -aN -o cachefile=none
+ExecStart=@sbindir@/zpool import -aN -d /dev/disk/by-id -o cachefile=none $ZPOOL_IMPORT_OPTS
 +ExecStart=@sbindir@/zpool import -aN -d /dev/disk/by-id -o cachefile=none
 [Install]
 WantedBy=zfs-import.target
@@ -0,0 +1,27 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Richard Laager <rlaager@wiktel.com>
 Date: Wed, 30 Jan 2019 15:12:04 +0100
 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 | 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 1dfd43454..0180dd827 100644
 --- a/cmd/zed/zed.d/zed.rc
 +++ b/cmd/zed/zed.d/zed.rc
@@ -42,7 +42,7 @@ ZED_EMAIL_ADDR="root"
 ##
 # Minimum number of seconds between notifications for a similar event.
 #
 -#ZED_NOTIFY_INTERVAL_SECS=3600
 +ZED_NOTIFY_INTERVAL_SECS=3600
 ##
 # Notification verbosity.
@@ -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"
@@ -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
@@ -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
@@ -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"]
@@ -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"]
@@ -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
@@ -0,0 +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-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
@@ -0,0 +1 @@
 usr/lib/python3*
@@ -0,0 +1,127 @@
 #!/usr/bin/make -f
 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 -m 1 "/sphinx-build$$")
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 %:
 	dh $@ --with autoreconf,python3,sphinxdoc
 adapt_meta_file:
 	@# Embed the downstream version in the module.
 	@sed \
 	  -e 's/^Version:.*/Version:      $(VERSION)/' \
 	  -e 's/^Release:.*/Release:      $(REVISION)/' \
 	  -i.orig META
 override_dh_autoreconf: adapt_meta_file
 	dh_autoreconf
 override_dh_auto_configure:
 	@# Build the userland, but don't build the kernel modules.
 	dh_auto_configure -- \
 	  --bindir=/usr/bin \
 	  --sbindir=/sbin \
 	  --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.
 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
 	mkdir -p '$(CURDIR)/debian/tmp/usr/sbin/'
 	mv '$(CURDIR)/debian/tmp/usr/bin/arc_summary' '$(CURDIR)/debian/tmp/usr/sbin/arc_summary'
 	mv '$(CURDIR)/debian/tmp/usr/bin/arcstat' '$(CURDIR)/debian/tmp/usr/sbin/arcstat'
 	mv '$(CURDIR)/debian/tmp/usr/bin/dbufstat' '$(CURDIR)/debian/tmp/usr/sbin/dbufstat'
 	@# 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/$(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
 	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
 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)
 	dh_auto_clean
 	@if test -e META.orig; then mv META.orig META; fi
 override_dh_install:
 	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
 ifeq (,$(findstring nodoc, $(DEB_BUILD_OPTIONS)))
 	http_proxy='127.0.0.1:9' $(SPHINX_BUILD) -N -bhtml "$(CURDIR)/contrib/pyzfs/docs/source/" debian/pyzfs-doc/usr/share/doc/pyzfs-doc/html/
 endif
 # ------------
 debian-copyright:
 	cme update dpkg-copyright -file debian/copyright.cme
@@ -0,0 +1 @@
 3.0 (quilt)
@@ -0,0 +1,8 @@
 for x in $(cat /proc/cmdline)
 do
 	case $x in
 		root=ZFS=*)
 			BOOT=zfs
 			;;
 	esac
 done
@@ -0,0 +1,67 @@
 #!/bin/sh
 #
 # Add udev rules for ZoL to the initrd.
 #
 PREREQ="udev"
 PREREQ_UDEV_RULES="60-zvol.rules 69-vdev.rules"
 COPY_EXEC_LIST="/lib/udev/zvol_id /lib/udev/vdev_id"
 # Generic result code.
 RC=0
 case $1 in
 prereqs)
 	echo "$PREREQ"
 	exit 0
 	;;
 esac
 for ii in $COPY_EXEC_LIST
 do
 	if [ ! -x "$ii" ]
 	then
 		echo "Error: $ii is not executable."
 		RC=2
 	fi
 done
 if [ "$RC" -ne 0 ]
 then
 	exit "$RC"
 fi
 . /usr/share/initramfs-tools/hook-functions
 mkdir -p "$DESTDIR/lib/udev/rules.d/"
 for ii in $PREREQ_UDEV_RULES
 do
 	if [ -e "/etc/udev/rules.d/$ii" ]
 	then
 		cp -p "/etc/udev/rules.d/$ii" "$DESTDIR/lib/udev/rules.d/"
 	elif [ -e "/lib/udev/rules.d/$ii" ]
 	then
 		cp -p "/lib/udev/rules.d/$ii" "$DESTDIR/lib/udev/rules.d/"
 	else
 		echo "Error: Missing udev rule: $ii"
 		echo "       This file must be in the /etc/udev/rules.d or /lib/udev/rules.d directory."
 		exit 1
 	fi
 done
 for ii in $COPY_EXEC_LIST
 do
 	copy_exec "$ii"
 done
 if [ -f '/etc/default/zfs' -a -r '/etc/default/zfs' ]
 then
 	mkdir -p "$DESTDIR/etc/default"
 	cp -a '/etc/default/zfs' "$DESTDIR/etc/default/"
 fi
 if [ -d '/etc/zfs' -a -r '/etc/zfs' ]
 then
 	mkdir -p "$DESTDIR/etc"
 	cp -a '/etc/zfs' "$DESTDIR/etc/"
 fi
@@ -0,0 +1,18 @@
 ## Allow read-only ZoL commands to be called through sudo
 ## without a password. Remove the first '#' column to enable.
 ##
 ## CAUTION: Any syntax error introduced here will break sudo.
 ##
 ## Cmnd alias specification
 #Cmnd_Alias C_ZFS = \
 #  /sbin/zfs "", /sbin/zfs help *, \
 #  /sbin/zfs get, /sbin/zfs get *, \
 #  /sbin/zfs list, /sbin/zfs list *, \
 #  /sbin/zpool "", /sbin/zpool help *, \
 #  /sbin/zpool iostat, /sbin/zpool iostat *, \
 #  /sbin/zpool list, /sbin/zpool list *, \
 #  /sbin/zpool status, /sbin/zpool status *, \
 #  /sbin/zpool upgrade, /sbin/zpool upgrade -v
 #
 ## allow any user to use basic read-only ZFS commands
 #ALL ALL = (root) NOPASSWD: C_ZFS
@@ -0,0 +1,14 @@
 #!/bin/sh
 # Sub-test to exclude ZVOLs
 set -e
 partition="$1"
 . /usr/share/os-prober/common.sh
 if [ "$(stat -L -c %t "$partition")" = "e6" ] ; then
 	debug "$1 is a ZVOL; skipping"
 	exit 0
 fi
 # No ZVOLs found
 exit 1
@@ -0,0 +1,45 @@
 #!/bin/sh -eu
 # 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 -F'\t' '$1 == "ONLINE" {print $2}' | \
 while read pool
 do
 	# 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
@@ -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
@@ -0,0 +1,2 @@
 version=3
 https://zfsonlinux.org/ .*zfs-([\d\.]+)\.tar\.gz$
@@ -0,0 +1,2 @@
 usr/lib/dracut
 usr/share/man/man7/dracut.zfs.7
@@ -0,0 +1,2 @@
 ../tree/zfs-initramfs/* /
 usr/share/initramfs-tools/*
@@ -0,0 +1 @@
 executable-not-elf-or-script *usr/share/initramfs-tools/scripts/zfs*
@@ -0,0 +1,15 @@
 sbin/zinject
 sbin/ztest
 usr/bin/raidz_test
 usr/share/man/man1/raidz_test.1
 usr/share/man/man1/test-runner.1
 usr/share/man/man1/ztest.1
 usr/share/man/man8/zinject.8
 usr/share/zfs/common.sh
 usr/share/zfs/runfiles/
 usr/share/zfs/test-runner
 usr/share/zfs/zfs-tests.sh
 usr/share/zfs/zfs-tests/
 usr/share/zfs/zfs.sh
 usr/share/zfs/zimport.sh
 usr/share/zfs/zloop.sh
@@ -0,0 +1,13 @@
 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*
@@ -0,0 +1,5 @@
 etc/zfs/zed.d/*
 lib/systemd/system/zfs-zed.service
 usr/lib/zfs-linux/zed.d/*
 usr/sbin/zed
 usr/share/man/man8/zed.8
@@ -0,0 +1,4 @@
 script-not-executable
 # https://github.com/zfsonlinux/zfs/issues/8064
 systemd-service-file-refers-to-unusual-wantedby-target
@@ -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#
@@ -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#
@@ -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#
@@ -0,0 +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 if [ $(date +\%w) -eq 0 ] && [ -x /usr/lib/zfs-linux/scrub ]; then /usr/lib/zfs-linux/scrub; fi
@@ -0,0 +1,2 @@
 COPYRIGHT
 LICENSE
@@ -0,0 +1,5 @@
 etc/zfs/vdev_id.conf.alias.example
 etc/zfs/vdev_id.conf.multipath.example
 etc/zfs/vdev_id.conf.sas_direct.example
 etc/zfs/vdev_id.conf.sas_switch.example
 etc/zfs/vdev_id.conf.scsi.example
@@ -0,0 +1,132 @@
 ../tree/zfsutils-linux/* /
 etc/default/zfs
 etc/zfs/zfs-functions
 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/
 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/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-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/
@@ -0,0 +1,3 @@
 sbin/zfs      bin/zfs
 sbin/zpool    bin/zpool
 usr/lib/zfs-linux/zpool_influxdb  bin/zpool_influxdb
@@ -0,0 +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*
@@ -0,0 +1,19 @@
 #!/bin/sh
 set -e
 # The hostname and hostid of the last system to access a ZFS pool are stored in
 # the ZFS pool itself. A pool is foreign if, during `zpool import`, the
 # current hostname and hostid are different than the stored values thereof.
 #
 # The only way of having a stable hostid is to define it in /etc/hostid.
 # This postinst helper will check if we already have the hostid stabilized by
 # checking the existence of the file /etc/hostid to be 4 bytes at least.
 # If this file don't already exists on our system or has less than 4 bytes, then
 # a new (random) value is generated with zgenhostid (8) and stored in
 # /etc/hostid
 if [ ! -f /etc/hostid ] || [ "$(stat -c %s /etc/hostid)" -lt 4 ] ; then
 	zgenhostid
 fi
 #DEBHELPER#
@@ -1,159 +0,0 @@
 spl-linux (0.7.12-pve1~bpo1) unstable; urgency=medium
  * update SPL to 0.7.12
 -- Proxmox Support Team <support@proxmox.com>  Wed, 14 Nov 2018 17:51:59 +0100
 spl-linux (0.7.11-pve2~bpo1) unstable; urgency=medium
  * update SPL to debian/0.7.11
  * Backport deadlock fix between mm_sem and tx assign in zfs_write() and page
    fault
 -- Proxmox Support Team <support@proxmox.com>  Mon, 29 Oct 2018 13:47:39 +0100
 spl-linux (0.7.11-pve1~bpo1) unstable; urgency=medium
  * update SPL to 0.7.11
 -- Proxmox Support Team <support@proxmox.com>  Mon, 10 Sep 2018 15:47:06 +0200
 spl-linux (0.7.9-pve1~bpo9) unstable; urgency=medium
  * update SPL to 0.7.9
 -- Proxmox Support Team <support@proxmox.com>  Fri, 18 May 2018 13:49:09 +0200
 spl-linux (0.7.8-pve1~bpo9) unstable; urgency=medium
  * update SPL to 0.7.8 (no changes)
 -- Proxmox Support Team <support@proxmox.com>  Mon, 30 Apr 2018 13:47:22 +0200
 spl-linux (0.7.7-pve1~bpo9) unstable; urgency=medium
  * update SPL to 0.7.7
 -- Proxmox Support Team <support@proxmox.com>  Tue, 3 Apr 2018 14:28:35 +0200
 spl-linux (0.7.6-pve1~bpo9) unstable; urgency=medium
  * update SPL to 0.7.6
 -- Proxmox Support Team <support@proxmox.com>  Wed, 21 Feb 2018 09:47:54 +0100
 spl-linux (0.7.4-pve1~bpo9) unstable; urgency=medium
  * update SPL to 0.7.4
 -- Proxmox Support Team <support@proxmox.com>  Tue, 19 Dec 2017 12:52:42 +0100
 spl-linux (0.7.3-pve1~bpo9) unstable; urgency=medium
  * update spl to 0.7.3
 -- Proxmox Support Team <support@proxmox.com>  Mon, 6 Nov 2017 09:14:19 +0100
 spl-linux (0.7.2-pve1~bpo90) unstable; urgency=medium
  * update spl to 0.7.2
  * clean up man pages
 -- Proxmox Support Team <support@proxmox.com>  Thu, 12 Oct 2017 13:33:04 +0200
 spl-linux (0.6.5.11-pve10~bpo90) unstable; urgency=medium
  * update spl to debian/0.6.5.11-1
 -- Proxmox Support Team <support@proxmox.com>  Thu, 27 Jul 2017 13:11:45 +0200
 spl-linux (0.6.5.9-pve9~bpo90) unstable; urgency=medium
  * rebuild for PVE 5.0 / Debian Stretch
 -- Proxmox Support Team <support@proxmox.com>  Fri, 10 Mar 2017 09:45:52 +0100
 spl-linux (0.6.5.9-pve8~bpo80) unstable; urgency=medium
  * update spl to debian/0.6.5.9-1
 -- Proxmox Support Team <support@proxmox.com>  Mon, 6 Feb 2017 12:39:35 +0100
 spl-linux (0.6.5.8-pve7~bpo80) unstable; urgency=medium
  * update spl to debian/0.6.5.8-2
  * switch package upstream sources to Debian (Jessie)
 -- Proxmox Support Team <support@proxmox.com>  Wed, 12 Oct 2016 11:16:02 +0200
 spl-linux (0.6.5.7-pve6~bpo80) unstable; urgency=medium
  * update pkg-spl to jessie/0.6.5.7-5
  * change package versioning to allow upgrades from PVE3/wheezy
 -- Proxmox Support Team <support@proxmox.com>  Tue, 28 Jun 2016 09:50:00 +0200
 spl-linux (0.6.5-pve5~jessie) unstable; urgency=medium
  * Update pkg-spl to jessie/0.6.5.6-3
 -- Proxmox Support Team <support@proxmox.com>  Fri, 15 Apr 2016 11:11:59 +0200
 spl-linux (0.6.5-pve4~jessie) unstable; urgency=medium
  * update to 0.6.5.6
 -- Proxmox Support Team <support@proxmox.com>  Wed, 30 Mar 2016 10:49:49 +0200
 spl-linux (0.6.5-pve3~jessie) unstable; urgency=medium
  * update to 0.6.5.4
 -- Proxmox Support Team <support@proxmox.com>  Thu, 14 Jan 2016 11:00:40 +0100
 spl-linux (0.6.5-pve2~jessie) unstable; urgency=medium
  * update to 0.6.5.3
 -- Proxmox Support Team <support@proxmox.com>  Wed, 04 Nov 2015 17:40:58 +0100
 spl-linux (0.6.5-pve1~jessie) unstable; urgency=medium
  * update to master/debian/jessie/0.6.5-1
 -- Proxmox Support Team <support@proxmox.com>  Mon, 21 Sep 2015 10:04:23 +0200
 spl-linux (0.6.4-pve3~jessie) unstable; urgency=medium
  * update to snapshot/debian/jessie/0.6.4-8-8ac6ff
 -- Proxmox Support Team <support@proxmox.com>  Mon, 24 Aug 2015 06:14:12 +0200
 spl-linux (0.6.4-pve2~jessie) unstable; urgency=medium
  * update to 0.6.4.2 (snapshot/debian/jessie/0.6.4-6-37d7cd)
 -- Proxmox Support Team <support@proxmox.com>  Tue, 21 Jul 2015 11:02:31 +0200
 spl-linux (0.6.4-pve1~jessie) unstable; urgency=medium
  * update to 0.6.4 (use upstream zol package definitions)
 -- Proxmox Support Team <support@proxmox.com>  Tue, 14 Apr 2015 10:17:26 +0200
 spl-linux (0.6.3-pve1~jessie) unstable; urgency=medium
  * recompile for jessie
 -- Proxmox Support Team <support@proxmox.com>  Sat, 28 Feb 2015 16:03:01 +0100
 spl-linux (0.6.3-pve1~wheezy) unstable; urgency=low
  * first version for Proxmox VE
 -- Proxmox Support Team <support@proxmox.com>  Sat, 10 Jan 2015 14:06:34 +0100
@@ -1,167 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
 Date: Wed, 12 Oct 2016 10:57:39 +0200
 Subject: [PATCH] remove DKMS and module build
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 ---
 debian/control    |  1 -
 debian/control.in | 31 -------------------------
 debian/rules      | 67 +------------------------------------------------------
 3 files changed, 1 insertion(+), 98 deletions(-)
 diff --git a/debian/control b/debian/control
 index d83f962..f780c80 100644
 --- a/debian/control
 +++ b/debian/control
@@ -9,7 +9,6 @@ Build-Depends: autogen,
                autotools-dev,
                debhelper (>= 9),
                dh-autoreconf,
 -               dkms (>> 2.2.0.2-1~),
                libtool
 Standards-Version: 4.1.2
 Homepage: http://www.zfsonlinux.org/
 diff --git a/debian/control.in b/debian/control.in
 index 0e6c3fc..c8fe170 100644
 --- a/debian/control.in
 +++ b/debian/control.in
@@ -9,47 +9,16 @@ Build-Depends: autogen,
                autotools-dev,
                debhelper (>= 9),
                dh-autoreconf,
 -               dkms (>> 2.2.0.2-1~),
                libtool
 Standards-Version: 4.1.2
 Homepage: http://www.zfsonlinux.org/
 Vcs-Git: https://salsa.debian.org/zfsonlinux-team/spl.git
 Vcs-Browser: https://salsa.debian.org/zfsonlinux-team/spl
 -Package: spl-dkms
 -Architecture: all
 -Depends: dkms (>> 2.2.1.0),
 -         file,
 -         libc-dev,
 -         libelf-dev,
 -         lsb-release,
 -         ${misc:Depends}
 -Suggests: spl (>= ${source:Upstream-Version}),
 -         @LINUX_COMPAT@
 -Conflicts: spl (<< 0.7.9~)
 -Provides: spl-modules
 -Description: Solaris Porting Layer kernel modules for Linux
 - The Solaris Porting Layer (SPL) is a Linux kernel module which provides
 - many of the Solaris kernel APIs. This shim layer makes it possible to
 - run Solaris kernel code in the Linux kernel with relatively minimal
 - modification. The Solaris Porting LAyer Tests (SPLAT) is a Linux kernel
 - module which provides a testing harness for the SPL module.
 - .
 - SPL can be particularly useful when you want to track upstream Illumos
 - (or any other OpenSolaris fork) development closely and don't want the
 - overhead of maintaining a large patch which converts Solaris primitives
 - to Linux primitives.
 - .
 - This package contains the source code for the SPL and SPLAT Linux kernel
 - modules, which can be used with DKMS, so that local kernel modules are
 - automatically built and installed every time the kernel packages are
 - upgraded.
 -
 Package: spl
 Architecture: linux-any
 Conflicts: spl-dev, splat
 Depends: ${misc:Depends}, ${shlibs:Depends}
 -Recommends: spl-modules | spl-dkms
 Description: Solaris Porting Layer user-space utilities for Linux
  The Solaris Porting Layer (SPL) is a Linux kernel module which provides
  many of the Solaris kernel APIs. This shim layer makes it possible to
 diff --git a/debian/rules b/debian/rules
 index 72ded49..5abeebb 100755
 --- a/debian/rules
 +++ b/debian/rules
@@ -14,11 +14,8 @@ ifndef KVERS
 KVERS=$(shell uname -r)
 endif
 -non_epoch_version=$(shell echo $(KVERS) | perl -pe 's/^\d+://')
 -pmodules = $(NAME)-modules-$(non_epoch_version)
 -
 %:
 -	dh $@ --with dkms,autoreconf --parallel
 +	dh $@ --with autoreconf --parallel
 override_dh_auto_configure:
 	sed "s/@LINUX_COMPAT@/linux-libc-dev \(<< $(LINUX_NEXT)~\)/" debian/control.in > debian/control
@@ -44,69 +41,7 @@ override_dh_auto_install:
 	@# This creates the $(CURDIR)/$(NAME)-$(VERSION)/ tree.
 	$(MAKE) distdir
 -	@# This shunt allows DKMS to install the Module.symvers and spl_config.h
 -	@# files to the ${dkms_tree} area through the POST_INSTALL directive.
 -	echo '#!/bin/sh'  >'$(CURDIR)/$(NAME)-$(VERSION)/cp'
 -	echo 'cp "$$@"'  >>'$(CURDIR)/$(NAME)-$(VERSION)/cp'
 -	chmod 755 '$(CURDIR)/$(NAME)-$(VERSION)/cp'
 -
 -	# Install the DKMS source.
 -	mkdir -p '$(CURDIR)/debian/tmp/usr/src/'
 -	mv '$(CURDIR)/$(NAME)-$(VERSION)' '$(CURDIR)/debian/tmp/usr/src/'
 -
 -override_dh_dkms:
 -	dh_dkms -V $(VERSION)
 -
 override_dh_auto_clean:
 	dh_auto_clean
 	@if test -e META.orig; then mv META.orig META; fi
 	sed "s/@LINUX_COMPAT@/linux-libc-dev \(<< $(LINUX_NEXT)~\)/" debian/control.in > debian/control
 -
 -# ------------
 -
 -override_dh_prep-deb-files:
 -	for templ in $(wildcard $(CURDIR)/debian/*_KVERS_*.in); do \
 -		sed -e 's/##KVERS##/$(KVERS)/g ; s/#KVERS#/$(KVERS)/g ; s/_KVERS_/$(KVERS)/g ; s/##KDREV##/$(KDREV)/g ; s/#KDREV#/$(KDREV)/g ; s/_KDREV_/$(KDREV)/g ;  s/_ARCH_/$(DEB_HOST_ARCH)/g' \
 -		< $$templ > `echo $$templ | sed -e 's/_KVERS_/$(KVERS)/g ; s/_ARCH_/$(DEB_HOST_ARCH)/g ; s/\.in$$//'` ; \
 -	done
 -	sed -e 's/##KVERS##/$(KVERS)/g ; s/#KVERS#/$(KVERS)/g ; s/_KVERS_/$(KVERS)/g ; s/##KDREV##/$(KDREV)/g ; s/#KDREV#/$(KDREV)/g ; s/_KDREV_/$(KDREV)/g ; s/_ARCH_/$(DEB_HOST_ARCH)/g' \
 -	< debian/control.modules.in > debian/control
 -
 -override_dh_configure_modules: override_dh_configure_modules_stamp
 -override_dh_configure_modules_stamp:
 -	./configure --with-config=kernel --with-linux=$(KSRC) \
 -		--with-linux-obj=$(KOBJ) \
 -		--disable-debug-kmem
 -	touch override_dh_configure_modules_stamp
 -
 -override_dh_binary-modules-udeb: override_dh_prep-deb-files override_dh_configure_modules
 -	dh_testdir
 -	dh_testroot
 -	dh_prep
 -
 -	$(MAKE) -C $(CURDIR)/module modules
 -
 -	dh_installdirs -p${pmodules}-di
 -	dh_install -p${pmodules}-di
 -	dh_gencontrol -p${pmodules}-di
 -
 -	dh_builddeb -p${pmodules}-di
 -
 -override_dh_binary-modules: override_dh_prep-deb-files override_dh_configure_modules
 -	dh_testdir
 -	dh_testroot
 -	dh_prep
 -
 -	$(MAKE) -C $(CURDIR)/module modules
 -
 -	dh_installdocs -p${pmodules}
 -	dh_install -p${pmodules}
 -	dh_installchangelogs -p${pmodules}
 -	dh_compress -p${pmodules}
 -	dh_strip -p${pmodules}
 -	dh_fixperms -p${pmodules}
 -	dh_installdeb -p${pmodules}
 -	dh_gencontrol -p${pmodules}
 -	dh_md5sums -p${pmodules}
 -
 -	dh_builddeb -p${pmodules}
@@ -1,42 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: ilbsmart <wgqimut@gmail.com>
 Date: Wed, 17 Oct 2018 02:11:24 +0800
 Subject: [PATCH] deadlock between mm_sem and tx assign in zfs_write() and page
 fault
 The bug time sequence:
 1. thread #1, `zfs_write` assign a txg "n".
 2. In a same process, thread #2, mmap page fault (which means the
   `mm_sem` is hold) occurred, `zfs_dirty_inode` open a txg failed,
   and wait previous txg "n" completed.
 3. thread #1 call `uiomove` to write, however page fault is occurred
   in `uiomove`, which means it need `mm_sem`, but `mm_sem` is hold by
   thread #2, so it stuck and can't complete,  then txg "n" will
   not complete.
 So thread #1 and thread #2 are deadlocked.
 Reviewed-by: Chunwei Chen <tuxoko@gmail.com>
 Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Reviewed-by: Matthew Ahrens <mahrens@delphix.com>
 Signed-off-by: Grady Wong <grady.w@xtaotech.com>
 Closes #7939
 (backported from: zfs-upstream 779a6c0bf6df76e0dd92c1ccf81f48512b835bb0)
 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 ---
 include/sys/uio.h | 1 +
 1 file changed, 1 insertion(+)
 diff --git a/include/sys/uio.h b/include/sys/uio.h
 index 764beb9..2895690 100644
 --- a/include/sys/uio.h
 +++ b/include/sys/uio.h
@@ -53,6 +53,7 @@ typedef struct uio {
 	int		uio_iovcnt;
 	offset_t	uio_loffset;
 	uio_seg_t	uio_segflg;
 +	boolean_t	uio_fault_disable;
 	uint16_t	uio_fmode;
 	uint16_t	uio_extflg;
 	offset_t	uio_limit;
@@ -1,34 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tony Hutter <hutter2@llnl.gov>
 Date: Fri, 26 Oct 2018 01:24:24 -0400
 Subject: [PATCH] Define timestruc_t for Lustre compatibility
 Lustre 2.8 (and possibly other versions) are still using timestruc_t,
 which was removed in spl-0.7.10 in favor of inode_timespec_t.  Add
 in a backwards compatibility #define for timestruc_t so that Lustre
 builds.
 Reviewed by: Brian Behlendorf <behlendorf1@llnl.gov>
 Reviewed-by: George Melikov <mail@gmelikov.ru>
 Signed-off-by: Tony Hutter <hutter2@llnl.gov>
 Closes #8014
 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 ---
 include/sys/time.h | 3 +++
 1 file changed, 3 insertions(+)
 diff --git a/include/sys/time.h b/include/sys/time.h
 index 59557af..9029671 100644
 --- a/include/sys/time.h
 +++ b/include/sys/time.h
@@ -66,6 +66,9 @@ typedef struct timespec64	inode_timespec_t;
 typedef struct timespec		inode_timespec_t;
 #endif
 +/* Include for Lustre compatibility */
 +#define        timestruc_t     inode_timespec_t
 +
 static inline void
 gethrestime(inode_timespec_t *ts)
  {
@@ -1,35 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tony Hutter <hutter2@llnl.gov>
 Date: Fri, 26 Oct 2018 06:51:38 -0400
 Subject: [PATCH] Backport vnode.h changes from zfs:93ce2b4c
 This backports the vnode.h changes from zfs:93ce2b4c for zfs-0.7.12.
 Signed-off-by: Tony Hutter <hutter2@llnl.gov>
 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 ---
 include/sys/vnode.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 diff --git a/include/sys/vnode.h b/include/sys/vnode.h
 index 87f12d6..279bd87 100644
 --- a/include/sys/vnode.h
 +++ b/include/sys/vnode.h
@@ -87,7 +87,7 @@
 #define	AT_MTIME	ATTR_MTIME
 #define	AT_CTIME	ATTR_CTIME
 -#define	ATTR_XVATTR	(1 << 31)
 +#define	ATTR_XVATTR	(1U << 31)
 #define	AT_XVATTR	ATTR_XVATTR
 #define	ATTR_IATTR_MASK	(ATTR_MODE | ATTR_UID | ATTR_GID | ATTR_SIZE | \
@@ -121,7 +121,7 @@ typedef enum vtype {
 typedef struct vattr {
 	enum vtype	va_type;	/* vnode type */
 -	uint_t		va_mask;	/* attribute bit-mask */
 +	uint32_t        va_mask;        /* attribute bit-mask */
 	ushort_t	va_mode;	/* acc mode */
 	uid_t		va_uid;		/* owner uid */
 	gid_t		va_gid;		/* owner gid */
@@ -1,40 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tony Hutter <hutter2@llnl.gov>
 Date: Wed, 24 Oct 2018 22:42:14 -0700
 Subject: [PATCH] Linux 4.20 compat: current_kernel_time()
 Commit torvalds/linux@976516404 removed the current_kernel_time()
 function (and several others).  All callers are expected to use
 current_kernel_time64().  Update the gethrestime_sec() wrapper
 accordingly.
 Backported to SPL from zfs:82c0a050f
 Reviewed-by: Olaf Faaland <faaland1@llnl.gov>
 Reviewed-by: Tony Hutter <hutter2@llnl.gov>
 Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Closes #8074
 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 ---
 include/sys/time.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
 diff --git a/include/sys/time.h b/include/sys/time.h
 index 9029671..563c210 100644
 --- a/include/sys/time.h
 +++ b/include/sys/time.h
@@ -82,8 +82,11 @@ gethrestime(inode_timespec_t *ts)
 static inline time_t
 gethrestime_sec(void)
 {
 -	struct timespec ts;
 -	ts = current_kernel_time();
 +#if defined(HAVE_INODE_TIMESPEC64_TIMES)
 +	inode_timespec_t ts = current_kernel_time64();
 +#else
 +	inode_timespec_t ts = current_kernel_time();
 +#endif
 	return (ts.tv_sec);
 }
@@ -1,57 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tony Hutter <hutter2@llnl.gov>
 Date: Wed, 7 Nov 2018 22:13:20 -0800
 Subject: [PATCH] Add BuildRequires gcc, make, elfutils-libelf-devel
 This adds a BuildRequires for gcc, make, and elfutils-libelf-devel
 into our spec files.  gcc has been a packaging requirement for
 awhile now:
 https://fedoraproject.org/wiki/Packaging:C_and_C%2B%2B
 These additional BuildRequires allow us to mock build in
 Fedora 29.
 (This is the backported SPL equivalent of the original ZFS patch)
 Reviewed-by: Neal Gompa <ngompa@datto.com>
 Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Signed-off-by:  Tony Hutter <hutter2@llnl.gov>
 Closes #8095
 Closes #8102
 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 ---
 rpm/generic/spl-kmod.spec.in | 4 ++++
 rpm/generic/spl.spec.in      | 3 +++
 2 files changed, 7 insertions(+)
 diff --git a/rpm/generic/spl-kmod.spec.in b/rpm/generic/spl-kmod.spec.in
 index 4cc1faf..f986cde 100644
 --- a/rpm/generic/spl-kmod.spec.in
 +++ b/rpm/generic/spl-kmod.spec.in
@@ -26,6 +26,10 @@ URL:            http://zfsonlinux.org/
 Source0:        %{module}-%{version}.tar.gz
 Source10:       kmodtool
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id} -u -n)
 +%if 0%{?rhel}%{?fedora}
 +BuildRequires:  gcc, make
 +BuildRequires:  elfutils-libelf-devel
 +%endif
 # The developments headers will conflict with the dkms packages.
 Conflicts:      %{module}-dkms
 diff --git a/rpm/generic/spl.spec.in b/rpm/generic/spl.spec.in
 index 4b3a3d7..b17c68e 100644
 --- a/rpm/generic/spl.spec.in
 +++ b/rpm/generic/spl.spec.in
@@ -20,6 +20,9 @@ Source0:        %{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       %{name}-kmod = %{version}
 Provides:       %{name}-kmod-common = %{version}
 +%if 0%{?rhel}%{?fedora}%{?suse_version}
 +BuildRequires:  gcc, make
 +%endif
 %description
 This package contains the commands to verify the SPL
@@ -1,56 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tony Hutter <hutter2@llnl.gov>
 Date: Thu, 8 Nov 2018 14:38:28 -0800
 Subject: [PATCH] Tag spl-0.7.12
 META file and changelog updated.
 Signed-off-by: Tony Hutter <hutter2@llnl.gov>
 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 ---
 META                         | 2 +-
 rpm/generic/spl-kmod.spec.in | 3 +++
 rpm/generic/spl.spec.in      | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)
 diff --git a/META b/META
 index fc98597..de72c4f 100644
 --- a/META
 +++ b/META
@@ -1,7 +1,7 @@
 Meta:         1
 Name:         spl
 Branch:       1.0
 -Version:      0.7.11
 +Version:      0.7.12
 Release:      1
 Release-Tags: relext
 License:      GPL
 diff --git a/rpm/generic/spl-kmod.spec.in b/rpm/generic/spl-kmod.spec.in
 index f986cde..ef32f93 100644
 --- a/rpm/generic/spl-kmod.spec.in
 +++ b/rpm/generic/spl-kmod.spec.in
@@ -171,6 +171,9 @@ chmod u+x ${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/*/extra/*/*/*
 rm -rf $RPM_BUILD_ROOT
 %changelog
 +* Thu Nov 08 2018 Tony Hutter <hutter2@llnl.gov> - 0.7.12-1
 +- Released 0.7.12-1, detailed release notes are available at:
 +- https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.7.12
 * Thu Sep 13 2018 Tony Hutter <hutter2@llnl.gov> - 0.7.11-1
 - Released 0.7.11-1, detailed release notes are available at:
 - https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.7.11
 diff --git a/rpm/generic/spl.spec.in b/rpm/generic/spl.spec.in
 index b17c68e..30ed496 100644
 --- a/rpm/generic/spl.spec.in
 +++ b/rpm/generic/spl.spec.in
@@ -47,6 +47,9 @@ make install DESTDIR=%{?buildroot}
 %{_mandir}/man5/*
 %changelog
 +* Thu Nov 08 2018 Tony Hutter <hutter2@llnl.gov> - 0.7.12-1
 +- Released 0.7.12-1, detailed release notes are available at:
 +- https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.7.12
 * Thu Sep 13 2018 Tony Hutter <hutter2@llnl.gov> - 0.7.11-1
 - Released 0.7.11-1, detailed release notes are available at:
 - https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.7.11
@@ -1,7 +0,0 @@
 0001-remove-DKMS-and-module-build.patch
 0002-deadlock-between-mm_sem-and-tx-assign-in-zfs_write-a.patch
 0003-Define-timestruc_t-for-Lustre-compatibility.patch
 0004-Backport-vnode.h-changes-from-zfs-93ce2b4c.patch
 0005-Linux-4.20-compat-current_kernel_time.patch
 0006-Add-BuildRequires-gcc-make-elfutils-libelf-devel.patch
 0007-Tag-spl-0.7.12.patch
@@ -1,276 +0,0 @@
 zfs-linux (0.7.12-pve1~bpo1) unstable; urgency=medium
  * update ZFS to 0.7.12
 -- Proxmox Support Team <support@proxmox.com>  Wed, 14 Nov 2018 17:51:59 +0100
 zfs-linux (0.7.11-pve2~bpo1) unstable; urgency=medium
  * update ZFS to debian/0.7.11-3
  * Cherry-pick two fixes planned for 0.7.12
  * Backport deadlock fix between mm_sem and tx assign in zfs_write() and page
    fault
  * Fix missing Breaks/Replaces in zfs-initramfs
 -- Proxmox Support Team <support@proxmox.com>  Mon, 29 Oct 2018 13:45:49 +0100
 zfs-linux (0.7.11-pve1~bpo1) unstable; urgency=medium
  * update ZFS to 0.7.11
 -- Proxmox Support Team <support@proxmox.com>  Mon, 10 Sep 2018 15:47:31 +0200
 zfs-linux (0.7.9-pve3~bpo9) unstable; urgency=medium
  *  Cherry-pick fix for deadlock umount/snapentry_expire
 -- Proxmox Support Team <support@proxmox.com>  Fri, 03 Aug 2018 11:41:11 +0200
 zfs-linux (0.7.9-pve2~bpo9) unstable; urgency=medium
  * Cherry-pick fix for zpl_mount deadlock
 -- Proxmox Support Team <support@proxmox.com>  Fri, 12 Jul 2018 12:37:50 +0200
 zfs-linux (0.7.9-pve1~bpo9) unstable; urgency=medium
  * update ZFS to 0.7.9
 -- Proxmox Support Team <support@proxmox.com>  Fri, 18 May 2018 13:49:09 +0200
 zfs-linux (0.7.8-pve1~bpo9) unstable; urgency=medium
  * update ZFS to 0.7.8 (no changes)
 -- Proxmox Support Team <support@proxmox.com>  Mon, 30 Apr 2018 13:47:22 +0200
 zfs-linux (0.7.7-pve2~bpo9) unstable; urgency=medium
  * (temporarily) revert likely cause of #7401
 -- Proxmox Support Team <support@proxmox.com>  Mon, 9 Apr 2018 09:49:27 +0200
 zfs-linux (0.7.7-pve1~bpo9) unstable; urgency=medium
  * update ZFS to 0.7.7
 -- Proxmox Support Team <support@proxmox.com>  Tue, 3 Apr 2018 14:28:35 +0200
 zfs-linux (0.7.6-pve1~bpo9) unstable; urgency=medium
  * update ZFS to 0.7.6
 -- Proxmox Support Team <support@proxmox.com>  Wed, 21 Feb 2018 09:48:29 +0100
 zfs-linux (0.7.4-pve2~bpo9) unstable; urgency=medium
  * cherry-pick ARC hit rate fix from 0.7.6
  * always load ZFS modules on boot
 -- Proxmox Support Team <support@proxmox.com>  Fri, 19 Jan 2018 11:31:14 +0100
 zfs-linux (0.7.4-pve1~bpo9) unstable; urgency=medium
  * update ZFS to 0.7.4
 -- Proxmox Support Team <support@proxmox.com>  Tue, 19 Dec 2017 12:52:42 +0100
 zfs-linux (0.7.3-pve1~bpo9) unstable; urgency=medium
  * update ZFS to 0.7.3
  * include fix for user namespace setgid issue (#6800 upstream)
 -- Proxmox Support Team <support@proxmox.com>  Mon, 6 Nov 2017 09:14:19 +0100
 zfs-linux (0.7.2-pve1~bpo90) unstable; urgency=medium
  * update zfs to 0.7.2
  * add PR 6616 - zfs send/recv compatibility with 0.6.5
  * add PR 6695 - zfs recv: don't skip over objects which should be freed
  * various small fixes
  * split test suite into zfs-test package
 -- Proxmox Support Team <support@proxmox.com>  Thu, 12 Oct 2017 13:34:05 +0200
 zfs-linux (0.6.5.11-pve18~bpo90) unstable; urgency=medium
  * fix #1509: arc_summary error with L2ARC
 -- Proxmox Support Team <support@proxmox.com>  Mon, 2 Oct 2017 09:30:41 +0200
 zfs-linux (0.6.5.11-pve17~bpo90) unstable; urgency=medium
  * update zfs to debian/0.6.5.11-1
 -- Proxmox Support Team <support@proxmox.com>  Thu, 27 Jul 2017 13:11:45 +0200
 zfs-linux (0.6.5.9-pve16~bpo90) unstable; urgency=medium
  * drop transitional packages
  * convert python scripts to python 3, drop .py suffix
  * rebuild for PVE 5.0 / Debian Stretch
 -- Proxmox Support Team <support@proxmox.com>  Fri, 10 Mar 2017 09:45:52 +0100
 zfs-linux (0.6.5.9-pve15~bpo80) unstable; urgency=medium
  * update zfs to debian/0.6.5.9-1
 -- Proxmox Support Team <support@proxmox.com>  Mon, 6 Feb 2017 12:39:10 +0100
 zfs-linux (0.6.5.8-pve14~bpo80) unstable; urgency=medium
  * update zfs to debian/0.6.5.8-3
 -- Proxmox Support Team <support@proxmox.com>  Wed, 11 Jan 2017 09:34:58 +0100
 zfs-linux (0.6.5.8-pve13~bpo80) unstable; urgency=medium
  * fix #1184: zfs-share.service has wrong path to 'rm' command
 -- Proxmox Support Team <support@proxmox.com>  Thu, 27 Oct 2016 11:25:47 +0200
 zfs-linux (0.6.5.8-pve12~bpo80) unstable; urgency=medium
  * import with "-d /dev/disk/by-id" in systemd service
 -- Proxmox Support Team <support@proxmox.com>  Mon, 24 Oct 2016 13:48:08 +0200
 zfs-linux (0.6.5.8-pve11~bpo80) unstable; urgency=medium
  * update zfs to debian/0.6.5.8-1
  * switch package upstream sources to Debian (Jessie)
  * add transitional packages for upgrades
 -- Proxmox Support Team <support@proxmox.com>  Wed, 12 Oct 2016 11:16:02 +0200
 zfs-linux (0.6.5.7-pve10~bpo80) unstable; urgency=medium
  * update to pkg-zfs jessie/0.6.5.7-8
  * change package versioning to allow upgrades from PVE3/wheezy
 -- Proxmox Support Team <support@proxmox.com>  Tue, 28 Jun 2016 09:50:00 +0200
 zfs-linux (0.6.5-pve9~jessie) unstable; urgency=medium
  * Update to pkg-zfs jessie/0.6.5.6-3
 -- Proxmox Support Team <support@proxmox.com>  Tue, 12 Apr 2016 09:51:35 +0200
 zfs-linux (0.6.5-pve8~jessie) unstable; urgency=medium
  * update to zfs-0.6.5.6
 -- Proxmox Support Team <support@proxmox.com>  Wed, 30 Mar 2016 10:50:22 +0200
 zfs-linux (0.6.5-pve7~jessie) unstable; urgency=medium
  * update to zfs-0.6.5.4
 -- Proxmox Support Team <support@proxmox.com>  Thu, 14 Jan 2016 10:51:17 +0100
 zfs-linux (0.6.5-pve6~jessie) unstable; urgency=medium
  * Prepare to tag zfs-0.6.5.3
 -- Proxmox Support Team <support@proxmox.com>  Thu, 05 Nov 2015 07:21:44 +0100
 zfs-linux (0.6.5-pve5~jessie) unstable; urgency=medium
  * Illumos 6267 - dn_bonus evicted too early
  * Fix use-after-free in vdev_disk_physio_completion
 -- Proxmox Support Team <support@proxmox.com>  Wed, 04 Nov 2015 17:42:42 +0100
 zfs-linux (0.6.5-pve4~jessie) unstable; urgency=medium
  * update to master/debian/jessie/0.6.5.2-2
 -- Proxmox Support Team <support@proxmox.com>  Mon, 05 Oct 2015 17:56:45 +0200
 zfs-linux (0.6.5-pve3~jessie) unstable; urgency=medium
  * do not install /etc/init.d/zfs-zed script to avoid double startup
    with systemd
 -- Proxmox Support Team <support@proxmox.com>  Mon, 28 Sep 2015 10:14:40 +0200
 zfs-linux (0.6.5-pve2~jessie) unstable; urgency=medium
  * update to master/debian/jessie/0.6.5.1-4
 -- Proxmox Support Team <support@proxmox.com>  Thu, 24 Sep 2015 12:45:33 +0200
 zfs-linux (0.6.5-pve1~jessie) unstable; urgency=medium
  * update to master/debian/jessie/0.6.5.1-2
 -- Proxmox Support Team <support@proxmox.com>  Mon, 21 Sep 2015 10:02:41 +0200
 zfs-linux (0.6.4-pve3~jessie) unstable; urgency=medium
  * update to snapshot/debian/jessie/0.6.4-24-6bec43
 -- Proxmox Support Team <support@proxmox.com>  Mon, 24 Aug 2015 06:13:44 +0200
 zfs-linux (0.6.4-pve2~jessie) unstable; urgency=medium
  * update to 0.6.4.2 (snapshot/debian/jessie/0.6.4-21-53b1d9)
 -- Proxmox Support Team <support@proxmox.com>  Tue, 21 Jul 2015 11:03:21 +0200
 zfs-linux (0.6.4-pve1~jessie) unstable; urgency=medium
  * update to 0.6.4 (use upstream zol package definitions)
 -- Proxmox Support Team <support@proxmox.com>  Tue, 14 Apr 2015 10:19:22 +0200
 zfs-linux (0.6.3-pve3~jessie) unstable; urgency=medium
  * ignore zfs-import-scan errors
 -- Proxmox Support Team <support@proxmox.com>  Tue, 31 Mar 2015 17:52:40 +0200
 zfs-linux (0.6.3-pve2~jessie) unstable; urgency=medium
  * use systemd for service startup
  * install zed configuration file /etc/zfs/zed.d/zed.rc
 -- Proxmox Support Team <support@proxmox.com>  Sun, 15 Mar 2015 15:52:54 +0100
 zfs-linux (0.6.3-pve1~jessie) unstable; urgency=medium
  * recompile on jessie
 -- Proxmox Support Team <support@proxmox.com>  Sat, 28 Feb 2015 16:02:08 +0100
 zfs-linux (0.6.3-2~wheezy) unstable; urgency=low
  * use /sbin/modprobe to avoid warning inside initrd
  * fix warning about undefined values inside initrd
 -- Proxmox Support Team <support@proxmox.com>  Wed, 14 Jan 2015 19:03:04 +0100
 zfs-linux (0.6.3-1~wheezy) unstable; urgency=low
  * first version for Proxmox VE
 -- Proxmox Support Team <support@proxmox.com>  Sat, 10 Jan 2015 14:06:34 +0100
@@ -1,289 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
 Date: Mon, 6 Feb 2017 11:03:10 +0100
 Subject: [PATCH] remove DKMS, modules and dracut build
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 ---
 debian/control       |   1 -
 debian/control.in    |  40 ++-----------------
 debian/not-installed |   2 +
 debian/rules         | 108 +--------------------------------------------------
 4 files changed, 7 insertions(+), 144 deletions(-)
 diff --git a/debian/control b/debian/control
 index 4d22ff50..f33008df 100644
 --- a/debian/control
 +++ b/debian/control
@@ -10,7 +10,6 @@ Build-Depends: autotools-dev,
                debhelper (>= 10.2),
                dh-autoreconf,
                dh-python,
 -               dkms (>> 2.1.1.2-5),
                libattr1-dev,
                libblkid-dev,
                libselinux1-dev,
 diff --git a/debian/control.in b/debian/control.in
 index 96154c5c..0a9ceef6 100644
 --- a/debian/control.in
 +++ b/debian/control.in
@@ -10,7 +10,6 @@ Build-Depends: autotools-dev,
                debhelper (>= 10.2),
                dh-autoreconf,
                dh-python,
 -               dkms (>> 2.1.1.2-5),
                libattr1-dev,
                libblkid-dev,
                libselinux1-dev,
@@ -95,26 +94,10 @@ Description: OpenZFS pool library for Linux
  .
  This zpool library provides support for managing zpools.
 -Package: zfs-dkms
 -Architecture: all
 -Pre-Depends: spl-dkms (<<${source:Upstream-Version}.),
 -             spl-dkms (>= ${source:Upstream-Version})
 -Depends: dkms (>> 2.1.1.2-5), lsb-release, ${misc:Depends}
 -Recommends: zfs-zed, zfsutils-linux (>= ${binary:Version}), @LINUX_COMPAT@
 -Provides: zfs-modules
 -Description: OpenZFS filesystem kernel modules for Linux
 - The Z file system is a pooled filesystem designed for maximum data
 - integrity, supporting data snapshots, multiple copies, and data
 - checksums.
 - .
 - This DKMS package includes the SPA, DMU, ZVOL, and ZPL components of
 - OpenZFS.
 -
 Package: zfs-initramfs
 Architecture: all
 Depends: busybox-initramfs | busybox-static | busybox,
          initramfs-tools,
 -         zfs-modules | zfs-dkms,
          zfsutils-linux (>= ${binary:Version}),
          ${misc:Depends}
 Description: OpenZFS root filesystem capabilities for Linux - initramfs
@@ -125,29 +108,14 @@ 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,
 -         zfs-modules | zfs-dkms,
 -         zfsutils-linux (>= ${binary:Version}),
 -         ${misc:Depends}
 -Description: OpenZFS root filesystem capabilities for Linux - dracut
 - The Z file system is a pooled filesystem designed for maximum data
 - integrity, supporting data snapshots, multiple copies, and data
 - checksums.
 - .
 - 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-modules | zfs-dkms, zfs-zed
 -Breaks: zfs-dkms (<< ${binary:Version}), zfs-dkms (>> ${binary:Version})
 +Recommends: lsb-base, zfs-zed
 Suggests: nfs-kernel-server,
           samba-common-bin (>= 3.0.23),
 -          zfs-initramfs | zfs-dracut
 +          zfs-initramfs
 Conflicts: zfs, zfs-fuse
 Provides: zfsutils
 Description: command-line tools to manage OpenZFS filesystems
@@ -161,8 +129,7 @@ Description: command-line tools to manage OpenZFS filesystems
 Package: zfs-zed
 Section: contrib/admin
 Architecture: linux-any
 -Depends: zfs-modules | zfs-dkms,
 -         zfsutils-linux (>= ${binary:Version}),
 +Depends: zfsutils-linux (>= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Description: OpenZFS Event Daemon
@@ -185,7 +152,6 @@ Depends: acl,
          python,
          sudo,
          sysstat,
 -         zfs-modules | zfs-dkms,
          zfsutils-linux (>=${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 diff --git a/debian/not-installed b/debian/not-installed
 index a008985c..c60b0016 100644
 --- a/debian/not-installed
 +++ b/debian/not-installed
@@ -6,3 +6,5 @@ etc/zfs/vdev_id.conf.alias.example
 etc/zfs/vdev_id.conf.multipath.example
 etc/zfs/vdev_id.conf.sas_direct.example
 etc/zfs/vdev_id.conf.sas_switch.example
 +usr/lib/dracut
 +usr/share/zfs/enum-extract.pl
 diff --git a/debian/rules b/debian/rules
 index 21b8ccef..3ba4b99a 100755
 --- a/debian/rules
 +++ b/debian/rules
@@ -6,9 +6,6 @@ LSB_DISTRIBUTOR := $(shell lsb_release -is)
 NAME := $(shell awk '$$1 == "Name:" { print $$2; }' META)
 LINUX_NEXT := $(shell awk -F. '{print $$1 "." $$2+1}' debian/linux_compat)
 -DKMSFILES := module include config zfs.release.in autogen.sh META AUTHORS \
 -		DISCLAIMER COPYRIGHT OPENSOLARIS.LICENSE README.markdown
 -
 ifndef BUILD_UDEB
 BUILD_UDEB=false
 endif
@@ -18,21 +15,16 @@ KVERS=$(shell uname -r)
 endif
 ifndef SPL
 -SPL=/usr/src/spl-$(DEB_VERSION_UPSTREAM)
 -endif
 -
 -ifndef SPLOBJ
 -SPLOBJ=/var/lib/dkms/spl/$(DEB_VERSION_UPSTREAM)/$(KVERS)/$(DEB_TARGET_GNU_CPU)
 +SPL=../spl-build
 endif
 non_epoch_version=$(shell echo $(KVERS) | perl -pe 's/^\d+://')
 PACKAGE=zfs
 -pmodules = $(PACKAGE)-modules-$(non_epoch_version)
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 %:
 -	dh $@ --with autoreconf,dkms,python3,systemd --parallel
 +	dh $@ --with autoreconf,python3,systemd --parallel
 override_dh_autoreconf:
 	@# Embed the downstream version in the module.
@@ -57,14 +49,6 @@ endif
 	  --with-systemdpresetdir=/lib/systemd/system-preset \
 	  --with-config=user
 -override_dh_auto_build:
 -	@# Get a bare copy of the source code for DKMS.
 -	@# This creates the $(CURDIR)/$(NAME)-$(DEB_VERSION_UPSTREAM)/ tree, which does not
 -	@# contain the userland sources. NB: Remove-userland-dist-rules.patch
 -	$(MAKE) distdir
 -
 -	dh_auto_build
 -
 override_dh_auto_test:
 	# The dh_auto_test rule is disabled because
 	# `make check` cannot run in an unprivileged build environment.
@@ -88,29 +72,6 @@ override_dh_auto_install:
 	@# Zed has dependencies outside of the system root.
 	mv '$(CURDIR)/debian/tmp/sbin/zed' '$(CURDIR)/debian/tmp/usr/sbin/zed'
 -	@# Install the DKMS source.
 -	@# We only want the files needed to build the modules
 -	install -D -t '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/scripts' \
 -		'$(CURDIR)/scripts/enum-extract.pl' \
 -		'$(CURDIR)/scripts/dkms.postbuild'
 -	$(foreach file,$(DKMSFILES),mv '$(CURDIR)/$(NAME)-$(DEB_VERSION_UPSTREAM)/$(file)' '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)' || exit 1;)
 -	@# Hellish awk line:
 -	@#  * Deletes from configure.ac the parts not needed for building the kernel module
 -	@#     * It deletes from inside AC_CONFIG_FILES([]) everything except:
 -	@#        (Makefile$|include/|module/|*.release$)
 -	@#  * Takes care of spaces and tabs
 -	@#  * Remove reference to ZFS_AC_PACKAGE
 -	awk '/^AC_CONFIG_FILES\(\[/,/^\]\)/ { if ($$0 !~ /^(AC_CONFIG_FILES\(\[([ \t]+)?$$|\]\)([ \t]+)?$$|([ \t]+)?(include\/|module\/|Makefile([ \t]+)?$$|zfs\.release([ \t]+)?$$))/){next} } {print}' \
 -		'$(CURDIR)/$(NAME)-$(DEB_VERSION_UPSTREAM)/configure.ac' | sed '/ZFS_AC_PACKAGE/d' > '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/configure.ac'
 -	@# Set "SUBDIRS = module include" for CONFIG_KERNEL and remove SUBDIRS for all other configs.
 -	sed '1,/CONFIG_KERNEL/s/SUBDIRS.*=.*//g;s/SUBDIRS.*=.*/SUBDIRS = module include/g;' \
 -		'$(CURDIR)/$(NAME)-$(DEB_VERSION_UPSTREAM)/Makefile.am' > '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/Makefile.am'
 -	@# Sanity test
 -	grep -q 'SUBDIRS = module include' '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/Makefile.am'
 -	@# Run autogen on the stripped source tree
 -	cd '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)'; ./autogen.sh
 -	rm -fr '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/autom4te.cache'
 -
 	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}`; \
@@ -121,11 +82,6 @@ override_dh_auto_install:
 	chmod a-x '$(CURDIR)/debian/tmp/etc/default/zfs'
 	chmod a-x '$(CURDIR)/debian/tmp/usr/share/bash-completion/completions/zfs'
 -override_dh_dkms:
 -	'$(CURDIR)/scripts/dkms.mkconf' -n $(NAME) -v $(DEB_VERSION_UPSTREAM) -f '$(CURDIR)/scripts/zfs-dkms.dkms'
 -	dh_dkms
 -	rm -f '$(CURDIR)/scripts/zfs-dkms.dkms'
 -
 override_dh_makeshlibs:
 	dh_makeshlibs -a -V
 ifeq ($(BUILD_UDEB), true)
@@ -171,65 +127,5 @@ override_dh_installinit:
 # ------------
 -override_dh_prep-deb-files:
 -	for templ in $(wildcard $(CURDIR)/debian/*_KVERS_*.in); do \
 -		sed -e 's/##KVERS##/$(KVERS)/g ; s/#KVERS#/$(KVERS)/g ; s/_KVERS_/$(KVERS)/g ; s/##KDREV##/$(KDREV)/g ; s/#KDREV#/$(KDREV)/g ; s/_KDREV_/$(KDREV)/g ; s/_ARCH_/$(DEB_HOST_ARCH)/' \
 -		< $$templ > `echo $$templ | sed -e 's/_KVERS_/$(KVERS)/g ; s/_ARCH_/$(DEB_HOST_ARCH)/g ; s/\.in$$//'` ; \
 -	done
 -	sed -e 's/##KVERS##/$(KVERS)/g ; s/#KVERS#/$(KVERS)/g ; s/_KVERS_/$(KVERS)/g ; s/##KDREV##/$(KDREV)/g ; s/#KDREV#/$(KDREV)/g ; s/_KDREV_/$(KDREV)/g ; s/_ARCH_/$(DEB_HOST_ARCH)/g' \
 -	< debian/control.modules.in > debian/control
 -
 -override_dh_configure_modules_udeb: override_dh_configure_modules_udeb_stamp
 -override_dh_configure_modules_udeb_stamp:
 -	./configure \
 -		--without-selinux \
 -		--with-config=kernel \
 -		--with-linux=$(KSRC) \
 -		--with-linux-obj=$(KOBJ) \
 -		--with-spl=$(SPL) \
 -		--with-spl-obj=$(SPLOBJ)
 -	touch override_dh_configure_modules_udeb_stamp
 -
 -override_dh_configure_modules: override_dh_configure_modules_stamp
 -override_dh_configure_modules_stamp:
 -	./configure \
 -		--with-config=kernel \
 -		--with-linux=$(KSRC) \
 -		--with-linux-obj=$(KOBJ) \
 -		--with-spl=$(SPL) \
 -		--with-spl-obj=$(SPLOBJ)
 -	touch override_dh_configure_modules_stamp
 -
 -override_dh_binary-modules-udeb: override_dh_prep-deb-files override_dh_configure_modules_udeb
 -	dh_testdir
 -	dh_testroot
 -	dh_prep
 -
 -	$(MAKE) -C $(CURDIR)/module modules
 -
 -	dh_installdirs -p${pmodules}-di
 -	dh_install -p${pmodules}-di
 -	dh_gencontrol -p${pmodules}-di
 -
 -	dh_builddeb -p${pmodules}-di
 -
 -override_dh_binary-modules: override_dh_prep-deb-files override_dh_configure_modules
 -	dh_testdir
 -	dh_testroot
 -	dh_prep
 -
 -	$(MAKE) -C $(CURDIR)/module modules
 -
 -	dh_install -p${pmodules}
 -	dh_installdocs -p${pmodules}
 -	dh_installchangelogs -p${pmodules}
 -	dh_compress -p${pmodules}
 -	dh_strip -p${pmodules}
 -	dh_fixperms -p${pmodules}
 -	dh_installdeb -p${pmodules}
 -	dh_gencontrol -p${pmodules}
 -	dh_md5sums -p${pmodules}
 -	dh_builddeb -p${pmodules}
 -
 debian-copyright:
 	cme update dpkg-copyright -file debian/copyright.cme
@@ -1,40 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Stoiko Ivanov <s.ivanov@proxmox.com>
 Date: Mon, 29 Oct 2018 15:49:20 +0100
 Subject: [PATCH] Add Breaks/Replaces to zfs-initramfs
 addressing the move of zdev initramfs hook from zfsutils-linux to
 zfs-initramfs
 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 ---
 debian/control    | 2 ++
 debian/control.in | 2 ++
 2 files changed, 4 insertions(+)
 diff --git a/debian/control b/debian/control
 index f33008df..d3d1034e 100644
 --- a/debian/control
 +++ b/debian/control
@@ -116,6 +116,8 @@ Depends: busybox-initramfs | busybox-static | busybox,
          zfs-modules | zfs-dkms,
          zfsutils-linux (>= ${binary:Version}),
          ${misc:Depends}
 +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
 diff --git a/debian/control.in b/debian/control.in
 index 0a9ceef6..09ef18cc 100644
 --- a/debian/control.in
 +++ b/debian/control.in
@@ -100,6 +100,8 @@ Depends: busybox-initramfs | busybox-static | busybox,
          initramfs-tools,
          zfsutils-linux (>= ${binary:Version}),
          ${misc:Depends}
 +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
@@ -1,75 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Thomas Lamprecht <t.lamprecht@proxmox.com>
 Date: Wed, 31 Oct 2018 15:37:39 +0100
 Subject: [PATCH] Revert "Install init scripts to support non-systemd setups.
 (Closes: #826994)"
 This reverts commit 2ad6c7f9e150e9c2fa146891785b09465aa0c7e5.
 Breaks on systems with sysv-rc installed (possible on Jessie upgraded
 systems)
 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 ---
 debian/rules                          | 8 --------
 debian/zfs-zed.zfs-zed.init           | 1 -
 debian/zfsutils-linux.zfs-import.init | 1 -
 debian/zfsutils-linux.zfs-mount.init  | 1 -
 debian/zfsutils-linux.zfs-share.init  | 1 -
 5 files changed, 12 deletions(-)
 delete mode 120000 debian/zfs-zed.zfs-zed.init
 delete mode 120000 debian/zfsutils-linux.zfs-import.init
 delete mode 120000 debian/zfsutils-linux.zfs-mount.init
 delete mode 120000 debian/zfsutils-linux.zfs-share.init
 diff --git a/debian/rules b/debian/rules
 index 3ba4b99a..d6cf5a56 100755
 --- a/debian/rules
 +++ b/debian/rules
@@ -117,14 +117,6 @@ override_dh_install:
 	find . -name lib*.la -delete
 	dh_install --fail-missing
 -override_dh_installinit:
 -	dh_installinit -r --no-start --name zfs-import
 -	dh_installinit -r --no-start --name zfs-mount
 -	dh_installinit -r --no-start --name zfs-share
 -	dh_installinit -R --no-start --name zfs-zed
 -	mkdir -p debian/zfsutils-linux/lib/systemd/system
 -	ln -sr /dev/null debian/zfsutils-linux/lib/systemd/system/zfs-import.service
 -
 # ------------
 debian-copyright:
 diff --git a/debian/zfs-zed.zfs-zed.init b/debian/zfs-zed.zfs-zed.init
 deleted file mode 120000
 index 3f41f681..00000000
 --- a/debian/zfs-zed.zfs-zed.init
 +++ /dev/null
@@ -1 +0,0 @@
 -../etc/init.d/zfs-zed
 \ No newline at end of file
 diff --git a/debian/zfsutils-linux.zfs-import.init b/debian/zfsutils-linux.zfs-import.init
 deleted file mode 120000
 index bfc368fd..00000000
 --- a/debian/zfsutils-linux.zfs-import.init
 +++ /dev/null
@@ -1 +0,0 @@
 -../etc/init.d/zfs-import
 \ No newline at end of file
 diff --git a/debian/zfsutils-linux.zfs-mount.init b/debian/zfsutils-linux.zfs-mount.init
 deleted file mode 120000
 index 62a54433..00000000
 --- a/debian/zfsutils-linux.zfs-mount.init
 +++ /dev/null
@@ -1 +0,0 @@
 -../etc/init.d/zfs-mount
 \ No newline at end of file
 diff --git a/debian/zfsutils-linux.zfs-share.init b/debian/zfsutils-linux.zfs-share.init
 deleted file mode 120000
 index 3f069f9b..00000000
 --- a/debian/zfsutils-linux.zfs-share.init
 +++ /dev/null
@@ -1 +0,0 @@
 -../etc/init.d/zfs-share
 \ No newline at end of file
@@ -1,61 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Rohan Puri <rohan.puri15@gmail.com>
 Date: Sat, 28 Jul 2018 18:32:12 +0530
 Subject: [PATCH] Fix deadlock between zfs umount & snapentry_expire
 zfs umount -> zfsctl_destroy() takes the zfs_snapshot_lock as a
 writer and calls zfsctl_snapshot_unmount_cancel(), which waits
 for snapentry_expire() if present (when snap is automounted).
 This snapentry_expire() itself then waits for zfs_snapshot_lock
 as a reader, resulting in a deadlock.
 The fix is to only hold the zfs_snapshot_lock over the tree
 lookup and removal.  After a successful lookup the lock can
 be dropped and zfs_snapentry_t will remain valid until the
 reference taken by the lookup is released.
 Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Signed-off-by: Rohan Puri <rohan.puri15@gmail.com>
 Closes #7751
 Closes #7752
 (Cherry-picked from fd7265c646f40e364396af5014bbb83e809e124a)
 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 ---
 module/zfs/zfs_ctldir.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)
 diff --git a/module/zfs/zfs_ctldir.c b/module/zfs/zfs_ctldir.c
 index 98897fe6..0ab5b4f0 100644
 --- a/module/zfs/zfs_ctldir.c
 +++ b/module/zfs/zfs_ctldir.c
@@ -358,8 +358,6 @@ snapentry_expire(void *data)
 static void
 zfsctl_snapshot_unmount_cancel(zfs_snapentry_t *se)
 {
 -	ASSERT(RW_LOCK_HELD(&zfs_snapshot_lock));
 -
 	if (taskq_cancel_id(system_delay_taskq, se->se_taskqid) == 0) {
 		se->se_taskqid = TASKQID_INVALID;
 		zfsctl_snapshot_rele(se);
@@ -570,13 +568,14 @@ zfsctl_destroy(zfsvfs_t *zfsvfs)
 		uint64_t objsetid = dmu_objset_id(zfsvfs->z_os);
 		rw_enter(&zfs_snapshot_lock, RW_WRITER);
 -		if ((se = zfsctl_snapshot_find_by_objsetid(spa, objsetid))
 -		    != NULL) {
 -			zfsctl_snapshot_unmount_cancel(se);
 +		se = zfsctl_snapshot_find_by_objsetid(spa, objsetid);
 +		if (se != NULL)
 			zfsctl_snapshot_remove(se);
 +		rw_exit(&zfs_snapshot_lock);
 +		if (se != NULL) {
 +			zfsctl_snapshot_unmount_cancel(se);
 			zfsctl_snapshot_rele(se);
 		}
 -		rw_exit(&zfs_snapshot_lock);
 	} else if (zfsvfs->z_ctldir) {
 		iput(zfsvfs->z_ctldir);
 		zfsvfs->z_ctldir = NULL;
@@ -1,376 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: ilbsmart <wgqimut@gmail.com>
 Date: Wed, 17 Oct 2018 02:11:24 +0800
 Subject: [PATCH] deadlock between mm_sem and tx assign in zfs_write() and page
 fault
 The bug time sequence:
 1. thread #1, `zfs_write` assign a txg "n".
 2. In a same process, thread #2, mmap page fault (which means the
   `mm_sem` is hold) occurred, `zfs_dirty_inode` open a txg failed,
   and wait previous txg "n" completed.
 3. thread #1 call `uiomove` to write, however page fault is occurred
   in `uiomove`, which means it need `mm_sem`, but `mm_sem` is hold by
   thread #2, so it stuck and can't complete,  then txg "n" will
   not complete.
 So thread #1 and thread #2 are deadlocked.
 Reviewed-by: Chunwei Chen <tuxoko@gmail.com>
 Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Reviewed-by: Matthew Ahrens <mahrens@delphix.com>
 Signed-off-by: Grady Wong <grady.w@xtaotech.com>
 Closes #7939
 (backported from: zfs-upstream 779a6c0bf6df76e0dd92c1ccf81f48512b835bb0)
 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 ---
 include/sys/uio_impl.h                             |   2 +-
 module/zcommon/zfs_uio.c                           |  31 ++++-
 module/zfs/zfs_vnops.c                             |  24 +++-
 tests/zfs-tests/cmd/mmapwrite/mmapwrite.c          | 140 +++++++++++++++------
 .../tests/functional/mmap/mmap_write_001_pos.ksh   |   8 +-
 5 files changed, 151 insertions(+), 54 deletions(-)
 diff --git a/include/sys/uio_impl.h b/include/sys/uio_impl.h
 index 37e283da..cfef0b95 100644
 --- a/include/sys/uio_impl.h
 +++ b/include/sys/uio_impl.h
@@ -42,7 +42,7 @@
 #include <sys/uio.h>
 extern int uiomove(void *, size_t, enum uio_rw, uio_t *);
 -extern void uio_prefaultpages(ssize_t, uio_t *);
 +extern int uio_prefaultpages(ssize_t, uio_t *);
 extern int uiocopy(void *, size_t, enum uio_rw, uio_t *, size_t *);
 extern void uioskip(uio_t *, size_t);
 diff --git a/module/zcommon/zfs_uio.c b/module/zcommon/zfs_uio.c
 index 7b4175bb..8e969bbc 100644
 --- a/module/zcommon/zfs_uio.c
 +++ b/module/zcommon/zfs_uio.c
@@ -50,6 +50,7 @@
 #include <sys/types.h>
 #include <sys/uio_impl.h>
 #include <linux/kmap_compat.h>
 +#include <linux/uaccess.h>
 /*
  * Move "n" bytes at byte address "p"; "rw" indicates the direction
@@ -77,8 +78,24 @@ uiomove_iov(void *p, size_t n, enum uio_rw rw, struct uio *uio)
 				if (copy_to_user(iov->iov_base+skip, p, cnt))
 					return (EFAULT);
 			} else {
 -				if (copy_from_user(p, iov->iov_base+skip, cnt))
 -					return (EFAULT);
 +				if (uio->uio_fault_disable) {
 +					if (!access_ok(VERIFY_READ,
 +					    (iov->iov_base + skip), cnt)) {
 +						return (EFAULT);
 +					}
 +
 +					pagefault_disable();
 +					if (__copy_from_user_inatomic(p,
 +					    (iov->iov_base + skip), cnt)) {
 +						pagefault_enable();
 +						return (EFAULT);
 +					}
 +					pagefault_enable();
 +				} else {
 +					if (copy_from_user(p,
 +					    (iov->iov_base + skip), cnt))
 +						return (EFAULT);
 +				}
 			}
 			break;
 		case UIO_SYSSPACE:
@@ -156,7 +173,7 @@ EXPORT_SYMBOL(uiomove);
  * error will terminate the process as this is only a best attempt to get
  * the pages resident.
  */
 -void
 +int
 uio_prefaultpages(ssize_t n, struct uio *uio)
 {
 	const struct iovec *iov;
@@ -170,7 +187,7 @@ uio_prefaultpages(ssize_t n, struct uio *uio)
 	switch (uio->uio_segflg) {
 		case UIO_SYSSPACE:
 		case UIO_BVEC:
 -			return;
 +			return (0);
 		case UIO_USERSPACE:
 		case UIO_USERISPACE:
 			break;
@@ -194,7 +211,7 @@ uio_prefaultpages(ssize_t n, struct uio *uio)
 		p = iov->iov_base + skip;
 		while (cnt) {
 			if (fuword8((uint8_t *)p, &tmp))
 -				return;
 +				return (EFAULT);
 			incr = MIN(cnt, PAGESIZE);
 			p += incr;
 			cnt -= incr;
@@ -204,8 +221,10 @@ uio_prefaultpages(ssize_t n, struct uio *uio)
 		 */
 		p--;
 		if (fuword8((uint8_t *)p, &tmp))
 -			return;
 +			return (EFAULT);
 	}
 +
 +	return (0);
 }
 EXPORT_SYMBOL(uio_prefaultpages);
 diff --git a/module/zfs/zfs_vnops.c b/module/zfs/zfs_vnops.c
 index 5a2e55eb..c866352d 100644
 --- a/module/zfs/zfs_vnops.c
 +++ b/module/zfs/zfs_vnops.c
@@ -675,7 +675,10 @@ zfs_write(struct inode *ip, uio_t *uio, int ioflag, cred_t *cr)
 		xuio = (xuio_t *)uio;
 	else
 #endif
 -		uio_prefaultpages(MIN(n, max_blksz), uio);
 +		if (uio_prefaultpages(MIN(n, max_blksz), uio)) {
 +			ZFS_EXIT(zfsvfs);
 +			return (SET_ERROR(EFAULT));
 +		}
 	/*
 	 * If in append mode, set the io offset pointer to eof.
@@ -820,8 +823,19 @@ zfs_write(struct inode *ip, uio_t *uio, int ioflag, cred_t *cr)
 		if (abuf == NULL) {
 			tx_bytes = uio->uio_resid;
 +			uio->uio_fault_disable = B_TRUE;
 			error = dmu_write_uio_dbuf(sa_get_db(zp->z_sa_hdl),
 			    uio, nbytes, tx);
 +			if (error == EFAULT) {
 +				dmu_tx_commit(tx);
 +				if (uio_prefaultpages(MIN(n, max_blksz), uio)) {
 +					break;
 +				}
 +				continue;
 +			} else if (error != 0) {
 +				dmu_tx_commit(tx);
 +				break;
 +			}
 			tx_bytes -= uio->uio_resid;
 		} else {
 			tx_bytes = nbytes;
@@ -921,8 +935,12 @@ zfs_write(struct inode *ip, uio_t *uio, int ioflag, cred_t *cr)
 		ASSERT(tx_bytes == nbytes);
 		n -= nbytes;
 -		if (!xuio && n > 0)
 -			uio_prefaultpages(MIN(n, max_blksz), uio);
 +		if (!xuio && n > 0) {
 +			if (uio_prefaultpages(MIN(n, max_blksz), uio)) {
 +				error = EFAULT;
 +				break;
 +			}
 +		}
 	}
 	zfs_inode_update(zp);
 diff --git a/tests/zfs-tests/cmd/mmapwrite/mmapwrite.c b/tests/zfs-tests/cmd/mmapwrite/mmapwrite.c
 index 190d31af..b9915d5d 100644
 --- a/tests/zfs-tests/cmd/mmapwrite/mmapwrite.c
 +++ b/tests/zfs-tests/cmd/mmapwrite/mmapwrite.c
@@ -31,74 +31,132 @@
 #include <string.h>
 #include <sys/mman.h>
 #include <pthread.h>
 +#include <errno.h>
 +#include <err.h>
 /*
  * --------------------------------------------------------------------
 - * Bug Id: 5032643
 + * Bug Issue Id: #7512
 + * The bug time sequence:
 + * 1. context #1, zfs_write assign a txg "n".
 + * 2. In the same process, context #2, mmap page fault (which means the mm_sem
 + *    is hold) occurred, zfs_dirty_inode open a txg failed, and wait previous
 + *    txg "n" completed.
 + * 3. context #1 call uiomove to write, however page fault is occurred in
 + *    uiomove, which means it need mm_sem, but mm_sem is hold by
 + *    context #2, so it stuck and can't complete, then txg "n" will not
 + *    complete.
  *
 - * Simply writing to a file and mmaping that file at the same time can
 - * result in deadlock.  Nothing perverse like writing from the file's
 - * own mapping is required.
 + * So context #1 and context #2 trap into the "dead lock".
  * --------------------------------------------------------------------
  */
 +#define	NORMAL_WRITE_TH_NUM	2
 +
 static void *
 -mapper(void *fdp)
 +normal_writer(void *filename)
 {
 -	void *addr;
 -	int fd = *(int *)fdp;
 +	char *file_path = filename;
 +	int fd = -1;
 +	ssize_t write_num = 0;
 +	int page_size = getpagesize();
 -	if ((addr =
 -	    mmap(0, 8192, PROT_READ, MAP_SHARED, fd, 0)) == MAP_FAILED) {
 -		perror("mmap");
 -		exit(1);
 +	fd = open(file_path, O_RDWR | O_CREAT, 0777);
 +	if (fd == -1) {
 +		err(1, "failed to open %s", file_path);
 	}
 -	for (;;) {
 -		if (mmap(addr, 8192, PROT_READ,
 -		    MAP_SHARED|MAP_FIXED, fd, 0) == MAP_FAILED) {
 -			perror("mmap");
 -			exit(1);
 +
 +	char *buf = malloc(1);
 +	while (1) {
 +		write_num = write(fd, buf, 1);
 +		if (write_num == 0) {
 +			err(1, "write failed!");
 +			break;
 		}
 +		lseek(fd, page_size, SEEK_CUR);
 +	}
 +
 +	if (buf) {
 +		free(buf);
 	}
 -	/* NOTREACHED */
 -	return ((void *)1);
 }
 -int
 -main(int argc, char **argv)
 +static void *
 +map_writer(void *filename)
 {
 -	int fd;
 -	char buf[1024];
 -	pthread_t tid;
 +	int fd = -1;
 +	int ret = 0;
 +	char *buf = NULL;
 +	int page_size = getpagesize();
 +	int op_errno = 0;
 +	char *file_path = filename;
 -	memset(buf, 'a', sizeof (buf));
 +	while (1) {
 +		ret = access(file_path, F_OK);
 +		if (ret) {
 +			op_errno = errno;
 +			if (op_errno == ENOENT) {
 +				fd = open(file_path, O_RDWR | O_CREAT, 0777);
 +				if (fd == -1) {
 +					err(1, "open file failed");
 +				}
 -	if (argc != 2) {
 -		(void) printf("usage: %s <file name>\n", argv[0]);
 -		exit(1);
 -	}
 +				ret = ftruncate(fd, page_size);
 +				if (ret == -1) {
 +					err(1, "truncate file failed");
 +				}
 +			} else {
 +				err(1, "access file failed!");
 +			}
 +		} else {
 +			fd = open(file_path, O_RDWR, 0777);
 +			if (fd == -1) {
 +				err(1, "open file failed");
 +			}
 +		}
 -	if ((fd = open(argv[1], O_RDWR|O_CREAT|O_TRUNC, 0666)) == -1) {
 -		perror("open");
 -		exit(1);
 +		if ((buf = mmap(NULL, page_size, PROT_READ | PROT_WRITE,
 +		    MAP_SHARED, fd, 0)) == MAP_FAILED) {
 +			err(1, "map file failed");
 +		}
 +
 +		if (fd != -1)
 +			close(fd);
 +
 +		char s[10] = {0, };
 +		memcpy(buf, s, 10);
 +		ret = munmap(buf, page_size);
 +		if (ret != 0) {
 +			err(1, "unmap file failed");
 +		}
 	}
 +}
 -	(void) pthread_setconcurrency(2);
 -	if (pthread_create(&tid, NULL, mapper, &fd) != 0) {
 -		perror("pthread_create");
 -		close(fd);
 +int
 +main(int argc, char **argv)
 +{
 +	pthread_t map_write_tid;
 +	pthread_t normal_write_tid[NORMAL_WRITE_TH_NUM];
 +	int i = 0;
 +
 +	if (argc != 3) {
 +		(void) printf("usage: %s <normal write file name>"
 +		    "<map write file name>\n", argv[0]);
 		exit(1);
 	}
 -	for (;;) {
 -		if (write(fd, buf, sizeof (buf)) == -1) {
 -			perror("write");
 -			close(fd);
 -			exit(1);
 +
 +	for (i = 0; i < NORMAL_WRITE_TH_NUM; i++) {
 +		if (pthread_create(&normal_write_tid[i], NULL, normal_writer,
 +		    argv[1])) {
 +			err(1, "pthread_create normal_writer failed.");
 		}
 	}
 -	close(fd);
 +	if (pthread_create(&map_write_tid, NULL, map_writer, argv[2])) {
 +		err(1, "pthread_create map_writer failed.");
 +	}
 	/* NOTREACHED */
 +	pthread_join(map_write_tid, NULL);
 	return (0);
 }
 diff --git a/tests/zfs-tests/tests/functional/mmap/mmap_write_001_pos.ksh b/tests/zfs-tests/tests/functional/mmap/mmap_write_001_pos.ksh
 index 1eda9710..24150b82 100755
 --- a/tests/zfs-tests/tests/functional/mmap/mmap_write_001_pos.ksh
 +++ b/tests/zfs-tests/tests/functional/mmap/mmap_write_001_pos.ksh
@@ -53,12 +53,14 @@ if ! is_mp; then
 fi
 log_must chmod 777 $TESTDIR
 -mmapwrite $TESTDIR/test-write-file &
 +mmapwrite $TESTDIR/normal_write_file $TESTDIR/map_write_file &
 PID_MMAPWRITE=$!
 -log_note "mmapwrite $TESTDIR/test-write-file pid: $PID_MMAPWRITE"
 +log_note "mmapwrite $TESTDIR/normal_write_file $TESTDIR/map_write_file"\
 +	 "pid: $PID_MMAPWRITE"
 log_must sleep 30
 log_must kill -9 $PID_MMAPWRITE
 -log_must ls -l $TESTDIR/test-write-file
 +log_must ls -l $TESTDIR/normal_write_file
 +log_must ls -l $TESTDIR/map_write_file
 log_pass "write(2) a mmap(2)'ing file succeeded."
@@ -1,251 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tom Caputi <tcaputi@datto.com>
 Date: Tue, 10 Apr 2018 14:15:05 -0400
 Subject: [PATCH] Fix race in dnode_check_slots_free()
 Currently, dnode_check_slots_free() works by checking dn->dn_type
 in the dnode to determine if the dnode is reclaimable. However,
 there is a small window of time between dnode_free_sync() in the
 first call to dsl_dataset_sync() and when the useraccounting code
 is run when the type is set DMU_OT_NONE, but the dnode is not yet
 evictable, leading to crashes. This patch adds the ability for
 dnodes to track which txg they were last dirtied in and adds a
 check for this before performing the reclaim.
 This patch also corrects several instances when dn_dirty_link was
 treated as a list_node_t when it is technically a multilist_node_t.
 Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Signed-off-by: Tom Caputi <tcaputi@datto.com>
 Closes #7147
 Closes #7388
 ---
 include/sys/dmu_impl.h  |  1 +
 include/sys/dnode.h     |  4 ++++
 module/zfs/dbuf.c       |  3 +++
 module/zfs/dmu.c        |  2 +-
 module/zfs/dmu_objset.c | 15 +++++++++++++++
 module/zfs/dnode.c      | 29 +++++++++++++++++++----------
 6 files changed, 43 insertions(+), 11 deletions(-)
 diff --git a/include/sys/dmu_impl.h b/include/sys/dmu_impl.h
 index 65e417e3..03a63077 100644
 --- a/include/sys/dmu_impl.h
 +++ b/include/sys/dmu_impl.h
@@ -161,6 +161,7 @@ extern "C" {
  * 	dn_allocated_txg
  * 	dn_free_txg
  * 	dn_assigned_txg
 + * 	dn_dirty_txg
  * 	dd_assigned_tx
  * 	dn_notxholds
  * 	dn_dirtyctx
 diff --git a/include/sys/dnode.h b/include/sys/dnode.h
 index ea7defe1..2dd087b3 100644
 --- a/include/sys/dnode.h
 +++ b/include/sys/dnode.h
@@ -260,6 +260,7 @@ struct dnode {
 	uint64_t dn_allocated_txg;
 	uint64_t dn_free_txg;
 	uint64_t dn_assigned_txg;
 +	uint64_t dn_dirty_txg;			/* txg dnode was last dirtied */
 	kcondvar_t dn_notxholds;
 	enum dnode_dirtycontext dn_dirtyctx;
 	uint8_t *dn_dirtyctx_firstset;		/* dbg: contents meaningless */
@@ -362,6 +363,9 @@ void dnode_evict_dbufs(dnode_t *dn);
 void dnode_evict_bonus(dnode_t *dn);
 void dnode_free_interior_slots(dnode_t *dn);
 +#define	DNODE_IS_DIRTY(_dn)						\
 +	((_dn)->dn_dirty_txg >= spa_syncing_txg((_dn)->dn_objset->os_spa))
 +
 #define	DNODE_IS_CACHEABLE(_dn)						\
 	((_dn)->dn_objset->os_primary_cache == ZFS_CACHE_ALL ||		\
 	(DMU_OT_IS_METADATA((_dn)->dn_type) &&				\
 diff --git a/module/zfs/dbuf.c b/module/zfs/dbuf.c
 index 4ee121f5..6edb39d6 100644
 --- a/module/zfs/dbuf.c
 +++ b/module/zfs/dbuf.c
@@ -1606,6 +1606,9 @@ dbuf_dirty(dmu_buf_impl_t *db, dmu_tx_t *tx)
 			    FTAG);
 		}
 	}
 +
 +	if (tx->tx_txg > dn->dn_dirty_txg)
 +		dn->dn_dirty_txg = tx->tx_txg;
 	mutex_exit(&dn->dn_mtx);
 	if (db->db_blkid == DMU_SPILL_BLKID)
 diff --git a/module/zfs/dmu.c b/module/zfs/dmu.c
 index 6f09aa2f..a09ac4f9 100644
 --- a/module/zfs/dmu.c
 +++ b/module/zfs/dmu.c
@@ -2044,7 +2044,7 @@ dmu_offset_next(objset_t *os, uint64_t object, boolean_t hole, uint64_t *off)
 	 * Check if dnode is dirty
 	 */
 	for (i = 0; i < TXG_SIZE; i++) {
 -		if (list_link_active(&dn->dn_dirty_link[i])) {
 +		if (multilist_link_active(&dn->dn_dirty_link[i])) {
 			clean = B_FALSE;
 			break;
 		}
 diff --git a/module/zfs/dmu_objset.c b/module/zfs/dmu_objset.c
 index 449ebedf..0bed2d3e 100644
 --- a/module/zfs/dmu_objset.c
 +++ b/module/zfs/dmu_objset.c
@@ -1213,10 +1213,23 @@ dmu_objset_sync_dnodes(multilist_sublist_t *list, dmu_tx_t *tx)
 		ASSERT3U(dn->dn_nlevels, <=, DN_MAX_LEVELS);
 		multilist_sublist_remove(list, dn);
 +		/*
 +		 * If we are not doing useraccounting (os_synced_dnodes == NULL)
 +		 * we are done with this dnode for this txg. Unset dn_dirty_txg
 +		 * if later txgs aren't dirtying it so that future holders do
 +		 * not get a stale value. Otherwise, we will do this in
 +		 * userquota_updates_task() when processing has completely
 +		 * finished for this txg.
 +		 */
 		multilist_t *newlist = dn->dn_objset->os_synced_dnodes;
 		if (newlist != NULL) {
 			(void) dnode_add_ref(dn, newlist);
 			multilist_insert(newlist, dn);
 +		} else {
 +			mutex_enter(&dn->dn_mtx);
 +			if (dn->dn_dirty_txg == tx->tx_txg)
 +				dn->dn_dirty_txg = 0;
 +			mutex_exit(&dn->dn_mtx);
 		}
 		dnode_sync(dn, tx);
@@ -1621,6 +1634,8 @@ userquota_updates_task(void *arg)
 				dn->dn_id_flags |= DN_ID_CHKED_BONUS;
 		}
 		dn->dn_id_flags &= ~(DN_ID_NEW_EXIST);
 +		if (dn->dn_dirty_txg == spa_syncing_txg(os->os_spa))
 +			dn->dn_dirty_txg = 0;
 		mutex_exit(&dn->dn_mtx);
 		multilist_sublist_remove(list, dn);
 diff --git a/module/zfs/dnode.c b/module/zfs/dnode.c
 index d465b545..4a169c49 100644
 --- a/module/zfs/dnode.c
 +++ b/module/zfs/dnode.c
@@ -137,7 +137,7 @@ dnode_cons(void *arg, void *unused, int kmflag)
 	bzero(&dn->dn_next_blksz[0], sizeof (dn->dn_next_blksz));
 	for (i = 0; i < TXG_SIZE; i++) {
 -		list_link_init(&dn->dn_dirty_link[i]);
 +		multilist_link_init(&dn->dn_dirty_link[i]);
 		dn->dn_free_ranges[i] = NULL;
 		list_create(&dn->dn_dirty_records[i],
 		    sizeof (dbuf_dirty_record_t),
@@ -147,6 +147,7 @@ dnode_cons(void *arg, void *unused, int kmflag)
 	dn->dn_allocated_txg = 0;
 	dn->dn_free_txg = 0;
 	dn->dn_assigned_txg = 0;
 +	dn->dn_dirty_txg = 0;
 	dn->dn_dirtyctx = 0;
 	dn->dn_dirtyctx_firstset = NULL;
 	dn->dn_bonus = NULL;
@@ -184,7 +185,7 @@ dnode_dest(void *arg, void *unused)
 	ASSERT(!list_link_active(&dn->dn_link));
 	for (i = 0; i < TXG_SIZE; i++) {
 -		ASSERT(!list_link_active(&dn->dn_dirty_link[i]));
 +		ASSERT(!multilist_link_active(&dn->dn_dirty_link[i]));
 		ASSERT3P(dn->dn_free_ranges[i], ==, NULL);
 		list_destroy(&dn->dn_dirty_records[i]);
 		ASSERT0(dn->dn_next_nblkptr[i]);
@@ -199,6 +200,7 @@ dnode_dest(void *arg, void *unused)
 	ASSERT0(dn->dn_allocated_txg);
 	ASSERT0(dn->dn_free_txg);
 	ASSERT0(dn->dn_assigned_txg);
 +	ASSERT0(dn->dn_dirty_txg);
 	ASSERT0(dn->dn_dirtyctx);
 	ASSERT3P(dn->dn_dirtyctx_firstset, ==, NULL);
 	ASSERT3P(dn->dn_bonus, ==, NULL);
@@ -523,6 +525,7 @@ dnode_destroy(dnode_t *dn)
 	dn->dn_allocated_txg = 0;
 	dn->dn_free_txg = 0;
 	dn->dn_assigned_txg = 0;
 +	dn->dn_dirty_txg = 0;
 	dn->dn_dirtyctx = 0;
 	if (dn->dn_dirtyctx_firstset != NULL) {
@@ -592,6 +595,7 @@ dnode_allocate(dnode_t *dn, dmu_object_type_t ot, int blocksize, int ibs,
 	ASSERT0(dn->dn_maxblkid);
 	ASSERT0(dn->dn_allocated_txg);
 	ASSERT0(dn->dn_assigned_txg);
 +	ASSERT0(dn->dn_dirty_txg);
 	ASSERT(refcount_is_zero(&dn->dn_tx_holds));
 	ASSERT3U(refcount_count(&dn->dn_holds), <=, 1);
 	ASSERT(avl_is_empty(&dn->dn_dbufs));
@@ -604,7 +608,7 @@ dnode_allocate(dnode_t *dn, dmu_object_type_t ot, int blocksize, int ibs,
 		ASSERT0(dn->dn_next_bonustype[i]);
 		ASSERT0(dn->dn_rm_spillblk[i]);
 		ASSERT0(dn->dn_next_blksz[i]);
 -		ASSERT(!list_link_active(&dn->dn_dirty_link[i]));
 +		ASSERT(!multilist_link_active(&dn->dn_dirty_link[i]));
 		ASSERT3P(list_head(&dn->dn_dirty_records[i]), ==, NULL);
 		ASSERT3P(dn->dn_free_ranges[i], ==, NULL);
 	}
@@ -779,6 +783,7 @@ dnode_move_impl(dnode_t *odn, dnode_t *ndn)
 	ndn->dn_allocated_txg = odn->dn_allocated_txg;
 	ndn->dn_free_txg = odn->dn_free_txg;
 	ndn->dn_assigned_txg = odn->dn_assigned_txg;
 +	ndn->dn_dirty_txg = odn->dn_dirty_txg;
 	ndn->dn_dirtyctx = odn->dn_dirtyctx;
 	ndn->dn_dirtyctx_firstset = odn->dn_dirtyctx_firstset;
 	ASSERT(refcount_count(&odn->dn_tx_holds) == 0);
@@ -845,6 +850,7 @@ dnode_move_impl(dnode_t *odn, dnode_t *ndn)
 	odn->dn_allocated_txg = 0;
 	odn->dn_free_txg = 0;
 	odn->dn_assigned_txg = 0;
 +	odn->dn_dirty_txg = 0;
 	odn->dn_dirtyctx = 0;
 	odn->dn_dirtyctx_firstset = NULL;
 	odn->dn_have_spill = B_FALSE;
@@ -1069,6 +1075,10 @@ dnode_check_slots_free(dnode_children_t *children, int idx, int slots)
 {
 	ASSERT3S(idx + slots, <=, DNODES_PER_BLOCK);
 +	/*
 +	 * If all dnode slots are either already free or
 +	 * evictable return B_TRUE.
 +	 */
 	for (int i = idx; i < idx + slots; i++) {
 		dnode_handle_t *dnh = &children->dnc_children[i];
 		dnode_t *dn = dnh->dnh_dnode;
@@ -1077,18 +1087,17 @@ dnode_check_slots_free(dnode_children_t *children, int idx, int slots)
 			continue;
 		} else if (DN_SLOT_IS_PTR(dn)) {
 			mutex_enter(&dn->dn_mtx);
 -			dmu_object_type_t type = dn->dn_type;
 +			boolean_t can_free = (dn->dn_type == DMU_OT_NONE &&
 +			    !DNODE_IS_DIRTY(dn));
 			mutex_exit(&dn->dn_mtx);
 -			if (type != DMU_OT_NONE)
 +			if (!can_free)
 				return (B_FALSE);
 -
 -			continue;
 +			else
 +				continue;
 		} else {
 			return (B_FALSE);
 		}
 -
 -		return (B_FALSE);
 	}
 	return (B_TRUE);
@@ -1594,7 +1603,7 @@ dnode_setdirty(dnode_t *dn, dmu_tx_t *tx)
 	/*
 	 * If we are already marked dirty, we're done.
 	 */
 -	if (list_link_active(&dn->dn_dirty_link[txg & TXG_MASK])) {
 +	if (multilist_link_active(&dn->dn_dirty_link[txg & TXG_MASK])) {
 		multilist_sublist_unlock(mls);
 		return;
 	}
@@ -1,859 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Matthew Ahrens <mahrens@delphix.com>
 Date: Thu, 2 Aug 2018 15:51:45 -0700
 Subject: [PATCH] Reduce taskq and context-switch cost of zio pipe
 When doing a read from disk, ZFS creates 3 ZIO's: a zio_null(), the
 logical zio_read(), and then a physical zio. Currently, each of these
 results in a separate taskq_dispatch(zio_execute).
 On high-read-iops workloads, this causes a significant performance
 impact. By processing all 3 ZIO's in a single taskq entry, we reduce the
 overhead on taskq locking and context switching.  We accomplish this by
 allowing zio_done() to return a "next zio to execute" to zio_execute().
 This results in a ~12% performance increase for random reads, from
 96,000 iops to 108,000 iops (with recordsize=8k, on SSD's).
 Reviewed by: Pavel Zakharov <pavel.zakharov@delphix.com>
 Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Reviewed by: George Wilson <george.wilson@delphix.com>
 Signed-off-by: Matthew Ahrens <mahrens@delphix.com>
 External-issue: DLPX-59292
 Closes #7736
 ---
 include/sys/zio.h |   4 +-
 module/zfs/zio.c  | 252 +++++++++++++++++++++++++++++-------------------------
 2 files changed, 139 insertions(+), 117 deletions(-)
 diff --git a/include/sys/zio.h b/include/sys/zio.h
 index 4b0eecc2..3618912c 100644
 --- a/include/sys/zio.h
 +++ b/include/sys/zio.h
@@ -237,7 +237,7 @@ enum zio_child {
 #define	ZIO_CHILD_DDT_BIT		ZIO_CHILD_BIT(ZIO_CHILD_DDT)
 #define	ZIO_CHILD_LOGICAL_BIT		ZIO_CHILD_BIT(ZIO_CHILD_LOGICAL)
 #define	ZIO_CHILD_ALL_BITS					\
 -	(ZIO_CHILD_VDEV_BIT | ZIO_CHILD_GANG_BIT | 		\
 +	(ZIO_CHILD_VDEV_BIT | ZIO_CHILD_GANG_BIT |		\
 	ZIO_CHILD_DDT_BIT | ZIO_CHILD_LOGICAL_BIT)
 enum zio_wait_type {
@@ -375,7 +375,7 @@ typedef struct zio_transform {
 	struct zio_transform	*zt_next;
 } zio_transform_t;
 -typedef int zio_pipe_stage_t(zio_t *zio);
 +typedef zio_t *zio_pipe_stage_t(zio_t *zio);
 /*
  * The io_reexecute flags are distinct from io_flags because the child must
 diff --git a/module/zfs/zio.c b/module/zfs/zio.c
 index 9a465e1b..dd0dfcdb 100644
 --- a/module/zfs/zio.c
 +++ b/module/zfs/zio.c
@@ -75,9 +75,6 @@ uint64_t zio_buf_cache_frees[SPA_MAXBLOCKSIZE >> SPA_MINBLOCKSHIFT];
 int zio_delay_max = ZIO_DELAY_MAX;
 -#define	ZIO_PIPELINE_CONTINUE		0x100
 -#define	ZIO_PIPELINE_STOP		0x101
 -
 #define	BP_SPANB(indblkshift, level) \
 	(((uint64_t)1) << ((level) * ((indblkshift) - SPA_BLKPTRSHIFT)))
 #define	COMPARE_META_LEVEL	0x80000000ul
@@ -516,7 +513,8 @@ zio_wait_for_children(zio_t *zio, uint8_t childbits, enum zio_wait_type wait)
 __attribute__((always_inline))
 static inline void
 -zio_notify_parent(zio_t *pio, zio_t *zio, enum zio_wait_type wait)
 +zio_notify_parent(zio_t *pio, zio_t *zio, enum zio_wait_type wait,
 +    zio_t **next_to_executep)
 {
 	uint64_t *countp = &pio->io_children[zio->io_child_type][wait];
 	int *errorp = &pio->io_child_error[zio->io_child_type];
@@ -535,13 +533,33 @@ zio_notify_parent(zio_t *pio, zio_t *zio, enum zio_wait_type wait)
 		    ZIO_TASKQ_INTERRUPT;
 		pio->io_stall = NULL;
 		mutex_exit(&pio->io_lock);
 +
 		/*
 -		 * Dispatch the parent zio in its own taskq so that
 -		 * the child can continue to make progress. This also
 -		 * prevents overflowing the stack when we have deeply nested
 -		 * parent-child relationships.
 +		 * If we can tell the caller to execute this parent next, do
 +		 * so.  Otherwise dispatch the parent zio as its own task.
 +		 *
 +		 * Having the caller execute the parent when possible reduces
 +		 * locking on the zio taskq's, reduces context switch
 +		 * overhead, and has no recursion penalty.  Note that one
 +		 * read from disk typically causes at least 3 zio's: a
 +		 * zio_null(), the logical zio_read(), and then a physical
 +		 * zio.  When the physical ZIO completes, we are able to call
 +		 * zio_done() on all 3 of these zio's from one invocation of
 +		 * zio_execute() by returning the parent back to
 +		 * zio_execute().  Since the parent isn't executed until this
 +		 * thread returns back to zio_execute(), the caller should do
 +		 * so promptly.
 +		 *
 +		 * In other cases, dispatching the parent prevents
 +		 * overflowing the stack when we have deeply nested
 +		 * parent-child relationships, as we do with the "mega zio"
 +		 * of writes for spa_sync(), and the chain of ZIL blocks.
 		 */
 -		zio_taskq_dispatch(pio, type, B_FALSE);
 +		if (next_to_executep != NULL && *next_to_executep == NULL) {
 +			*next_to_executep = pio;
 +		} else {
 +			zio_taskq_dispatch(pio, type, B_FALSE);
 +		}
 	} else {
 		mutex_exit(&pio->io_lock);
 	}
@@ -1187,7 +1205,7 @@ zio_shrink(zio_t *zio, uint64_t size)
  * ==========================================================================
  */
 -static int
 +static zio_t *
 zio_read_bp_init(zio_t *zio)
 {
 	blkptr_t *bp = zio->io_bp;
@@ -1221,15 +1239,15 @@ zio_read_bp_init(zio_t *zio)
 	if (BP_GET_DEDUP(bp) && zio->io_child_type == ZIO_CHILD_LOGICAL)
 		zio->io_pipeline = ZIO_DDT_READ_PIPELINE;
 -	return (ZIO_PIPELINE_CONTINUE);
 +	return (zio);
 }
 -static int
 +static zio_t *
 zio_write_bp_init(zio_t *zio)
 {
 	if (!IO_IS_ALLOCATING(zio))
 -		return (ZIO_PIPELINE_CONTINUE);
 +		return (zio);
 	ASSERT(zio->io_child_type != ZIO_CHILD_DDT);
@@ -1244,7 +1262,7 @@ zio_write_bp_init(zio_t *zio)
 		zio->io_pipeline = ZIO_INTERLOCK_PIPELINE;
 		if (BP_IS_EMBEDDED(bp))
 -			return (ZIO_PIPELINE_CONTINUE);
 +			return (zio);
 		/*
 		 * If we've been overridden and nopwrite is set then
@@ -1255,13 +1273,13 @@ zio_write_bp_init(zio_t *zio)
 			ASSERT(!zp->zp_dedup);
 			ASSERT3U(BP_GET_CHECKSUM(bp), ==, zp->zp_checksum);
 			zio->io_flags |= ZIO_FLAG_NOPWRITE;
 -			return (ZIO_PIPELINE_CONTINUE);
 +			return (zio);
 		}
 		ASSERT(!zp->zp_nopwrite);
 		if (BP_IS_HOLE(bp) || !zp->zp_dedup)
 -			return (ZIO_PIPELINE_CONTINUE);
 +			return (zio);
 		ASSERT((zio_checksum_table[zp->zp_checksum].ci_flags &
 		    ZCHECKSUM_FLAG_DEDUP) || zp->zp_dedup_verify);
@@ -1269,7 +1287,7 @@ zio_write_bp_init(zio_t *zio)
 		if (BP_GET_CHECKSUM(bp) == zp->zp_checksum) {
 			BP_SET_DEDUP(bp, 1);
 			zio->io_pipeline |= ZIO_STAGE_DDT_WRITE;
 -			return (ZIO_PIPELINE_CONTINUE);
 +			return (zio);
 		}
 		/*
@@ -1281,10 +1299,10 @@ zio_write_bp_init(zio_t *zio)
 		zio->io_pipeline = zio->io_orig_pipeline;
 	}
 -	return (ZIO_PIPELINE_CONTINUE);
 +	return (zio);
 }
 -static int
 +static zio_t *
 zio_write_compress(zio_t *zio)
 {
 	spa_t *spa = zio->io_spa;
@@ -1303,11 +1321,11 @@ zio_write_compress(zio_t *zio)
 	 */
 	if (zio_wait_for_children(zio, ZIO_CHILD_LOGICAL_BIT |
 	    ZIO_CHILD_GANG_BIT, ZIO_WAIT_READY)) {
 -		return (ZIO_PIPELINE_STOP);
 +		return (NULL);
 	}
 	if (!IO_IS_ALLOCATING(zio))
 -		return (ZIO_PIPELINE_CONTINUE);
 +		return (zio);
 	if (zio->io_children_ready != NULL) {
 		/*
@@ -1366,7 +1384,7 @@ zio_write_compress(zio_t *zio)
 			zio->io_pipeline = ZIO_INTERLOCK_PIPELINE;
 			ASSERT(spa_feature_is_active(spa,
 			    SPA_FEATURE_EMBEDDED_DATA));
 -			return (ZIO_PIPELINE_CONTINUE);
 +			return (zio);
 		} else {
 			/*
 			 * Round up compressed size up to the ashift
@@ -1459,10 +1477,10 @@ zio_write_compress(zio_t *zio)
 			zio->io_pipeline |= ZIO_STAGE_NOP_WRITE;
 		}
 	}
 -	return (ZIO_PIPELINE_CONTINUE);
 +	return (zio);
 }
 -static int
 +static zio_t *
 zio_free_bp_init(zio_t *zio)
 {
 	blkptr_t *bp = zio->io_bp;
@@ -1472,7 +1490,9 @@ zio_free_bp_init(zio_t *zio)
 			zio->io_pipeline = ZIO_DDT_FREE_PIPELINE;
 	}
 -	return (ZIO_PIPELINE_CONTINUE);
 +	ASSERT3P(zio->io_bp, ==, &zio->io_bp_copy);
 +
 +	return (zio);
 }
 /*
@@ -1541,12 +1561,12 @@ zio_taskq_member(zio_t *zio, zio_taskq_type_t q)
 	return (B_FALSE);
 }
 -static int
 +static zio_t *
 zio_issue_async(zio_t *zio)
 {
 	zio_taskq_dispatch(zio, ZIO_TASKQ_ISSUE, B_FALSE);
 -	return (ZIO_PIPELINE_STOP);
 +	return (NULL);
 }
 void
@@ -1687,14 +1707,13 @@ __attribute__((always_inline))
 static inline void
 __zio_execute(zio_t *zio)
 {
 -	zio->io_executor = curthread;
 -
 	ASSERT3U(zio->io_queued_timestamp, >, 0);
 	while (zio->io_stage < ZIO_STAGE_DONE) {
 		enum zio_stage pipeline = zio->io_pipeline;
 		enum zio_stage stage = zio->io_stage;
 -		int rv;
 +
 +		zio->io_executor = curthread;
 		ASSERT(!MUTEX_HELD(&zio->io_lock));
 		ASSERT(ISP2(stage));
@@ -1736,12 +1755,16 @@ __zio_execute(zio_t *zio)
 		zio->io_stage = stage;
 		zio->io_pipeline_trace |= zio->io_stage;
 -		rv = zio_pipeline[highbit64(stage) - 1](zio);
 -		if (rv == ZIO_PIPELINE_STOP)
 -			return;
 +		/*
 +		 * The zio pipeline stage returns the next zio to execute
 +		 * (typically the same as this one), or NULL if we should
 +		 * stop.
 +		 */
 +		zio = zio_pipeline[highbit64(stage) - 1](zio);
 -		ASSERT(rv == ZIO_PIPELINE_CONTINUE);
 +		if (zio == NULL)
 +			return;
 	}
 }
@@ -2215,7 +2238,7 @@ zio_gang_tree_issue(zio_t *pio, zio_gang_node_t *gn, blkptr_t *bp, abd_t *data,
 		zio_nowait(zio);
 }
 -static int
 +static zio_t *
 zio_gang_assemble(zio_t *zio)
 {
 	blkptr_t *bp = zio->io_bp;
@@ -2227,16 +2250,16 @@ zio_gang_assemble(zio_t *zio)
 	zio_gang_tree_assemble(zio, bp, &zio->io_gang_tree);
 -	return (ZIO_PIPELINE_CONTINUE);
 +	return (zio);
 }
 -static int
 +static zio_t *
 zio_gang_issue(zio_t *zio)
 {
 	blkptr_t *bp = zio->io_bp;
 	if (zio_wait_for_children(zio, ZIO_CHILD_GANG_BIT, ZIO_WAIT_DONE)) {
 -		return (ZIO_PIPELINE_STOP);
 +		return (NULL);
 	}
 	ASSERT(BP_IS_GANG(bp) && zio->io_gang_leader == zio);
@@ -2250,7 +2273,7 @@ zio_gang_issue(zio_t *zio)
 	zio->io_pipeline = ZIO_INTERLOCK_PIPELINE;
 -	return (ZIO_PIPELINE_CONTINUE);
 +	return (zio);
 }
 static void
@@ -2290,7 +2313,7 @@ zio_write_gang_done(zio_t *zio)
 	abd_put(zio->io_abd);
 }
 -static int
 +static zio_t *
 zio_write_gang_block(zio_t *pio)
 {
 	spa_t *spa = pio->io_spa;
@@ -2349,7 +2372,7 @@ zio_write_gang_block(zio_t *pio)
 		}
 		pio->io_error = error;
 -		return (ZIO_PIPELINE_CONTINUE);
 +		return (pio);
 	}
 	if (pio == gio) {
@@ -2423,7 +2446,7 @@ zio_write_gang_block(zio_t *pio)
 	zio_nowait(zio);
 -	return (ZIO_PIPELINE_CONTINUE);
 +	return (pio);
 }
 /*
@@ -2444,7 +2467,7 @@ zio_write_gang_block(zio_t *pio)
  * used for nopwrite, assuming that the salt and the checksums
  * themselves remain secret.
  */
 -static int
 +static zio_t *
 zio_nop_write(zio_t *zio)
 {
 	blkptr_t *bp = zio->io_bp;
@@ -2471,7 +2494,7 @@ zio_nop_write(zio_t *zio)
 	    BP_GET_COMPRESS(bp) != BP_GET_COMPRESS(bp_orig) ||
 	    BP_GET_DEDUP(bp) != BP_GET_DEDUP(bp_orig) ||
 	    zp->zp_copies != BP_GET_NDVAS(bp_orig))
 -		return (ZIO_PIPELINE_CONTINUE);
 +		return (zio);
 	/*
 	 * If the checksums match then reset the pipeline so that we
@@ -2491,7 +2514,7 @@ zio_nop_write(zio_t *zio)
 		zio->io_flags |= ZIO_FLAG_NOPWRITE;
 	}
 -	return (ZIO_PIPELINE_CONTINUE);
 +	return (zio);
 }
 /*
@@ -2519,7 +2542,7 @@ zio_ddt_child_read_done(zio_t *zio)
 	mutex_exit(&pio->io_lock);
 }
 -static int
 +static zio_t *
 zio_ddt_read_start(zio_t *zio)
 {
 	blkptr_t *bp = zio->io_bp;
@@ -2540,7 +2563,7 @@ zio_ddt_read_start(zio_t *zio)
 		zio->io_vsd = dde;
 		if (ddp_self == NULL)
 -			return (ZIO_PIPELINE_CONTINUE);
 +			return (zio);
 		for (p = 0; p < DDT_PHYS_TYPES; p++, ddp++) {
 			if (ddp->ddp_phys_birth == 0 || ddp == ddp_self)
@@ -2553,23 +2576,23 @@ zio_ddt_read_start(zio_t *zio)
 			    zio->io_priority, ZIO_DDT_CHILD_FLAGS(zio) |
 			    ZIO_FLAG_DONT_PROPAGATE, &zio->io_bookmark));
 		}
 -		return (ZIO_PIPELINE_CONTINUE);
 +		return (zio);
 	}
 	zio_nowait(zio_read(zio, zio->io_spa, bp,
 	    zio->io_abd, zio->io_size, NULL, NULL, zio->io_priority,
 	    ZIO_DDT_CHILD_FLAGS(zio), &zio->io_bookmark));
 -	return (ZIO_PIPELINE_CONTINUE);
 +	return (zio);
 }
 -static int
 +static zio_t *
 zio_ddt_read_done(zio_t *zio)
 {
 	blkptr_t *bp = zio->io_bp;
 	if (zio_wait_for_children(zio, ZIO_CHILD_DDT_BIT, ZIO_WAIT_DONE)) {
 -		return (ZIO_PIPELINE_STOP);
 +		return (NULL);
 	}
 	ASSERT(BP_GET_DEDUP(bp));
@@ -2581,12 +2604,12 @@ zio_ddt_read_done(zio_t *zio)
 		ddt_entry_t *dde = zio->io_vsd;
 		if (ddt == NULL) {
 			ASSERT(spa_load_state(zio->io_spa) != SPA_LOAD_NONE);
 -			return (ZIO_PIPELINE_CONTINUE);
 +			return (zio);
 		}
 		if (dde == NULL) {
 			zio->io_stage = ZIO_STAGE_DDT_READ_START >> 1;
 			zio_taskq_dispatch(zio, ZIO_TASKQ_ISSUE, B_FALSE);
 -			return (ZIO_PIPELINE_STOP);
 +			return (NULL);
 		}
 		if (dde->dde_repair_abd != NULL) {
 			abd_copy(zio->io_abd, dde->dde_repair_abd,
@@ -2599,7 +2622,7 @@ zio_ddt_read_done(zio_t *zio)
 	ASSERT(zio->io_vsd == NULL);
 -	return (ZIO_PIPELINE_CONTINUE);
 +	return (zio);
 }
 static boolean_t
@@ -2780,7 +2803,7 @@ zio_ddt_ditto_write_done(zio_t *zio)
 	ddt_exit(ddt);
 }
 -static int
 +static zio_t *
 zio_ddt_write(zio_t *zio)
 {
 	spa_t *spa = zio->io_spa;
@@ -2822,7 +2845,7 @@ zio_ddt_write(zio_t *zio)
 		}
 		zio->io_pipeline = ZIO_WRITE_PIPELINE;
 		ddt_exit(ddt);
 -		return (ZIO_PIPELINE_CONTINUE);
 +		return (zio);
 	}
 	ditto_copies = ddt_ditto_copies_needed(ddt, dde, ddp);
@@ -2848,7 +2871,7 @@ zio_ddt_write(zio_t *zio)
 			zio->io_bp_override = NULL;
 			BP_ZERO(bp);
 			ddt_exit(ddt);
 -			return (ZIO_PIPELINE_CONTINUE);
 +			return (zio);
 		}
 		dio = zio_write(zio, spa, txg, bp, zio->io_orig_abd,
@@ -2890,12 +2913,12 @@ zio_ddt_write(zio_t *zio)
 	if (dio)
 		zio_nowait(dio);
 -	return (ZIO_PIPELINE_CONTINUE);
 +	return (zio);
 }
 ddt_entry_t *freedde; /* for debugging */
 -static int
 +static zio_t *
 zio_ddt_free(zio_t *zio)
 {
 	spa_t *spa = zio->io_spa;
@@ -2916,7 +2939,7 @@ zio_ddt_free(zio_t *zio)
 	}
 	ddt_exit(ddt);
 -	return (ZIO_PIPELINE_CONTINUE);
 +	return (zio);
 }
 /*
@@ -2953,7 +2976,7 @@ zio_io_to_allocate(spa_t *spa)
 	return (zio);
 }
 -static int
 +static zio_t *
 zio_dva_throttle(zio_t *zio)
 {
 	spa_t *spa = zio->io_spa;
@@ -2963,7 +2986,7 @@ zio_dva_throttle(zio_t *zio)
 	    !spa_normal_class(zio->io_spa)->mc_alloc_throttle_enabled ||
 	    zio->io_child_type == ZIO_CHILD_GANG ||
 	    zio->io_flags & ZIO_FLAG_NODATA) {
 -		return (ZIO_PIPELINE_CONTINUE);
 +		return (zio);
 	}
 	ASSERT(zio->io_child_type > ZIO_CHILD_GANG);
@@ -2979,22 +3002,7 @@ zio_dva_throttle(zio_t *zio)
 	nio = zio_io_to_allocate(zio->io_spa);
 	mutex_exit(&spa->spa_alloc_lock);
 -	if (nio == zio)
 -		return (ZIO_PIPELINE_CONTINUE);
 -
 -	if (nio != NULL) {
 -		ASSERT(nio->io_stage == ZIO_STAGE_DVA_THROTTLE);
 -		/*
 -		 * We are passing control to a new zio so make sure that
 -		 * it is processed by a different thread. We do this to
 -		 * avoid stack overflows that can occur when parents are
 -		 * throttled and children are making progress. We allow
 -		 * it to go to the head of the taskq since it's already
 -		 * been waiting.
 -		 */
 -		zio_taskq_dispatch(nio, ZIO_TASKQ_ISSUE, B_TRUE);
 -	}
 -	return (ZIO_PIPELINE_STOP);
 +	return (nio);
 }
 void
@@ -3013,7 +3021,7 @@ zio_allocate_dispatch(spa_t *spa)
 	zio_taskq_dispatch(zio, ZIO_TASKQ_ISSUE, B_TRUE);
 }
 -static int
 +static zio_t *
 zio_dva_allocate(zio_t *zio)
 {
 	spa_t *spa = zio->io_spa;
@@ -3054,18 +3062,18 @@ zio_dva_allocate(zio_t *zio)
 		zio->io_error = error;
 	}
 -	return (ZIO_PIPELINE_CONTINUE);
 +	return (zio);
 }
 -static int
 +static zio_t *
 zio_dva_free(zio_t *zio)
 {
 	metaslab_free(zio->io_spa, zio->io_bp, zio->io_txg, B_FALSE);
 -	return (ZIO_PIPELINE_CONTINUE);
 +	return (zio);
 }
 -static int
 +static zio_t *
 zio_dva_claim(zio_t *zio)
 {
 	int error;
@@ -3074,7 +3082,7 @@ zio_dva_claim(zio_t *zio)
 	if (error)
 		zio->io_error = error;
 -	return (ZIO_PIPELINE_CONTINUE);
 +	return (zio);
 }
 /*
@@ -3172,7 +3180,7 @@ zio_free_zil(spa_t *spa, uint64_t txg, blkptr_t *bp)
  * force the underlying vdev layers to call either zio_execute() or
  * zio_interrupt() to ensure that the pipeline continues with the correct I/O.
  */
 -static int
 +static zio_t *
 zio_vdev_io_start(zio_t *zio)
 {
 	vdev_t *vd = zio->io_vd;
@@ -3192,7 +3200,7 @@ zio_vdev_io_start(zio_t *zio)
 		 * The mirror_ops handle multiple DVAs in a single BP.
 		 */
 		vdev_mirror_ops.vdev_op_io_start(zio);
 -		return (ZIO_PIPELINE_STOP);
 +		return (NULL);
 	}
 	ASSERT3P(zio->io_logical, !=, zio);
@@ -3269,31 +3277,31 @@ zio_vdev_io_start(zio_t *zio)
 	    !vdev_dtl_contains(vd, DTL_PARTIAL, zio->io_txg, 1)) {
 		ASSERT(zio->io_type == ZIO_TYPE_WRITE);
 		zio_vdev_io_bypass(zio);
 -		return (ZIO_PIPELINE_CONTINUE);
 +		return (zio);
 	}
 	if (vd->vdev_ops->vdev_op_leaf &&
 	    (zio->io_type == ZIO_TYPE_READ || zio->io_type == ZIO_TYPE_WRITE)) {
 		if (zio->io_type == ZIO_TYPE_READ && vdev_cache_read(zio))
 -			return (ZIO_PIPELINE_CONTINUE);
 +			return (zio);
 		if ((zio = vdev_queue_io(zio)) == NULL)
 -			return (ZIO_PIPELINE_STOP);
 +			return (NULL);
 		if (!vdev_accessible(vd, zio)) {
 			zio->io_error = SET_ERROR(ENXIO);
 			zio_interrupt(zio);
 -			return (ZIO_PIPELINE_STOP);
 +			return (NULL);
 		}
 		zio->io_delay = gethrtime();
 	}
 	vd->vdev_ops->vdev_op_io_start(zio);
 -	return (ZIO_PIPELINE_STOP);
 +	return (NULL);
 }
 -static int
 +static zio_t *
 zio_vdev_io_done(zio_t *zio)
 {
 	vdev_t *vd = zio->io_vd;
@@ -3301,7 +3309,7 @@ zio_vdev_io_done(zio_t *zio)
 	boolean_t unexpected_error = B_FALSE;
 	if (zio_wait_for_children(zio, ZIO_CHILD_VDEV_BIT, ZIO_WAIT_DONE)) {
 -		return (ZIO_PIPELINE_STOP);
 +		return (NULL);
 	}
 	ASSERT(zio->io_type == ZIO_TYPE_READ || zio->io_type == ZIO_TYPE_WRITE);
@@ -3337,7 +3345,7 @@ zio_vdev_io_done(zio_t *zio)
 	if (unexpected_error)
 		VERIFY(vdev_probe(vd, zio) == NULL);
 -	return (ZIO_PIPELINE_CONTINUE);
 +	return (zio);
 }
 /*
@@ -3366,13 +3374,13 @@ zio_vsd_default_cksum_report(zio_t *zio, zio_cksum_report_t *zcr, void *ignored)
 	zcr->zcr_free = zio_abd_free;
 }
 -static int
 +static zio_t *
 zio_vdev_io_assess(zio_t *zio)
 {
 	vdev_t *vd = zio->io_vd;
 	if (zio_wait_for_children(zio, ZIO_CHILD_VDEV_BIT, ZIO_WAIT_DONE)) {
 -		return (ZIO_PIPELINE_STOP);
 +		return (NULL);
 	}
 	if (vd == NULL && !(zio->io_flags & ZIO_FLAG_CONFIG_WRITER))
@@ -3402,7 +3410,7 @@ zio_vdev_io_assess(zio_t *zio)
 		zio->io_stage = ZIO_STAGE_VDEV_IO_START >> 1;
 		zio_taskq_dispatch(zio, ZIO_TASKQ_ISSUE,
 		    zio_requeue_io_start_cut_in_line);
 -		return (ZIO_PIPELINE_STOP);
 +		return (NULL);
 	}
 	/*
@@ -3442,7 +3450,7 @@ zio_vdev_io_assess(zio_t *zio)
 		zio->io_physdone(zio->io_logical);
 	}
 -	return (ZIO_PIPELINE_CONTINUE);
 +	return (zio);
 }
 void
@@ -3477,7 +3485,7 @@ zio_vdev_io_bypass(zio_t *zio)
  * Generate and verify checksums
  * ==========================================================================
  */
 -static int
 +static zio_t *
 zio_checksum_generate(zio_t *zio)
 {
 	blkptr_t *bp = zio->io_bp;
@@ -3491,7 +3499,7 @@ zio_checksum_generate(zio_t *zio)
 		checksum = zio->io_prop.zp_checksum;
 		if (checksum == ZIO_CHECKSUM_OFF)
 -			return (ZIO_PIPELINE_CONTINUE);
 +			return (zio);
 		ASSERT(checksum == ZIO_CHECKSUM_LABEL);
 	} else {
@@ -3505,10 +3513,10 @@ zio_checksum_generate(zio_t *zio)
 	zio_checksum_compute(zio, checksum, zio->io_abd, zio->io_size);
 -	return (ZIO_PIPELINE_CONTINUE);
 +	return (zio);
 }
 -static int
 +static zio_t *
 zio_checksum_verify(zio_t *zio)
 {
 	zio_bad_cksum_t info;
@@ -3523,7 +3531,7 @@ zio_checksum_verify(zio_t *zio)
 		 * We're either verifying a label checksum, or nothing at all.
 		 */
 		if (zio->io_prop.zp_checksum == ZIO_CHECKSUM_OFF)
 -			return (ZIO_PIPELINE_CONTINUE);
 +			return (zio);
 		ASSERT(zio->io_prop.zp_checksum == ZIO_CHECKSUM_LABEL);
 	}
@@ -3538,7 +3546,7 @@ zio_checksum_verify(zio_t *zio)
 		}
 	}
 -	return (ZIO_PIPELINE_CONTINUE);
 +	return (zio);
 }
 /*
@@ -3581,7 +3589,7 @@ zio_worst_error(int e1, int e2)
  * I/O completion
  * ==========================================================================
  */
 -static int
 +static zio_t *
 zio_ready(zio_t *zio)
 {
 	blkptr_t *bp = zio->io_bp;
@@ -3590,7 +3598,7 @@ zio_ready(zio_t *zio)
 	if (zio_wait_for_children(zio, ZIO_CHILD_GANG_BIT | ZIO_CHILD_DDT_BIT,
 	    ZIO_WAIT_READY)) {
 -		return (ZIO_PIPELINE_STOP);
 +		return (NULL);
 	}
 	if (zio->io_ready) {
@@ -3636,7 +3644,7 @@ zio_ready(zio_t *zio)
 	 */
 	for (; pio != NULL; pio = pio_next) {
 		pio_next = zio_walk_parents(zio, &zl);
 -		zio_notify_parent(pio, zio, ZIO_WAIT_READY);
 +		zio_notify_parent(pio, zio, ZIO_WAIT_READY, NULL);
 	}
 	if (zio->io_flags & ZIO_FLAG_NODATA) {
@@ -3652,7 +3660,7 @@ zio_ready(zio_t *zio)
 	    zio->io_spa->spa_syncing_txg == zio->io_txg)
 		zio_handle_ignored_writes(zio);
 -	return (ZIO_PIPELINE_CONTINUE);
 +	return (zio);
 }
 /*
@@ -3716,7 +3724,7 @@ zio_dva_throttle_done(zio_t *zio)
 	zio_allocate_dispatch(zio->io_spa);
 }
 -static int
 +static zio_t *
 zio_done(zio_t *zio)
 {
 	/*
@@ -3733,7 +3741,7 @@ zio_done(zio_t *zio)
 	 * wait for them and then repeat this pipeline stage.
 	 */
 	if (zio_wait_for_children(zio, ZIO_CHILD_ALL_BITS, ZIO_WAIT_DONE)) {
 -		return (ZIO_PIPELINE_STOP);
 +		return (NULL);
 	}
 	/*
@@ -3957,7 +3965,12 @@ zio_done(zio_t *zio)
 			if ((pio->io_flags & ZIO_FLAG_GODFATHER) &&
 			    (zio->io_reexecute & ZIO_REEXECUTE_SUSPEND)) {
 				zio_remove_child(pio, zio, remove_zl);
 -				zio_notify_parent(pio, zio, ZIO_WAIT_DONE);
 +				/*
 +				 * This is a rare code path, so we don't
 +				 * bother with "next_to_execute".
 +				 */
 +				zio_notify_parent(pio, zio, ZIO_WAIT_DONE,
 +				    NULL);
 			}
 		}
@@ -3969,7 +3982,11 @@ zio_done(zio_t *zio)
 			 */
 			ASSERT(!(zio->io_flags & ZIO_FLAG_GODFATHER));
 			zio->io_flags |= ZIO_FLAG_DONT_PROPAGATE;
 -			zio_notify_parent(pio, zio, ZIO_WAIT_DONE);
 +			/*
 +			 * This is a rare code path, so we don't bother with
 +			 * "next_to_execute".
 +			 */
 +			zio_notify_parent(pio, zio, ZIO_WAIT_DONE, NULL);
 		} else if (zio->io_reexecute & ZIO_REEXECUTE_SUSPEND) {
 			/*
 			 * We'd fail again if we reexecuted now, so suspend
@@ -3987,7 +4004,7 @@ zio_done(zio_t *zio)
 			    (task_func_t *)zio_reexecute, zio, 0,
 			    &zio->io_tqent);
 		}
 -		return (ZIO_PIPELINE_STOP);
 +		return (NULL);
 	}
 	ASSERT(zio->io_child_count == 0);
@@ -4023,12 +4040,17 @@ zio_done(zio_t *zio)
 	zio->io_state[ZIO_WAIT_DONE] = 1;
 	mutex_exit(&zio->io_lock);
 +	/*
 +	 * We are done executing this zio.  We may want to execute a parent
 +	 * next.  See the comment in zio_notify_parent().
 +	 */
 +	zio_t *next_to_execute = NULL;
 	zl = NULL;
 	for (pio = zio_walk_parents(zio, &zl); pio != NULL; pio = pio_next) {
 		zio_link_t *remove_zl = zl;
 		pio_next = zio_walk_parents(zio, &zl);
 		zio_remove_child(pio, zio, remove_zl);
 -		zio_notify_parent(pio, zio, ZIO_WAIT_DONE);
 +		zio_notify_parent(pio, zio, ZIO_WAIT_DONE, &next_to_execute);
 	}
 	if (zio->io_waiter != NULL) {
@@ -4040,7 +4062,7 @@ zio_done(zio_t *zio)
 		zio_destroy(zio);
 	}
 -	return (ZIO_PIPELINE_STOP);
 +	return (next_to_execute);
 }
 /*
@@ -1,221 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Olaf Faaland <faaland1@llnl.gov>
 Date: Mon, 20 Aug 2018 10:05:23 -0700
 Subject: [PATCH] Skip import activity test in more zdb code paths
 Since zdb opens the pools read-only, it cannot damage the pool in the
 event the pool is already imported either on the same host or on
 another one.
 If the pool vdev structure is changing while zdb is importing the
 pool, it may cause zdb to crash.  However this is unlikely, and in any
 case it's a user space process and can simply be run again.
 For this reason, zdb should disable the multihost activity test on
 import that is normally run.
 This commit fixes a few zdb code paths where that had been overlooked.
 It also adds tests to ensure that several common use cases handle this
 properly in the future.
 Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Reviewed-by: Gu Zheng <guzheng2331314@163.com>
 Signed-off-by: Olaf Faaland <faaland1@llnl.gov>
 Closes #7797
 Closes #7801
 ---
 cmd/zdb/zdb.c                                      | 39 +++++++-----
 tests/runfiles/linux.run                           |  3 +-
 tests/zfs-tests/tests/functional/mmp/Makefile.am   |  1 +
 .../zfs-tests/tests/functional/mmp/mmp_on_zdb.ksh  | 74 ++++++++++++++++++++++
 4 files changed, 101 insertions(+), 16 deletions(-)
 create mode 100755 tests/zfs-tests/tests/functional/mmp/mmp_on_zdb.ksh
 diff --git a/cmd/zdb/zdb.c b/cmd/zdb/zdb.c
 index 17a0ae25..bb9fd3f1 100644
 --- a/cmd/zdb/zdb.c
 +++ b/cmd/zdb/zdb.c
@@ -24,7 +24,7 @@
  * Copyright (c) 2011, 2016 by Delphix. All rights reserved.
  * Copyright (c) 2014 Integros [integros.com]
  * Copyright 2016 Nexenta Systems, Inc.
 - * Copyright (c) 2017 Lawrence Livermore National Security, LLC.
 + * Copyright (c) 2017, 2018 Lawrence Livermore National Security, LLC.
  * Copyright (c) 2015, 2017, Intel Corporation.
  */
@@ -3660,6 +3660,22 @@ dump_simulated_ddt(spa_t *spa)
 }
 static void
 +zdb_set_skip_mmp(char *target)
 +{
 +	spa_t *spa;
 +
 +	/*
 +	 * Disable the activity check to allow examination of
 +	 * active pools.
 +	 */
 +	mutex_enter(&spa_namespace_lock);
 +	if ((spa = spa_lookup(target)) != NULL) {
 +		spa->spa_import_flags |= ZFS_IMPORT_SKIP_MMP;
 +	}
 +	mutex_exit(&spa_namespace_lock);
 +}
 +
 +static void
 dump_zpool(spa_t *spa)
 {
 	dsl_pool_t *dp = spa_get_dsl(spa);
@@ -4412,14 +4428,15 @@ main(int argc, char **argv)
 				    target, strerror(ENOMEM));
 			}
 -			/*
 -			 * Disable the activity check to allow examination of
 -			 * active pools.
 -			 */
 			if (dump_opt['C'] > 1) {
 				(void) printf("\nConfiguration for import:\n");
 				dump_nvlist(cfg, 8);
 			}
 +
 +			/*
 +			 * Disable the activity check to allow examination of
 +			 * active pools.
 +			 */
 			error = spa_import(target_pool, cfg, NULL,
 			    flags | ZFS_IMPORT_SKIP_MMP);
 		}
@@ -4430,16 +4447,7 @@ main(int argc, char **argv)
 	if (error == 0) {
 		if (target_is_spa || dump_opt['R']) {
 -			/*
 -			 * Disable the activity check to allow examination of
 -			 * active pools.
 -			 */
 -			mutex_enter(&spa_namespace_lock);
 -			if ((spa = spa_lookup(target)) != NULL) {
 -				spa->spa_import_flags |= ZFS_IMPORT_SKIP_MMP;
 -			}
 -			mutex_exit(&spa_namespace_lock);
 -
 +			zdb_set_skip_mmp(target);
 			error = spa_open_rewind(target, &spa, FTAG, policy,
 			    NULL);
 			if (error) {
@@ -4462,6 +4470,7 @@ main(int argc, char **argv)
 				}
 			}
 		} else {
 +			zdb_set_skip_mmp(target);
 			error = open_objset(target, DMU_OST_ANY, FTAG, &os);
 		}
 	}
 diff --git a/tests/runfiles/linux.run b/tests/runfiles/linux.run
 index d8fe6f3a..ddf01aaf 100644
 --- a/tests/runfiles/linux.run
 +++ b/tests/runfiles/linux.run
@@ -499,7 +499,8 @@ tags = ['functional', 'mmap']
 [tests/functional/mmp]
 tests = ['mmp_on_thread', 'mmp_on_uberblocks', 'mmp_on_off', 'mmp_interval',
     'mmp_active_import', 'mmp_inactive_import', 'mmp_exported_import',
 -    'mmp_write_uberblocks', 'mmp_reset_interval', 'multihost_history']
 +    'mmp_write_uberblocks', 'mmp_reset_interval', 'multihost_history',
 +    'mmp_on_zdb']
 tags = ['functional', 'mmp']
 [tests/functional/mount]
 diff --git a/tests/zfs-tests/tests/functional/mmp/Makefile.am b/tests/zfs-tests/tests/functional/mmp/Makefile.am
 index ecf16f80..f2d0ad0e 100644
 --- a/tests/zfs-tests/tests/functional/mmp/Makefile.am
 +++ b/tests/zfs-tests/tests/functional/mmp/Makefile.am
@@ -10,6 +10,7 @@ dist_pkgdata_SCRIPTS = \
 	mmp_exported_import.ksh \
 	mmp_write_uberblocks.ksh \
 	mmp_reset_interval.ksh \
 +	mmp_on_zdb.ksh \
 	setup.ksh \
 	cleanup.ksh
 diff --git a/tests/zfs-tests/tests/functional/mmp/mmp_on_zdb.ksh b/tests/zfs-tests/tests/functional/mmp/mmp_on_zdb.ksh
 new file mode 100755
 index 00000000..b646475a
 --- /dev/null
 +++ b/tests/zfs-tests/tests/functional/mmp/mmp_on_zdb.ksh
@@ -0,0 +1,74 @@
 +#!/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) 2018 Lawrence Livermore National Security, LLC.
 +# Copyright (c) 2018 by Nutanix. All rights reserved.
 +#
 +
 +. $STF_SUITE/include/libtest.shlib
 +. $STF_SUITE/tests/functional/mmp/mmp.cfg
 +. $STF_SUITE/tests/functional/mmp/mmp.kshlib
 +
 +#
 +# Description:
 +# zdb will work while multihost is enabled.
 +#
 +# Strategy:
 +# 1. Create a pool
 +# 2. Enable multihost
 +# 3. Run zdb -d with pool and dataset arguments.
 +# 4. Create a checkpoint
 +# 5. Run zdb -kd with pool and dataset arguments.
 +# 6. Discard the checkpoint
 +# 7. Export the pool
 +# 8. Run zdb -ed with pool and dataset arguments.
 +#
 +
 +function cleanup
 +{
 +	datasetexists $TESTPOOL && destroy_pool $TESTPOOL
 +	for DISK in $DISKS; do
 +		zpool labelclear -f $DEV_RDSKDIR/$DISK
 +	done
 +	log_must mmp_clear_hostid
 +}
 +
 +log_assert "Verify zdb -d works while multihost is enabled"
 +log_onexit cleanup
 +
 +verify_runnable "global"
 +verify_disk_count "$DISKS" 2
 +
 +default_mirror_setup_noexit $DISKS
 +log_must mmp_set_hostid $HOSTID1
 +log_must zpool set multihost=on $TESTPOOL
 +log_must zfs snap $TESTPOOL/$TESTFS@snap
 +
 +log_must zdb -d $TESTPOOL
 +log_must zdb -d $TESTPOOL/
 +log_must zdb -d $TESTPOOL/$TESTFS
 +log_must zdb -d $TESTPOOL/$TESTFS@snap
 +
 +log_must zpool export $TESTPOOL
 +
 +log_must zdb -ed $TESTPOOL
 +log_must zdb -ed $TESTPOOL/
 +log_must zdb -ed $TESTPOOL/$TESTFS
 +log_must zdb -ed $TESTPOOL/$TESTFS@snap
 +
 +log_must zpool import $TESTPOOL
 +
 +cleanup
 +
 +log_pass "zdb -d works while multihost is enabled"
@@ -1,180 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Brian Behlendorf <behlendorf1@llnl.gov>
 Date: Mon, 24 Sep 2018 17:11:25 -0700
 Subject: [PATCH] Fix statfs(2) for 32-bit user space
 When handling a 32-bit statfs() system call the returned fields,
 although 64-bit in the kernel, must be limited to 32-bits or an
 EOVERFLOW error will be returned.
 This is less of an issue for block counts since the default
 reported block size in 128KiB. But since it is possible to
 set a smaller block size, these values will be scaled as
 needed to fit in a 32-bit unsigned long.
 Unlike most other filesystems the total possible file counts
 are more likely to overflow because they are calculated based
 on the available free space in the pool. In order to prevent
 this the reported value must be capped at 2^32-1. This is
 only for statfs(2) reporting, there are no changes to the
 internal ZFS limits.
 Reviewed-by: Andreas Dilger <andreas.dilger@whamcloud.com>
 Reviewed-by: Richard Yao <ryao@gentoo.org>
 Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Issue #7927
 Closes #7122
 Closes #7937
 ---
 config/kernel-in-compat-syscall.m4 | 20 ++++++++++++++++++++
 config/kernel.m4                   |  1 +
 include/linux/vfs_compat.h         | 18 ++++++++++++++++++
 module/zfs/zfs_vfsops.c            |  8 +++-----
 module/zfs/zpl_super.c             | 22 ++++++++++++++++++++++
 5 files changed, 64 insertions(+), 5 deletions(-)
 create mode 100644 config/kernel-in-compat-syscall.m4
 diff --git a/config/kernel-in-compat-syscall.m4 b/config/kernel-in-compat-syscall.m4
 new file mode 100644
 index 00000000..9fca9da2
 --- /dev/null
 +++ b/config/kernel-in-compat-syscall.m4
@@ -0,0 +1,20 @@
 +dnl #
 +dnl # 4.5 API change
 +dnl # Added in_compat_syscall() which can be overridden on a per-
 +dnl # architecture basis.  Prior to this is_compat_task() was the
 +dnl # provided interface.
 +dnl #
 +AC_DEFUN([ZFS_AC_KERNEL_IN_COMPAT_SYSCALL], [
 +	AC_MSG_CHECKING([whether in_compat_syscall() is available])
 +	ZFS_LINUX_TRY_COMPILE([
 +		#include <linux/compat.h>
 +	],[
 +		in_compat_syscall();
 +	],[
 +		AC_MSG_RESULT(yes)
 +		AC_DEFINE(HAVE_IN_COMPAT_SYSCALL, 1,
 +		    [in_compat_syscall() is available])
 +	],[
 +		AC_MSG_RESULT(no)
 +	])
 +])
 diff --git a/config/kernel.m4 b/config/kernel.m4
 index c7ca260c..3777f45c 100644
 --- a/config/kernel.m4
 +++ b/config/kernel.m4
@@ -129,6 +129,7 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
 	ZFS_AC_KERNEL_GLOBAL_PAGE_STATE
 	ZFS_AC_KERNEL_ACL_HAS_REFCOUNT
 	ZFS_AC_KERNEL_USERNS_CAPABILITIES
 +	ZFS_AC_KERNEL_IN_COMPAT_SYSCALL
 	AS_IF([test "$LINUX_OBJ" != "$LINUX"], [
 		KERNELMAKE_PARAMS="$KERNELMAKE_PARAMS O=$LINUX_OBJ"
 diff --git a/include/linux/vfs_compat.h b/include/linux/vfs_compat.h
 index c8203bd5..90b3cca7 100644
 --- a/include/linux/vfs_compat.h
 +++ b/include/linux/vfs_compat.h
@@ -30,6 +30,7 @@
 #include <sys/taskq.h>
 #include <sys/cred.h>
 #include <linux/backing-dev.h>
 +#include <linux/compat.h>
 /*
  * 2.6.28 API change,
@@ -626,4 +627,21 @@ inode_set_iversion(struct inode *ip, u64 val)
 }
 #endif
 +/*
 + * Returns true when called in the context of a 32-bit system call.
 + */
 +static inline int
 +zpl_is_32bit_api(void)
 +{
 +#ifdef CONFIG_COMPAT
 +#ifdef HAVE_IN_COMPAT_SYSCALL
 +	return (in_compat_syscall());
 +#else
 +	return (is_compat_task());
 +#endif
 +#else
 +	return (BITS_PER_LONG == 32);
 +#endif
 +}
 +
 #endif /* _ZFS_VFS_H */
 diff --git a/module/zfs/zfs_vfsops.c b/module/zfs/zfs_vfsops.c
 index 76113393..bcdfa26b 100644
 --- a/module/zfs/zfs_vfsops.c
 +++ b/module/zfs/zfs_vfsops.c
@@ -1245,15 +1245,13 @@ zfs_statvfs(struct dentry *dentry, struct kstatfs *statp)
 {
 	zfsvfs_t *zfsvfs = dentry->d_sb->s_fs_info;
 	uint64_t refdbytes, availbytes, usedobjs, availobjs;
 -	uint64_t fsid;
 -	uint32_t bshift;
 	ZFS_ENTER(zfsvfs);
 	dmu_objset_space(zfsvfs->z_os,
 	    &refdbytes, &availbytes, &usedobjs, &availobjs);
 -	fsid = dmu_objset_fsid_guid(zfsvfs->z_os);
 +	uint64_t fsid = dmu_objset_fsid_guid(zfsvfs->z_os);
 	/*
 	 * The underlying storage pool actually uses multiple block
 	 * size.  Under Solaris frsize (fragment size) is reported as
@@ -1265,7 +1263,7 @@ zfs_statvfs(struct dentry *dentry, struct kstatfs *statp)
 	 */
 	statp->f_frsize = zfsvfs->z_max_blksz;
 	statp->f_bsize = zfsvfs->z_max_blksz;
 -	bshift = fls(statp->f_bsize) - 1;
 +	uint32_t bshift = fls(statp->f_bsize) - 1;
 	/*
 	 * The following report "total" blocks of various kinds in
@@ -1282,7 +1280,7 @@ zfs_statvfs(struct dentry *dentry, struct kstatfs *statp)
 	 * static metadata.  ZFS doesn't preallocate files, so the best
 	 * we can do is report the max that could possibly fit in f_files,
 	 * and that minus the number actually used in f_ffree.
 -	 * For f_ffree, report the smaller of the number of object available
 +	 * For f_ffree, report the smaller of the number of objects available
 	 * and the number of blocks (each object will take at least a block).
 	 */
 	statp->f_ffree = MIN(availobjs, availbytes >> DNODE_SHIFT);
 diff --git a/module/zfs/zpl_super.c b/module/zfs/zpl_super.c
 index 5c426b0a..216c7940 100644
 --- a/module/zfs/zpl_super.c
 +++ b/module/zfs/zpl_super.c
@@ -181,6 +181,28 @@ zpl_statfs(struct dentry *dentry, struct kstatfs *statp)
 	spl_fstrans_unmark(cookie);
 	ASSERT3S(error, <=, 0);
 +	/*
 +	 * If required by a 32-bit system call, dynamically scale the
 +	 * block size up to 16MiB and decrease the block counts.  This
 +	 * allows for a maximum size of 64EiB to be reported.  The file
 +	 * counts must be artificially capped at 2^32-1.
 +	 */
 +	if (unlikely(zpl_is_32bit_api())) {
 +		while (statp->f_blocks > UINT32_MAX &&
 +		    statp->f_bsize < SPA_MAXBLOCKSIZE) {
 +			statp->f_frsize <<= 1;
 +			statp->f_bsize <<= 1;
 +
 +			statp->f_blocks >>= 1;
 +			statp->f_bfree >>= 1;
 +			statp->f_bavail >>= 1;
 +		}
 +
 +		uint64_t usedobjs = statp->f_files - statp->f_ffree;
 +		statp->f_ffree = MIN(statp->f_ffree, UINT32_MAX - usedobjs);
 +		statp->f_files = statp->f_ffree + usedobjs;
 +	}
 +
 	return (error);
 }
@@ -1,86 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Gregor Kopka <mailfrom-github@kopka.net>
 Date: Wed, 26 Sep 2018 01:29:16 +0200
 Subject: [PATCH] Zpool iostat: remove latency/queue scaling
 Bandwidth and iops are average per second while *_wait are averages
 per request for latency or, for queue depths, an instantaneous
 measurement at the end of an interval (according to man zpool).
 When calculating the first two it makes sense to do
 x/interval_duration (x being the increase in total bytes or number of
 requests over the duration of the interval, interval_duration in
 seconds) to 'scale' from amount/interval_duration to amount/second.
 But applying the same math for the latter (*_wait latencies/queue) is
 wrong as there is no interval_duration component in the values (these
 are time/requests to get to average_time/request or already an
 absulute number).
 This bug leads to the only correct continuous *_wait figures for both
 latencies and queue depths from 'zpool iostat -l/q' being with
 duration=1 as then the wrong math cancels itself (x/1 is a nop).
 This removes temporal scaling from latency and queue depth figures.
 Reviewed-by: Tony Hutter <hutter2@llnl.gov>
 Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Signed-off-by: Gregor Kopka <gregor@kopka.net>
 Closes #7945
 Closes #7694
 ---
 cmd/zpool/zpool_main.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
 diff --git a/cmd/zpool/zpool_main.c b/cmd/zpool/zpool_main.c
 index a4fd0321..591e2e5c 100644
 --- a/cmd/zpool/zpool_main.c
 +++ b/cmd/zpool/zpool_main.c
@@ -3493,7 +3493,7 @@ single_histo_average(uint64_t *histo, unsigned int buckets)
 static void
 print_iostat_queues(iostat_cbdata_t *cb, nvlist_t *oldnv,
 -    nvlist_t *newnv, double scale)
 +    nvlist_t *newnv)
 {
 	int i;
 	uint64_t val;
@@ -3523,7 +3523,7 @@ print_iostat_queues(iostat_cbdata_t *cb, nvlist_t *oldnv,
 		format = ZFS_NICENUM_1024;
 	for (i = 0; i < ARRAY_SIZE(names); i++) {
 -		val = nva[i].data[0] * scale;
 +		val = nva[i].data[0];
 		print_one_stat(val, format, column_width, cb->cb_scripted);
 	}
@@ -3532,7 +3532,7 @@ print_iostat_queues(iostat_cbdata_t *cb, nvlist_t *oldnv,
 static void
 print_iostat_latency(iostat_cbdata_t *cb, nvlist_t *oldnv,
 -    nvlist_t *newnv, double scale)
 +    nvlist_t *newnv)
 {
 	int i;
 	uint64_t val;
@@ -3562,7 +3562,7 @@ print_iostat_latency(iostat_cbdata_t *cb, nvlist_t *oldnv,
 	/* Print our avg latencies on the line */
 	for (i = 0; i < ARRAY_SIZE(names); i++) {
 		/* Compute average latency for a latency histo */
 -		val = single_histo_average(nva[i].data, nva[i].count) * scale;
 +		val = single_histo_average(nva[i].data, nva[i].count);
 		print_one_stat(val, format, column_width, cb->cb_scripted);
 	}
 	free_calc_stats(nva, ARRAY_SIZE(names));
@@ -3701,9 +3701,9 @@ print_vdev_stats(zpool_handle_t *zhp, const char *name, nvlist_t *oldnv,
 		print_iostat_default(calcvs, cb, scale);
 	}
 	if (cb->cb_flags & IOS_LATENCY_M)
 -		print_iostat_latency(cb, oldnv, newnv, scale);
 +		print_iostat_latency(cb, oldnv, newnv);
 	if (cb->cb_flags & IOS_QUEUES_M)
 -		print_iostat_queues(cb, oldnv, newnv, scale);
 +		print_iostat_queues(cb, oldnv, newnv);
 	if (cb->cb_flags & IOS_ANYHISTO_M) {
 		printf("\n");
 		print_iostat_histos(cb, oldnv, newnv, scale, name);
@@ -1,878 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tim Schumacher <timschumi@gmx.de>
 Date: Wed, 26 Sep 2018 19:29:26 +0200
 Subject: [PATCH] Linux 4.19-rc3+ compat: Remove refcount_t compat
 torvalds/linux@59b57717f ("blkcg: delay blkg destruction until
 after writeback has finished") added a refcount_t to the blkcg
 structure. Due to the refcount_t compatibility code, zfs_refcount_t
 was used by mistake.
 Resolve this by removing the compatibility code and replacing the
 occurrences of refcount_t with zfs_refcount_t.
 Reviewed-by: Franz Pletz <fpletz@fnordicwalking.de>
 Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Signed-off-by: Tim Schumacher <timschumi@gmx.de>
 Closes #7885
 Closes #7932
 ---
 cmd/ztest/ztest.c           |  6 +++---
 include/linux/vfs_compat.h  |  5 -----
 include/sys/abd.h           |  2 +-
 include/sys/arc.h           |  2 +-
 include/sys/arc_impl.h      |  8 +++----
 include/sys/dbuf.h          |  2 +-
 include/sys/dmu_tx.h        |  4 ++--
 include/sys/dnode.h         |  4 ++--
 include/sys/dsl_dataset.h   |  2 +-
 include/sys/metaslab_impl.h |  5 ++---
 include/sys/refcount.h      | 52 ++++++++++++++++++++-------------------------
 include/sys/rrwlock.h       |  4 ++--
 include/sys/sa_impl.h       |  2 +-
 include/sys/spa_impl.h      |  6 +++---
 include/sys/zap.h           |  2 +-
 include/sys/zfs_znode.h     |  2 +-
 module/zfs/arc.c            | 12 +++++------
 module/zfs/dbuf.c           | 10 ++++-----
 module/zfs/dmu.c            |  2 +-
 module/zfs/dmu_tx.c         |  6 +++---
 module/zfs/dnode.c          |  6 +++---
 module/zfs/dsl_dataset.c    |  2 +-
 module/zfs/metaslab.c       |  4 ++--
 module/zfs/refcount.c       | 30 +++++++++++++-------------
 module/zfs/rrwlock.c        |  4 ++--
 module/zfs/sa.c             |  2 +-
 module/zfs/spa_misc.c       |  8 +++----
 module/zfs/zfs_ctldir.c     | 10 ++++-----
 module/zfs/zfs_znode.c      |  2 +-
 29 files changed, 97 insertions(+), 109 deletions(-)
 diff --git a/cmd/ztest/ztest.c b/cmd/ztest/ztest.c
 index a410eeef..24967a76 100644
 --- a/cmd/ztest/ztest.c
 +++ b/cmd/ztest/ztest.c
@@ -1189,7 +1189,7 @@ ztest_spa_prop_set_uint64(zpool_prop_t prop, uint64_t value)
  */
 typedef struct {
 	list_node_t z_lnode;
 -	refcount_t z_refcnt;
 +	zfs_refcount_t z_refcnt;
 	uint64_t z_object;
 	zfs_rlock_t z_range_lock;
 } ztest_znode_t;
@@ -1248,13 +1248,13 @@ ztest_znode_get(ztest_ds_t *zd, uint64_t object)
 	for (zp = list_head(&zll->z_list); (zp);
 	    zp = list_next(&zll->z_list, zp)) {
 		if (zp->z_object == object) {
 -			refcount_add(&zp->z_refcnt, RL_TAG);
 +			zfs_refcount_add(&zp->z_refcnt, RL_TAG);
 			break;
 		}
 	}
 	if (zp == NULL) {
 		zp = ztest_znode_init(object);
 -		refcount_add(&zp->z_refcnt, RL_TAG);
 +		zfs_refcount_add(&zp->z_refcnt, RL_TAG);
 		list_insert_head(&zll->z_list, zp);
 	}
 	mutex_exit(&zll->z_lock);
 diff --git a/include/linux/vfs_compat.h b/include/linux/vfs_compat.h
 index 90b3cca7..c01f5850 100644
 --- a/include/linux/vfs_compat.h
 +++ b/include/linux/vfs_compat.h
@@ -297,9 +297,6 @@ lseek_execute(
  * This is several orders of magnitude larger than expected grace period.
  * At 60 seconds the kernel will also begin issuing RCU stall warnings.
  */
 -#ifdef refcount_t
 -#undef refcount_t
 -#endif
 #include <linux/posix_acl.h>
@@ -430,8 +427,6 @@ typedef mode_t zpl_equivmode_t;
 #define	zpl_posix_acl_valid(ip, acl)  posix_acl_valid(acl)
 #endif
 -#define	refcount_t	zfs_refcount_t
 -
 #endif /* CONFIG_FS_POSIX_ACL */
 /*
 diff --git a/include/sys/abd.h b/include/sys/abd.h
 index cd710501..4898606a 100644
 --- a/include/sys/abd.h
 +++ b/include/sys/abd.h
@@ -52,7 +52,7 @@ typedef struct abd {
 	abd_flags_t	abd_flags;
 	uint_t		abd_size;	/* excludes scattered abd_offset */
 	struct abd	*abd_parent;
 -	refcount_t	abd_children;
 +	zfs_refcount_t	abd_children;
 	union {
 		struct abd_scatter {
 			uint_t		abd_offset;
 diff --git a/include/sys/arc.h b/include/sys/arc.h
 index 1ea4937b..943ebfb5 100644
 --- a/include/sys/arc.h
 +++ b/include/sys/arc.h
@@ -76,7 +76,7 @@ struct arc_prune {
 	void			*p_private;
 	uint64_t		p_adjust;
 	list_node_t		p_node;
 -	refcount_t		p_refcnt;
 +	zfs_refcount_t		p_refcnt;
 };
 typedef enum arc_strategy {
 diff --git a/include/sys/arc_impl.h b/include/sys/arc_impl.h
 index c6363f2a..ed2b0abe 100644
 --- a/include/sys/arc_impl.h
 +++ b/include/sys/arc_impl.h
@@ -74,12 +74,12 @@ typedef struct arc_state {
 	/*
 	 * total amount of evictable data in this state
 	 */
 -	refcount_t arcs_esize[ARC_BUFC_NUMTYPES];
 +	zfs_refcount_t arcs_esize[ARC_BUFC_NUMTYPES];
 	/*
 	 * total amount of data in this state; this includes: evictable,
 	 * non-evictable, ARC_BUFC_DATA, and ARC_BUFC_METADATA.
 	 */
 -	refcount_t arcs_size;
 +	zfs_refcount_t arcs_size;
 	/*
 	 * supports the "dbufs" kstat
 	 */
@@ -163,7 +163,7 @@ typedef struct l1arc_buf_hdr {
 	uint32_t		b_l2_hits;
 	/* self protecting */
 -	refcount_t		b_refcnt;
 +	zfs_refcount_t		b_refcnt;
 	arc_callback_t		*b_acb;
 	abd_t			*b_pabd;
@@ -180,7 +180,7 @@ typedef struct l2arc_dev {
 	kmutex_t		l2ad_mtx;	/* lock for buffer list */
 	list_t			l2ad_buflist;	/* buffer list */
 	list_node_t		l2ad_node;	/* device list node */
 -	refcount_t		l2ad_alloc;	/* allocated bytes */
 +	zfs_refcount_t		l2ad_alloc;	/* allocated bytes */
 } l2arc_dev_t;
 typedef struct l2arc_buf_hdr {
 diff --git a/include/sys/dbuf.h b/include/sys/dbuf.h
 index f3f2007d..127acad3 100644
 --- a/include/sys/dbuf.h
 +++ b/include/sys/dbuf.h
@@ -212,7 +212,7 @@ typedef struct dmu_buf_impl {
 	 * If nonzero, the buffer can't be destroyed.
 	 * Protected by db_mtx.
 	 */
 -	refcount_t db_holds;
 +	zfs_refcount_t db_holds;
 	/* buffer holding our data */
 	arc_buf_t *db_buf;
 diff --git a/include/sys/dmu_tx.h b/include/sys/dmu_tx.h
 index 74b7e111..96bbcb05 100644
 --- a/include/sys/dmu_tx.h
 +++ b/include/sys/dmu_tx.h
@@ -97,8 +97,8 @@ typedef struct dmu_tx_hold {
 	dmu_tx_t *txh_tx;
 	list_node_t txh_node;
 	struct dnode *txh_dnode;
 -	refcount_t txh_space_towrite;
 -	refcount_t txh_memory_tohold;
 +	zfs_refcount_t txh_space_towrite;
 +	zfs_refcount_t txh_memory_tohold;
 	enum dmu_tx_hold_type txh_type;
 	uint64_t txh_arg1;
 	uint64_t txh_arg2;
 diff --git a/include/sys/dnode.h b/include/sys/dnode.h
 index 2dd087b3..1e77e0a3 100644
 --- a/include/sys/dnode.h
 +++ b/include/sys/dnode.h
@@ -266,8 +266,8 @@ struct dnode {
 	uint8_t *dn_dirtyctx_firstset;		/* dbg: contents meaningless */
 	/* protected by own devices */
 -	refcount_t dn_tx_holds;
 -	refcount_t dn_holds;
 +	zfs_refcount_t dn_tx_holds;
 +	zfs_refcount_t dn_holds;
 	kmutex_t dn_dbufs_mtx;
 	/*
 diff --git a/include/sys/dsl_dataset.h b/include/sys/dsl_dataset.h
 index 1281674b..d96f526d 100644
 --- a/include/sys/dsl_dataset.h
 +++ b/include/sys/dsl_dataset.h
@@ -186,7 +186,7 @@ typedef struct dsl_dataset {
 	 * Owning counts as a long hold.  See the comments above
 	 * dsl_pool_hold() for details.
 	 */
 -	refcount_t ds_longholds;
 +	zfs_refcount_t ds_longholds;
 	/* no locking; only for making guesses */
 	uint64_t ds_trysnap_txg;
 diff --git a/include/sys/metaslab_impl.h b/include/sys/metaslab_impl.h
 index f8a713a4..60151937 100644
 --- a/include/sys/metaslab_impl.h
 +++ b/include/sys/metaslab_impl.h
@@ -179,8 +179,7 @@ struct metaslab_class {
 	 * number of allocations allowed.
 	 */
 	uint64_t		mc_alloc_max_slots;
 -	refcount_t		mc_alloc_slots;
 -
 +	zfs_refcount_t		mc_alloc_slots;
 	uint64_t		mc_alloc_groups; /* # of allocatable groups */
 	uint64_t		mc_alloc;	/* total allocated space */
@@ -230,7 +229,7 @@ struct metaslab_group {
 	 * are unable to handle their share of allocations.
 	 */
 	uint64_t		mg_max_alloc_queue_depth;
 -	refcount_t		mg_alloc_queue_depth;
 +	zfs_refcount_t		mg_alloc_queue_depth;
 	/*
 	 * A metalab group that can no longer allocate the minimum block
 diff --git a/include/sys/refcount.h b/include/sys/refcount.h
 index a96220b2..5c5198d8 100644
 --- a/include/sys/refcount.h
 +++ b/include/sys/refcount.h
@@ -41,17 +41,6 @@ extern "C" {
  */
 #define	FTAG ((char *)__func__)
 -/*
 - * Starting with 4.11, torvalds/linux@f405df5, the linux kernel defines a
 - * refcount_t type of its own.  The macro below effectively changes references
 - * in the ZFS code from refcount_t to zfs_refcount_t at compile time, so that
 - * existing code need not be altered, reducing conflicts when landing openZFS
 - * patches.
 - */
 -
 -#define	refcount_t	zfs_refcount_t
 -#define	refcount_add	zfs_refcount_add
 -
 #ifdef	ZFS_DEBUG
 typedef struct reference {
 	list_node_t ref_link;
@@ -69,23 +58,28 @@ typedef struct refcount {
 	uint64_t rc_removed_count;
 } zfs_refcount_t;
 -/* Note: refcount_t must be initialized with refcount_create[_untracked]() */
 -
 -void refcount_create(refcount_t *rc);
 -void refcount_create_untracked(refcount_t *rc);
 -void refcount_create_tracked(refcount_t *rc);
 -void refcount_destroy(refcount_t *rc);
 -void refcount_destroy_many(refcount_t *rc, uint64_t number);
 -int refcount_is_zero(refcount_t *rc);
 -int64_t refcount_count(refcount_t *rc);
 -int64_t zfs_refcount_add(refcount_t *rc, void *holder_tag);
 -int64_t refcount_remove(refcount_t *rc, void *holder_tag);
 -int64_t refcount_add_many(refcount_t *rc, uint64_t number, void *holder_tag);
 -int64_t refcount_remove_many(refcount_t *rc, uint64_t number, void *holder_tag);
 -void refcount_transfer(refcount_t *dst, refcount_t *src);
 -void refcount_transfer_ownership(refcount_t *, void *, void *);
 -boolean_t refcount_held(refcount_t *, void *);
 -boolean_t refcount_not_held(refcount_t *, void *);
 +/*
 + * Note: zfs_refcount_t must be initialized with
 + * refcount_create[_untracked]()
 + */
 +
 +void refcount_create(zfs_refcount_t *rc);
 +void refcount_create_untracked(zfs_refcount_t *rc);
 +void refcount_create_tracked(zfs_refcount_t *rc);
 +void refcount_destroy(zfs_refcount_t *rc);
 +void refcount_destroy_many(zfs_refcount_t *rc, uint64_t number);
 +int refcount_is_zero(zfs_refcount_t *rc);
 +int64_t refcount_count(zfs_refcount_t *rc);
 +int64_t zfs_refcount_add(zfs_refcount_t *rc, void *holder_tag);
 +int64_t refcount_remove(zfs_refcount_t *rc, void *holder_tag);
 +int64_t refcount_add_many(zfs_refcount_t *rc, uint64_t number,
 +    void *holder_tag);
 +int64_t refcount_remove_many(zfs_refcount_t *rc, uint64_t number,
 +    void *holder_tag);
 +void refcount_transfer(zfs_refcount_t *dst, zfs_refcount_t *src);
 +void refcount_transfer_ownership(zfs_refcount_t *, void *, void *);
 +boolean_t refcount_held(zfs_refcount_t *, void *);
 +boolean_t refcount_not_held(zfs_refcount_t *, void *);
 void refcount_init(void);
 void refcount_fini(void);
@@ -94,7 +88,7 @@ void refcount_fini(void);
 typedef struct refcount {
 	uint64_t rc_count;
 -} refcount_t;
 +} zfs_refcount_t;
 #define	refcount_create(rc) ((rc)->rc_count = 0)
 #define	refcount_create_untracked(rc) ((rc)->rc_count = 0)
 diff --git a/include/sys/rrwlock.h b/include/sys/rrwlock.h
 index 7a328fd6..e1c1756c 100644
 --- a/include/sys/rrwlock.h
 +++ b/include/sys/rrwlock.h
@@ -57,8 +57,8 @@ typedef struct rrwlock {
 	kmutex_t	rr_lock;
 	kcondvar_t	rr_cv;
 	kthread_t	*rr_writer;
 -	refcount_t	rr_anon_rcount;
 -	refcount_t	rr_linked_rcount;
 +	zfs_refcount_t	rr_anon_rcount;
 +	zfs_refcount_t	rr_linked_rcount;
 	boolean_t	rr_writer_wanted;
 	boolean_t	rr_track_all;
 } rrwlock_t;
 diff --git a/include/sys/sa_impl.h b/include/sys/sa_impl.h
 index b68b7610..7eddd875 100644
 --- a/include/sys/sa_impl.h
 +++ b/include/sys/sa_impl.h
@@ -110,7 +110,7 @@ typedef struct sa_idx_tab {
 	list_node_t	sa_next;
 	sa_lot_t	*sa_layout;
 	uint16_t	*sa_variable_lengths;
 -	refcount_t	sa_refcount;
 +	zfs_refcount_t	sa_refcount;
 	uint32_t	*sa_idx_tab;	/* array of offsets */
 } sa_idx_tab_t;
 diff --git a/include/sys/spa_impl.h b/include/sys/spa_impl.h
 index fa7490ac..62ac8f67 100644
 --- a/include/sys/spa_impl.h
 +++ b/include/sys/spa_impl.h
@@ -78,7 +78,7 @@ typedef struct spa_config_lock {
 	kthread_t	*scl_writer;
 	int		scl_write_wanted;
 	kcondvar_t	scl_cv;
 -	refcount_t	scl_count;
 +	zfs_refcount_t	scl_count;
 } spa_config_lock_t;
 typedef struct spa_config_dirent {
@@ -281,12 +281,12 @@ struct spa {
 	/*
 	 * spa_refcount & spa_config_lock must be the last elements
 -	 * because refcount_t changes size based on compilation options.
 +	 * because zfs_refcount_t changes size based on compilation options.
 	 * In order for the MDB module to function correctly, the other
 	 * fields must remain in the same location.
 	 */
 	spa_config_lock_t spa_config_lock[SCL_LOCKS]; /* config changes */
 -	refcount_t	spa_refcount;		/* number of opens */
 +	zfs_refcount_t	spa_refcount;		/* number of opens */
 	taskq_t		*spa_upgrade_taskq;	/* taskq for upgrade jobs */
 };
 diff --git a/include/sys/zap.h b/include/sys/zap.h
 index 43b7fbd2..7acc3bec 100644
 --- a/include/sys/zap.h
 +++ b/include/sys/zap.h
@@ -226,7 +226,7 @@ int zap_lookup_norm_by_dnode(dnode_t *dn, const char *name,
     boolean_t *ncp);
 int zap_count_write_by_dnode(dnode_t *dn, const char *name,
 -    int add, refcount_t *towrite, refcount_t *tooverwrite);
 +    int add, zfs_refcount_t *towrite, zfs_refcount_t *tooverwrite);
 /*
  * Create an attribute with the given name and value.
 diff --git a/include/sys/zfs_znode.h b/include/sys/zfs_znode.h
 index 26d1eb37..33bc20d1 100644
 --- a/include/sys/zfs_znode.h
 +++ b/include/sys/zfs_znode.h
@@ -209,7 +209,7 @@ typedef struct znode_hold {
 	uint64_t	zh_obj;		/* object id */
 	kmutex_t	zh_lock;	/* lock serializing object access */
 	avl_node_t	zh_node;	/* avl tree linkage */
 -	refcount_t	zh_refcount;	/* active consumer reference count */
 +	zfs_refcount_t	zh_refcount;	/* active consumer reference count */
 } znode_hold_t;
 /*
 diff --git a/module/zfs/arc.c b/module/zfs/arc.c
 index bcf74dd6..7518d5c8 100644
 --- a/module/zfs/arc.c
 +++ b/module/zfs/arc.c
@@ -1966,7 +1966,7 @@ add_reference(arc_buf_hdr_t *hdr, void *tag)
 	state = hdr->b_l1hdr.b_state;
 -	if ((refcount_add(&hdr->b_l1hdr.b_refcnt, tag) == 1) &&
 +	if ((zfs_refcount_add(&hdr->b_l1hdr.b_refcnt, tag) == 1) &&
 	    (state != arc_anon)) {
 		/* We don't use the L2-only state list. */
 		if (state != arc_l2c_only) {
@@ -2505,7 +2505,7 @@ arc_return_buf(arc_buf_t *buf, void *tag)
 	ASSERT3P(buf->b_data, !=, NULL);
 	ASSERT(HDR_HAS_L1HDR(hdr));
 -	(void) refcount_add(&hdr->b_l1hdr.b_refcnt, tag);
 +	(void) zfs_refcount_add(&hdr->b_l1hdr.b_refcnt, tag);
 	(void) refcount_remove(&hdr->b_l1hdr.b_refcnt, arc_onloan_tag);
 	arc_loaned_bytes_update(-arc_buf_size(buf));
@@ -2519,7 +2519,7 @@ arc_loan_inuse_buf(arc_buf_t *buf, void *tag)
 	ASSERT3P(buf->b_data, !=, NULL);
 	ASSERT(HDR_HAS_L1HDR(hdr));
 -	(void) refcount_add(&hdr->b_l1hdr.b_refcnt, arc_onloan_tag);
 +	(void) zfs_refcount_add(&hdr->b_l1hdr.b_refcnt, arc_onloan_tag);
 	(void) refcount_remove(&hdr->b_l1hdr.b_refcnt, tag);
 	arc_loaned_bytes_update(arc_buf_size(buf));
@@ -3533,7 +3533,7 @@ arc_prune_async(int64_t adjust)
 		if (refcount_count(&ap->p_refcnt) >= 2)
 			continue;
 -		refcount_add(&ap->p_refcnt, ap->p_pfunc);
 +		zfs_refcount_add(&ap->p_refcnt, ap->p_pfunc);
 		ap->p_adjust = adjust;
 		if (taskq_dispatch(arc_prune_taskq, arc_prune_task,
 		    ap, TQ_SLEEP) == TASKQID_INVALID) {
@@ -5549,7 +5549,7 @@ arc_add_prune_callback(arc_prune_func_t *func, void *private)
 	refcount_create(&p->p_refcnt);
 	mutex_enter(&arc_prune_mtx);
 -	refcount_add(&p->p_refcnt, &arc_prune_list);
 +	zfs_refcount_add(&p->p_refcnt, &arc_prune_list);
 	list_insert_head(&arc_prune_list, p);
 	mutex_exit(&arc_prune_mtx);
@@ -5815,7 +5815,7 @@ arc_release(arc_buf_t *buf, void *tag)
 		nhdr->b_l1hdr.b_mfu_hits = 0;
 		nhdr->b_l1hdr.b_mfu_ghost_hits = 0;
 		nhdr->b_l1hdr.b_l2_hits = 0;
 -		(void) refcount_add(&nhdr->b_l1hdr.b_refcnt, tag);
 +		(void) zfs_refcount_add(&nhdr->b_l1hdr.b_refcnt, tag);
 		buf->b_hdr = nhdr;
 		mutex_exit(&buf->b_evict_lock);
 diff --git a/module/zfs/dbuf.c b/module/zfs/dbuf.c
 index 6edb39d6..5101c848 100644
 --- a/module/zfs/dbuf.c
 +++ b/module/zfs/dbuf.c
@@ -104,7 +104,7 @@ static boolean_t dbuf_evict_thread_exit;
  * become eligible for arc eviction.
  */
 static multilist_t *dbuf_cache;
 -static refcount_t dbuf_cache_size;
 +static zfs_refcount_t dbuf_cache_size;
 unsigned long  dbuf_cache_max_bytes = 100 * 1024 * 1024;
 /* Cap the size of the dbuf cache to log2 fraction of arc size. */
@@ -2384,7 +2384,7 @@ dbuf_create(dnode_t *dn, uint8_t level, uint64_t blkid,
 	ASSERT(dn->dn_object == DMU_META_DNODE_OBJECT ||
 	    refcount_count(&dn->dn_holds) > 0);
 -	(void) refcount_add(&dn->dn_holds, db);
 +	(void) zfs_refcount_add(&dn->dn_holds, db);
 	atomic_inc_32(&dn->dn_dbufs_count);
 	dprintf_dbuf(db, "db=%p\n", db);
@@ -2749,7 +2749,7 @@ __dbuf_hold_impl(struct dbuf_hold_impl_data *dh)
 		(void) refcount_remove_many(&dbuf_cache_size,
 		    dh->dh_db->db.db_size, dh->dh_db);
 	}
 -	(void) refcount_add(&dh->dh_db->db_holds, dh->dh_tag);
 +	(void) zfs_refcount_add(&dh->dh_db->db_holds, dh->dh_tag);
 	DBUF_VERIFY(dh->dh_db);
 	mutex_exit(&dh->dh_db->db_mtx);
@@ -2873,7 +2873,7 @@ dbuf_rm_spill(dnode_t *dn, dmu_tx_t *tx)
 void
 dbuf_add_ref(dmu_buf_impl_t *db, void *tag)
 {
 -	int64_t holds = refcount_add(&db->db_holds, tag);
 +	int64_t holds = zfs_refcount_add(&db->db_holds, tag);
 	VERIFY3S(holds, >, 1);
 }
@@ -2893,7 +2893,7 @@ dbuf_try_add_ref(dmu_buf_t *db_fake, objset_t *os, uint64_t obj, uint64_t blkid,
 	if (found_db != NULL) {
 		if (db == found_db && dbuf_refcount(db) > db->db_dirtycnt) {
 -			(void) refcount_add(&db->db_holds, tag);
 +			(void) zfs_refcount_add(&db->db_holds, tag);
 			result = B_TRUE;
 		}
 		mutex_exit(&found_db->db_mtx);
 diff --git a/module/zfs/dmu.c b/module/zfs/dmu.c
 index a09ac4f9..a76cdd9f 100644
 --- a/module/zfs/dmu.c
 +++ b/module/zfs/dmu.c
@@ -342,7 +342,7 @@ dmu_bonus_hold(objset_t *os, uint64_t object, void *tag, dmu_buf_t **dbp)
 	db = dn->dn_bonus;
 	/* as long as the bonus buf is held, the dnode will be held */
 -	if (refcount_add(&db->db_holds, tag) == 1) {
 +	if (zfs_refcount_add(&db->db_holds, tag) == 1) {
 		VERIFY(dnode_add_ref(dn, db));
 		atomic_inc_32(&dn->dn_dbufs_count);
 	}
 diff --git a/module/zfs/dmu_tx.c b/module/zfs/dmu_tx.c
 index 6ebff267..b1508ffa 100644
 --- a/module/zfs/dmu_tx.c
 +++ b/module/zfs/dmu_tx.c
@@ -114,7 +114,7 @@ dmu_tx_hold_dnode_impl(dmu_tx_t *tx, dnode_t *dn, enum dmu_tx_hold_type type,
 	dmu_tx_hold_t *txh;
 	if (dn != NULL) {
 -		(void) refcount_add(&dn->dn_holds, tx);
 +		(void) zfs_refcount_add(&dn->dn_holds, tx);
 		if (tx->tx_txg != 0) {
 			mutex_enter(&dn->dn_mtx);
 			/*
@@ -124,7 +124,7 @@ dmu_tx_hold_dnode_impl(dmu_tx_t *tx, dnode_t *dn, enum dmu_tx_hold_type type,
 			 */
 			ASSERT(dn->dn_assigned_txg == 0);
 			dn->dn_assigned_txg = tx->tx_txg;
 -			(void) refcount_add(&dn->dn_tx_holds, tx);
 +			(void) zfs_refcount_add(&dn->dn_tx_holds, tx);
 			mutex_exit(&dn->dn_mtx);
 		}
 	}
@@ -916,7 +916,7 @@ dmu_tx_try_assign(dmu_tx_t *tx, uint64_t txg_how)
 			if (dn->dn_assigned_txg == 0)
 				dn->dn_assigned_txg = tx->tx_txg;
 			ASSERT3U(dn->dn_assigned_txg, ==, tx->tx_txg);
 -			(void) refcount_add(&dn->dn_tx_holds, tx);
 +			(void) zfs_refcount_add(&dn->dn_tx_holds, tx);
 			mutex_exit(&dn->dn_mtx);
 		}
 		towrite += refcount_count(&txh->txh_space_towrite);
 diff --git a/module/zfs/dnode.c b/module/zfs/dnode.c
 index 4a169c49..77d38c36 100644
 --- a/module/zfs/dnode.c
 +++ b/module/zfs/dnode.c
@@ -1267,7 +1267,7 @@ dnode_hold_impl(objset_t *os, uint64_t object, int flag, int slots,
 		if ((flag & DNODE_MUST_BE_FREE) && type != DMU_OT_NONE)
 			return (SET_ERROR(EEXIST));
 		DNODE_VERIFY(dn);
 -		(void) refcount_add(&dn->dn_holds, tag);
 +		(void) zfs_refcount_add(&dn->dn_holds, tag);
 		*dnp = dn;
 		return (0);
 	}
@@ -1484,7 +1484,7 @@ dnode_hold_impl(objset_t *os, uint64_t object, int flag, int slots,
 		return (type == DMU_OT_NONE ? ENOENT : EEXIST);
 	}
 -	if (refcount_add(&dn->dn_holds, tag) == 1)
 +	if (zfs_refcount_add(&dn->dn_holds, tag) == 1)
 		dbuf_add_ref(db, dnh);
 	mutex_exit(&dn->dn_mtx);
@@ -1524,7 +1524,7 @@ dnode_add_ref(dnode_t *dn, void *tag)
 		mutex_exit(&dn->dn_mtx);
 		return (FALSE);
 	}
 -	VERIFY(1 < refcount_add(&dn->dn_holds, tag));
 +	VERIFY(1 < zfs_refcount_add(&dn->dn_holds, tag));
 	mutex_exit(&dn->dn_mtx);
 	return (TRUE);
 }
 diff --git a/module/zfs/dsl_dataset.c b/module/zfs/dsl_dataset.c
 index bd03b486..b7562bcd 100644
 --- a/module/zfs/dsl_dataset.c
 +++ b/module/zfs/dsl_dataset.c
@@ -645,7 +645,7 @@ void
 dsl_dataset_long_hold(dsl_dataset_t *ds, void *tag)
 {
 	ASSERT(dsl_pool_config_held(ds->ds_dir->dd_pool));
 -	(void) refcount_add(&ds->ds_longholds, tag);
 +	(void) zfs_refcount_add(&ds->ds_longholds, tag);
 }
 void
 diff --git a/module/zfs/metaslab.c b/module/zfs/metaslab.c
 index ee24850d..40658d51 100644
 --- a/module/zfs/metaslab.c
 +++ b/module/zfs/metaslab.c
@@ -2663,7 +2663,7 @@ metaslab_group_alloc_increment(spa_t *spa, uint64_t vdev, void *tag, int flags)
 	if (!mg->mg_class->mc_alloc_throttle_enabled)
 		return;
 -	(void) refcount_add(&mg->mg_alloc_queue_depth, tag);
 +	(void) zfs_refcount_add(&mg->mg_alloc_queue_depth, tag);
 }
 void
@@ -3360,7 +3360,7 @@ metaslab_class_throttle_reserve(metaslab_class_t *mc, int slots, zio_t *zio,
 		 * them individually when an I/O completes.
 		 */
 		for (d = 0; d < slots; d++) {
 -			reserved_slots = refcount_add(&mc->mc_alloc_slots, zio);
 +			reserved_slots = zfs_refcount_add(&mc->mc_alloc_slots, zio);
 		}
 		zio->io_flags |= ZIO_FLAG_IO_ALLOCATING;
 		slot_reserved = B_TRUE;
 diff --git a/module/zfs/refcount.c b/module/zfs/refcount.c
 index a151acea..13f9bb6b 100644
 --- a/module/zfs/refcount.c
 +++ b/module/zfs/refcount.c
@@ -55,7 +55,7 @@ refcount_fini(void)
 }
 void
 -refcount_create(refcount_t *rc)
 +refcount_create(zfs_refcount_t *rc)
 {
 	mutex_init(&rc->rc_mtx, NULL, MUTEX_DEFAULT, NULL);
 	list_create(&rc->rc_list, sizeof (reference_t),
@@ -68,21 +68,21 @@ refcount_create(refcount_t *rc)
 }
 void
 -refcount_create_tracked(refcount_t *rc)
 +refcount_create_tracked(zfs_refcount_t *rc)
 {
 	refcount_create(rc);
 	rc->rc_tracked = B_TRUE;
 }
 void
 -refcount_create_untracked(refcount_t *rc)
 +refcount_create_untracked(zfs_refcount_t *rc)
 {
 	refcount_create(rc);
 	rc->rc_tracked = B_FALSE;
 }
 void
 -refcount_destroy_many(refcount_t *rc, uint64_t number)
 +refcount_destroy_many(zfs_refcount_t *rc, uint64_t number)
 {
 	reference_t *ref;
@@ -103,25 +103,25 @@ refcount_destroy_many(refcount_t *rc, uint64_t number)
 }
 void
 -refcount_destroy(refcount_t *rc)
 +refcount_destroy(zfs_refcount_t *rc)
 {
 	refcount_destroy_many(rc, 0);
 }
 int
 -refcount_is_zero(refcount_t *rc)
 +refcount_is_zero(zfs_refcount_t *rc)
 {
 	return (rc->rc_count == 0);
 }
 int64_t
 -refcount_count(refcount_t *rc)
 +refcount_count(zfs_refcount_t *rc)
 {
 	return (rc->rc_count);
 }
 int64_t
 -refcount_add_many(refcount_t *rc, uint64_t number, void *holder)
 +refcount_add_many(zfs_refcount_t *rc, uint64_t number, void *holder)
 {
 	reference_t *ref = NULL;
 	int64_t count;
@@ -143,13 +143,13 @@ refcount_add_many(refcount_t *rc, uint64_t number, void *holder)
 }
 int64_t
 -zfs_refcount_add(refcount_t *rc, void *holder)
 +zfs_refcount_add(zfs_refcount_t *rc, void *holder)
 {
 	return (refcount_add_many(rc, 1, holder));
 }
 int64_t
 -refcount_remove_many(refcount_t *rc, uint64_t number, void *holder)
 +refcount_remove_many(zfs_refcount_t *rc, uint64_t number, void *holder)
 {
 	reference_t *ref;
 	int64_t count;
@@ -197,13 +197,13 @@ refcount_remove_many(refcount_t *rc, uint64_t number, void *holder)
 }
 int64_t
 -refcount_remove(refcount_t *rc, void *holder)
 +refcount_remove(zfs_refcount_t *rc, void *holder)
 {
 	return (refcount_remove_many(rc, 1, holder));
 }
 void
 -refcount_transfer(refcount_t *dst, refcount_t *src)
 +refcount_transfer(zfs_refcount_t *dst, zfs_refcount_t *src)
 {
 	int64_t count, removed_count;
 	list_t list, removed;
@@ -234,7 +234,7 @@ refcount_transfer(refcount_t *dst, refcount_t *src)
 }
 void
 -refcount_transfer_ownership(refcount_t *rc, void *current_holder,
 +refcount_transfer_ownership(zfs_refcount_t *rc, void *current_holder,
     void *new_holder)
 {
 	reference_t *ref;
@@ -264,7 +264,7 @@ refcount_transfer_ownership(refcount_t *rc, void *current_holder,
  * might be held.
  */
 boolean_t
 -refcount_held(refcount_t *rc, void *holder)
 +refcount_held(zfs_refcount_t *rc, void *holder)
 {
 	reference_t *ref;
@@ -292,7 +292,7 @@ refcount_held(refcount_t *rc, void *holder)
  * since the reference might not be held.
  */
 boolean_t
 -refcount_not_held(refcount_t *rc, void *holder)
 +refcount_not_held(zfs_refcount_t *rc, void *holder)
 {
 	reference_t *ref;
 diff --git a/module/zfs/rrwlock.c b/module/zfs/rrwlock.c
 index 704f7606..effff330 100644
 --- a/module/zfs/rrwlock.c
 +++ b/module/zfs/rrwlock.c
@@ -183,9 +183,9 @@ rrw_enter_read_impl(rrwlock_t *rrl, boolean_t prio, void *tag)
 	if (rrl->rr_writer_wanted || rrl->rr_track_all) {
 		/* may or may not be a re-entrant enter */
 		rrn_add(rrl, tag);
 -		(void) refcount_add(&rrl->rr_linked_rcount, tag);
 +		(void) zfs_refcount_add(&rrl->rr_linked_rcount, tag);
 	} else {
 -		(void) refcount_add(&rrl->rr_anon_rcount, tag);
 +		(void) zfs_refcount_add(&rrl->rr_anon_rcount, tag);
 	}
 	ASSERT(rrl->rr_writer == NULL);
 	mutex_exit(&rrl->rr_lock);
 diff --git a/module/zfs/sa.c b/module/zfs/sa.c
 index 1fb1a8b5..df4f6fd8 100644
 --- a/module/zfs/sa.c
 +++ b/module/zfs/sa.c
@@ -1337,7 +1337,7 @@ sa_idx_tab_hold(objset_t *os, sa_idx_tab_t *idx_tab)
 	ASSERTV(sa_os_t *sa = os->os_sa);
 	ASSERT(MUTEX_HELD(&sa->sa_lock));
 -	(void) refcount_add(&idx_tab->sa_refcount, NULL);
 +	(void) zfs_refcount_add(&idx_tab->sa_refcount, NULL);
 }
 void
 diff --git a/module/zfs/spa_misc.c b/module/zfs/spa_misc.c
 index cc1c641d..f6c9b40b 100644
 --- a/module/zfs/spa_misc.c
 +++ b/module/zfs/spa_misc.c
@@ -80,7 +80,7 @@
  *	definition they must have an existing reference, and will never need
  *	to lookup a spa_t by name.
  *
 - * spa_refcount (per-spa refcount_t protected by mutex)
 + * spa_refcount (per-spa zfs_refcount_t protected by mutex)
  *
  *	This reference count keep track of any active users of the spa_t.  The
  *	spa_t cannot be destroyed or freed while this is non-zero.  Internally,
@@ -414,7 +414,7 @@ spa_config_tryenter(spa_t *spa, int locks, void *tag, krw_t rw)
 			}
 			scl->scl_writer = curthread;
 		}
 -		(void) refcount_add(&scl->scl_count, tag);
 +		(void) zfs_refcount_add(&scl->scl_count, tag);
 		mutex_exit(&scl->scl_lock);
 	}
 	return (1);
@@ -448,7 +448,7 @@ spa_config_enter(spa_t *spa, int locks, void *tag, krw_t rw)
 			}
 			scl->scl_writer = curthread;
 		}
 -		(void) refcount_add(&scl->scl_count, tag);
 +		(void) zfs_refcount_add(&scl->scl_count, tag);
 		mutex_exit(&scl->scl_lock);
 	}
 	ASSERT(wlocks_held <= locks);
@@ -768,7 +768,7 @@ spa_open_ref(spa_t *spa, void *tag)
 {
 	ASSERT(refcount_count(&spa->spa_refcount) >= spa->spa_minref ||
 	    MUTEX_HELD(&spa_namespace_lock));
 -	(void) refcount_add(&spa->spa_refcount, tag);
 +	(void) zfs_refcount_add(&spa->spa_refcount, tag);
 }
 /*
 diff --git a/module/zfs/zfs_ctldir.c b/module/zfs/zfs_ctldir.c
 index 0ab5b4f0..de3c5a41 100644
 --- a/module/zfs/zfs_ctldir.c
 +++ b/module/zfs/zfs_ctldir.c
@@ -120,7 +120,7 @@ typedef struct {
 	taskqid_t	se_taskqid;	/* scheduled unmount taskqid */
 	avl_node_t	se_node_name;	/* zfs_snapshots_by_name link */
 	avl_node_t	se_node_objsetid; /* zfs_snapshots_by_objsetid link */
 -	refcount_t	se_refcount;	/* reference count */
 +	zfs_refcount_t	se_refcount;	/* reference count */
 } zfs_snapentry_t;
 static void zfsctl_snapshot_unmount_delay_impl(zfs_snapentry_t *se, int delay);
@@ -169,7 +169,7 @@ zfsctl_snapshot_free(zfs_snapentry_t *se)
 static void
 zfsctl_snapshot_hold(zfs_snapentry_t *se)
 {
 -	refcount_add(&se->se_refcount, NULL);
 +	zfs_refcount_add(&se->se_refcount, NULL);
 }
 /*
@@ -192,7 +192,7 @@ static void
 zfsctl_snapshot_add(zfs_snapentry_t *se)
 {
 	ASSERT(RW_WRITE_HELD(&zfs_snapshot_lock));
 -	refcount_add(&se->se_refcount, NULL);
 +	zfs_refcount_add(&se->se_refcount, NULL);
 	avl_add(&zfs_snapshots_by_name, se);
 	avl_add(&zfs_snapshots_by_objsetid, se);
 }
@@ -269,7 +269,7 @@ zfsctl_snapshot_find_by_name(char *snapname)
 	search.se_name = snapname;
 	se = avl_find(&zfs_snapshots_by_name, &search, NULL);
 	if (se)
 -		refcount_add(&se->se_refcount, NULL);
 +		zfs_refcount_add(&se->se_refcount, NULL);
 	return (se);
 }
@@ -290,7 +290,7 @@ zfsctl_snapshot_find_by_objsetid(spa_t *spa, uint64_t objsetid)
 	search.se_objsetid = objsetid;
 	se = avl_find(&zfs_snapshots_by_objsetid, &search, NULL);
 	if (se)
 -		refcount_add(&se->se_refcount, NULL);
 +		zfs_refcount_add(&se->se_refcount, NULL);
 	return (se);
 }
 diff --git a/module/zfs/zfs_znode.c b/module/zfs/zfs_znode.c
 index e222c791..0ca10f82 100644
 --- a/module/zfs/zfs_znode.c
 +++ b/module/zfs/zfs_znode.c
@@ -272,7 +272,7 @@ zfs_znode_hold_enter(zfsvfs_t *zfsvfs, uint64_t obj)
 		ASSERT3U(zh->zh_obj, ==, obj);
 		found = B_TRUE;
 	}
 -	refcount_add(&zh->zh_refcount, NULL);
 +	zfs_refcount_add(&zh->zh_refcount, NULL);
 	mutex_exit(&zfsvfs->z_hold_locks[i]);
 	if (found == B_TRUE)
@@ -1,29 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Brian Behlendorf <behlendorf1@llnl.gov>
 Date: Mon, 8 Oct 2018 14:59:34 -0700
 Subject: [PATCH] Fix arc_release() refcount
 Update arc_release to use arc_buf_size().  This hunk was accidentally
 dropped when porting compressed send/recv, 2aa34383b.
 Reviewed-by: Matthew Ahrens <mahrens@delphix.com>
 Signed-off-by: Tom Caputi <tcaputi@datto.com>
 Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Closes #8000
 ---
 module/zfs/arc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/module/zfs/arc.c b/module/zfs/arc.c
 index 32ac0837..a7fb2429 100644
 --- a/module/zfs/arc.c
 +++ b/module/zfs/arc.c
@@ -5831,7 +5831,7 @@ arc_release(arc_buf_t *buf, void *tag)
 		mutex_exit(&buf->b_evict_lock);
 		(void) zfs_refcount_add_many(&arc_anon->arcs_size,
 -		    HDR_GET_LSIZE(nhdr), buf);
 +		    arc_buf_size(buf), buf);
 	} else {
 		mutex_exit(&buf->b_evict_lock);
 		ASSERT(zfs_refcount_count(&hdr->b_l1hdr.b_refcnt) == 1);
@@ -1,59 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: George Melikov <mail@gmelikov.ru>
 Date: Wed, 24 Oct 2018 06:06:40 +0300
 Subject: [PATCH] Allow use of pool GUID as root pool
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 It's helpful if there are pools with same names,
 but you need to use only one of them.
 Main case is twin servers, meanwhile some software
 requires the same name of pools (e.g. Proxmox).
 Reviewed-by: Kash Pande <kash@tripleback.net>
 Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Signed-off-by: George Melikov <mail@gmelikov.ru>
 Signed-off-by: Igor ‘guardian’ Lidin of Moscow, Russia
 Closes #8052
 ---
 contrib/initramfs/scripts/zfs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
 diff --git a/contrib/initramfs/scripts/zfs b/contrib/initramfs/scripts/zfs
 index 86329e76..dacd71d2 100644
 --- a/contrib/initramfs/scripts/zfs
 +++ b/contrib/initramfs/scripts/zfs
@@ -193,7 +193,7 @@ import_pool()
 	# Verify that the pool isn't already imported
 	# Make as sure as we can to not require '-f' to import.
 -	"${ZPOOL}" status "$pool" > /dev/null 2>&1 && return 0
 +	"${ZPOOL}" get name,guid -o value -H 2>/dev/null | grep -Fxq "$pool" && return 0
 	# For backwards compatibility, make sure that ZPOOL_IMPORT_PATH is set
 	# to something we can use later with the real import(s). We want to
@@ -772,6 +772,7 @@ mountroot()
 	#	root=zfs:<pool>/<dataset>	(uses this for rpool - first part, without 'zfs:')
 	#
 	# Option <dataset> could also be <snapshot>
 +	# Option <pool> could also be <guid>
 	# ------------
 	# Support force option
@@ -889,6 +890,14 @@ mountroot()
 		/bin/sh
 	fi
 +	# In case the pool was specified as guid, resolve guid to name
 +	pool="$("${ZPOOL}" get name,guid -o name,value -H | \
 +	    awk -v pool="${ZFS_RPOOL}" '$2 == pool { print $1 }')"
 +	if [ -n "$pool" ]; then
 +		ZFS_BOOTFS="${pool}/${ZFS_BOOTFS#*/}"
 +		ZFS_RPOOL="${pool}"
 +	fi
 +
 	# Set elevator=noop on the root pool's vdevs' disks.  ZFS already
 	# does this for wholedisk vdevs (for all pools), so this is only
 	# important for partitions.
@@ -1,67 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Brian Behlendorf <behlendorf1@llnl.gov>
 Date: Mon, 14 May 2018 20:36:30 -0700
 Subject: [PATCH] ZTS: Update O_TMPFILE support check
 In CentOS 7.5 the kernel provided a compatibility wrapper to support
 O_TMPFILE.  This results in the test setup script correctly detecting
 kernel support.  But the ZFS module was built without O_TMPFILE
 support due to the non-standard CentOS kernel interface.
 Handle this case by updating the setup check to fail either when
 the kernel or the ZFS module fail to provide support.  The reason
 will be clearly logged in the test results.
 Reviewed-by: Chunwei Chen <tuxoko@gmail.com>
 Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Closes #7528
 ---
 tests/zfs-tests/tests/functional/tmpfile/setup.ksh      | 11 +++++++----
 tests/zfs-tests/tests/functional/tmpfile/tmpfile_test.c | 11 ++++++-----
 2 files changed, 13 insertions(+), 9 deletions(-)
 diff --git a/tests/zfs-tests/tests/functional/tmpfile/setup.ksh b/tests/zfs-tests/tests/functional/tmpfile/setup.ksh
 index 243a5b77..bc00a2a2 100755
 --- a/tests/zfs-tests/tests/functional/tmpfile/setup.ksh
 +++ b/tests/zfs-tests/tests/functional/tmpfile/setup.ksh
@@ -31,9 +31,12 @@
 . $STF_SUITE/include/libtest.shlib
 -if ! $STF_SUITE/tests/functional/tmpfile/tmpfile_test /tmp; then
 -	log_unsupported "The kernel doesn't support O_TMPFILE."
 +DISK=${DISKS%% *}
 +default_setup_noexit $DISK
 +
 +if ! $STF_SUITE/tests/functional/tmpfile/tmpfile_test $TESTDIR; then
 +	default_cleanup_noexit
 +	log_unsupported "The kernel/filesystem doesn't support O_TMPFILE"
 fi
 -DISK=${DISKS%% *}
 -default_setup $DISK
 +log_pass
 diff --git a/tests/zfs-tests/tests/functional/tmpfile/tmpfile_test.c b/tests/zfs-tests/tests/functional/tmpfile/tmpfile_test.c
 index 5fb67b47..91527ac5 100644
 --- a/tests/zfs-tests/tests/functional/tmpfile/tmpfile_test.c
 +++ b/tests/zfs-tests/tests/functional/tmpfile/tmpfile_test.c
@@ -36,13 +36,14 @@ main(int argc, char *argv[])
 	fd = open(argv[1], O_TMPFILE | O_WRONLY, 0666);
 	if (fd < 0) {
 -		/*
 -		 * Only fail on EISDIR. If we get EOPNOTSUPP, that means
 -		 * kernel support O_TMPFILE, but the path at argv[1] doesn't.
 -		 */
 		if (errno == EISDIR) {
 -			fprintf(stderr, "kernel doesn't support O_TMPFILE\n");
 +			fprintf(stderr,
 +			    "The kernel doesn't support O_TMPFILE\n");
 			return (1);
 +		} else if (errno == EOPNOTSUPP) {
 +			fprintf(stderr,
 +			    "The filesystem doesn't support O_TMPFILE\n");
 +			return (2);
 		}
 		perror("open");
 	} else {
@@ -1,35 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Brian Behlendorf <behlendorf1@llnl.gov>
 Date: Wed, 24 Oct 2018 23:26:08 -0700
 Subject: [PATCH] Fix flake8 "invalid escape sequence 'x'" warning
 From, https://lintlyci.github.io/Flake8Rules/rules/W605.html
 As of Python 3.6, a backslash-character pair that is not a valid
 escape sequence now generates a DeprecationWarning. Although this
 will eventually become a SyntaxError, that will not be for several
 Python releases.
 Note 'float_pobj' was simply removed from arcstat.py since it
 was entirely unused.
 Reviewed-by: John Kennedy <john.kennedy@delphix.com>
 Reviewed-by: Richard Elling <Richard.Elling@RichardElling.com>
 Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Closes #8056
 ---
 cmd/arcstat/arcstat.py | 1 -
 1 file changed, 1 deletion(-)
 diff --git a/cmd/arcstat/arcstat.py b/cmd/arcstat/arcstat.py
 index b52a8c29..d7d3e9b7 100755
 --- a/cmd/arcstat/arcstat.py
 +++ b/cmd/arcstat/arcstat.py
@@ -112,7 +112,6 @@ cur = {}
 d = {}
 out = None
 kstat = None
 -float_pobj = re.compile("^[0-9]+(\.[0-9]+)?$")
 def detailed_usage():
@@ -1,51 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tony Hutter <hutter2@llnl.gov>
 Date: Wed, 7 Nov 2018 15:48:24 -0800
 Subject: [PATCH] Add BuildRequires gcc, make, elfutils-libelf-devel
 This adds a BuildRequires for gcc, make, and elfutils-libelf-devel
 into our spec files.  gcc has been a packaging requirement for
 awhile now:
 https://fedoraproject.org/wiki/Packaging:C_and_C%2B%2B
 These additional BuildRequires allow us to mock build in
 Fedora 29.
 Reviewed-by: Neal Gompa <ngompa@datto.com>
 Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Signed-off-by:  Tony Hutter <hutter2@llnl.gov>
 Closes #8095
 Closes #8102
 ---
 rpm/generic/zfs-kmod.spec.in | 4 ++++
 rpm/generic/zfs.spec.in      | 1 +
 2 files changed, 5 insertions(+)
 diff --git a/rpm/generic/zfs-kmod.spec.in b/rpm/generic/zfs-kmod.spec.in
 index d4746f5b..ecf14ece 100644
 --- a/rpm/generic/zfs-kmod.spec.in
 +++ b/rpm/generic/zfs-kmod.spec.in
@@ -52,6 +52,10 @@ URL:            http://zfsonlinux.org/
 Source0:        %{module}-%{version}.tar.gz
 Source10:       kmodtool
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id} -u -n)
 +%if 0%{?rhel}%{?fedora}
 +BuildRequires:  gcc, make
 +BuildRequires:  elfutils-libelf-devel
 +%endif
 # The developments headers will conflict with the dkms packages.
 Conflicts:      %{module}-dkms
 diff --git a/rpm/generic/zfs.spec.in b/rpm/generic/zfs.spec.in
 index fa6f1571..c1b8f2c8 100644
 --- a/rpm/generic/zfs.spec.in
 +++ b/rpm/generic/zfs.spec.in
@@ -91,6 +91,7 @@ Provides:       %{name}-kmod-common = %{version}
 Conflicts:      zfs-fuse
 %if 0%{?rhel}%{?fedora}%{?suse_version}
 +BuildRequires:  gcc, make
 BuildRequires:  zlib-devel
 BuildRequires:  libuuid-devel
 BuildRequires:  libblkid-devel
@@ -1,55 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tony Hutter <hutter2@llnl.gov>
 Date: Thu, 8 Nov 2018 14:38:37 -0800
 Subject: [PATCH] Tag zfs-0.7.12
 META file and changelog updated.
 Signed-off-by: Tony Hutter <hutter2@llnl.gov>
 ---
 META                         | 2 +-
 rpm/generic/zfs-kmod.spec.in | 3 +++
 rpm/generic/zfs.spec.in      | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)
 diff --git a/META b/META
 index 4b0cdb9c..8631f885 100644
 --- a/META
 +++ b/META
@@ -1,7 +1,7 @@
 Meta:         1
 Name:         zfs
 Branch:       1.0
 -Version:      0.7.11
 +Version:      0.7.12
 Release:      1
 Release-Tags: relext
 License:      CDDL
 diff --git a/rpm/generic/zfs-kmod.spec.in b/rpm/generic/zfs-kmod.spec.in
 index ecf14ece..3b97e91d 100644
 --- a/rpm/generic/zfs-kmod.spec.in
 +++ b/rpm/generic/zfs-kmod.spec.in
@@ -195,6 +195,9 @@ chmod u+x ${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/*/extra/*/*/*
 rm -rf $RPM_BUILD_ROOT
 %changelog
 +* Thu Nov 08 2018 Tony Hutter <hutter2@llnl.gov> - 0.7.12-1
 +- Released 0.7.12-1, detailed release notes are available at:
 +- https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.7.12
 * Thu Sep 13 2018 Tony Hutter <hutter2@llnl.gov> - 0.7.11-1
 - Released 0.7.11-1, detailed release notes are available at:
 - https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.7.11
 diff --git a/rpm/generic/zfs.spec.in b/rpm/generic/zfs.spec.in
 index c1b8f2c8..f28793a8 100644
 --- a/rpm/generic/zfs.spec.in
 +++ b/rpm/generic/zfs.spec.in
@@ -372,6 +372,9 @@ systemctl --system daemon-reload >/dev/null || true
 %endif
 %changelog
 +* Thu Nov 08 2018 Tony Hutter <hutter2@llnl.gov> - 0.7.12-1
 +- Released 0.7.12-1, detailed release notes are available at:
 +- https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.7.12
 * Thu Sep 13 2018 Tony Hutter <hutter2@llnl.gov> - 0.7.11-1
 - Released 0.7.11-1, detailed release notes are available at:
 - https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.7.11
--- a/Show More
+++ b/Show More
		`@@ -0,0 +1,2 @@`
							`lib/*/security/pam_zfs_key.so`
							`usr/share/pam-configs/zfs_key`
		`@@ -0,0 +1,2 @@`
							`lib/@DEB_HOST_MULTIARCH@/libzfs.so.*`
							`lib/@DEB_HOST_MULTIARCH@/libzfs_core.so.*`
		`@@ -0,0 +1 @@`
							`lib/@DEB_HOST_MULTIARCH@/libzfsbootenv.so.*`
		`@@ -0,0 +1,2 @@`
							`package-name-doesnt-match-sonames`
							`extra-license-file usr/share/doc/libzfsbootenv1linux/LICENSE.gz`
		`@@ -0,0 +1,2 @@`
							`version=3`
							`https://zfsonlinux.org/ .*zfs-([\d\.]+)\.tar\.gz$`
		`@@ -0,0 +1,2 @@`
							`usr/lib/dracut`
							`usr/share/man/man7/dracut.zfs.7`
		`@@ -0,0 +1,2 @@`
							`../tree/zfs-initramfs/* /`
							`usr/share/initramfs-tools/*`
		`@@ -0,0 +1 @@`
							`executable-not-elf-or-script usr/share/initramfs-tools/scripts/zfs`