update make upload target

2017-03-10 09:36:44 +01:00
25 changed files with 556 additions and 2149 deletions
@@ -1,6 +0,0 @@
 [submodule "zfs-debian"]
 	path = zfs-debian
 	url = ../mirror_zfs-debian
 [submodule "spl-debian"]
 	path = spl-debian
 	url = ../mirror_spl-debian
@@ -1,23 +1,23 @@
-RELEASE=5.1
+RELEASE=4.1
 # source form https://github.com/zfsonlinux/
-ZFSVER=0.7.11
+ZFSVER=0.6.5.9
-ZFSPKGREL=pve2~bpo1
+ZFSPKGREL=pve15~bpo80
-SPLPKGREL=pve2~bpo1
+SPLPKGREL=pve8~bpo80
 ZFSPKGVER=${ZFSVER}-${ZFSPKGREL}
 SPLPKGVER=${ZFSVER}-${SPLPKGREL}
-SPLDIR=spl-build
+SPLDIR=pkg-spl
-SPLSRC=spl-debian
+SPLSRC=pkg-spl.tar.gz
-ZFSDIR=zfs-build
+ZFSDIR=pkg-zfs
-ZFSSRC=zfs-debian
+ZFSSRC=pkg-zfs.tar.gz
-SPL_DEB = 					\
+SPL_DEBS= 					\
 spl_${SPLPKGVER}_amd64.deb
-ZFS_DEB1= libnvpair1linux_${ZFSPKGVER}_amd64.deb
+ZFS_DEBS= 					\
-ZFS_DEB2= 					\
+libnvpair1linux_${ZFSPKGVER}_amd64.deb		\
 libuutil1linux_${ZFSPKGVER}_amd64.deb		\
 libzfs2linux_${ZFSPKGVER}_amd64.deb		\
 libzfslinux-dev_${ZFSPKGVER}_amd64.deb		\
@@ -25,30 +25,27 @@ libzpool2linux_${ZFSPKGVER}_amd64.deb		\
 zfs-dbg_${ZFSPKGVER}_amd64.deb			\
 zfs-zed_${ZFSPKGVER}_amd64.deb			\
 zfs-initramfs_${ZFSPKGVER}_all.deb		\
 zfs-test_${ZFSPKGVER}_amd64.deb		\
 zfsutils-linux_${ZFSPKGVER}_amd64.deb
 ZFS_DEBS= $(ZFS_DEB1) $(ZFS_DEB2)
-DEBS=${SPL_DEB} ${ZFS_DEBS}
+ZFS_TRANS_DEBS=					\
 libnvpair1_${ZFSPKGVER}_all.deb			\
 libuutil1_${ZFSPKGVER}_all.deb			\
 libzfs2_${ZFSPKGVER}_all.deb			\
 libzpool2_${ZFSPKGVER}_all.deb			\
 zfsutils_${ZFSPKGVER}_all.deb
-all: deb
+DEBS=${SPL_DEBS} ${ZFS_DEBS} ${ZFS_TRANS_DEBS}
-deb: ${DEBS}
+
 all: ${DEBS}
 .PHONY: dinstall
 dinstall: ${DEBS}
 	dpkg -i ${DEBS}
 .PHONY: submodule
 submodule:
 	test -f "${ZFSSRC}/debian/changelog" || git submodule update --init
 	test -f "${SPLSRC}/debian/changelog" || git submodule update --init
 .PHONY: spl
-spl: ${SPL_DEB}
+spl ${SPL_DEBS}: ${SPLSRC}
 ${SPL_DEB}: ${SPLSRC}
 	rm -rf ${SPLDIR}
-	mkdir ${SPLDIR}
+	tar xf ${SPLSRC}
 	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
@@ -57,12 +54,9 @@ ${SPL_DEB}: ${SPLSRC}
 	cd ${SPLDIR}; dpkg-buildpackage -b -uc -us 
 .PHONY: zfs
-zfs: $(ZFS_DEBS)
+zfs ${ZFS_DEBS} ${ZFS_TRANS_DEBS}: ${ZFSSRC}
 $(ZFS_DEB2): $(ZFS_DEB1)
 $(ZFS_DEB1): $(ZFSSRC)
 	rm -rf ${ZFSDIR}
-	mkdir ${ZFSDIR}
+	tar xf ${ZFSSRC}
 	cp -a ${ZFSSRC}/* ${ZFSDIR}/
 	mv ${ZFSDIR}/debian/changelog ${ZFSDIR}/debian/changelog.org
 	cat zfs-changelog.Debian ${ZFSDIR}/debian/changelog.org > ${ZFSDIR}/debian/changelog
 	cd ${ZFSDIR}; ln -s ../zfs-patches patches
@@ -70,9 +64,19 @@ $(ZFS_DEB1): $(ZFSSRC)
 	cd ${ZFSDIR}; rm -rf .pc ./patches
 	cd ${ZFSDIR}; dpkg-buildpackage -b -uc -us 
 .PHONY: download
 download:
 	rm -rf pkg-spl pkg-zfs ${SPLSRC} ${ZFSSRC}
 	# clone pkg-zfsonlinux/spl and checkout 0.6.5.9-1
 	git clone -b debian/0.6.5.9-1 git://anonscm.debian.org/pkg-zfsonlinux/spl.git pkg-spl
 	# clone pkg-zfsonlinux/zfs and checkout 0.6.5.9-2
 	git clone -b debian/0.6.5.9-2 git://anonscm.debian.org/pkg-zfsonlinux/zfs.git pkg-zfs
 	tar czf ${SPLSRC} pkg-spl
 	tar czf ${ZFSSRC} pkg-zfs
 .PHONY: clean
 clean: 	
-	rm -rf *~ *.deb *.changes *.buildinfo ${ZFSDIR} ${SPLDIR}
+	rm -rf *~ *.deb *.changes ${ZFSDIR} ${SPLDIR}
 .PHONY: distclean
 distclean: clean
@@ -80,4 +84,4 @@ distclean: clean
 .PHONY: upload
 upload: ${DEBS}
-	tar -cf - ${DEBS} | ssh repoman@repo.proxmox.com -- upload --product pve,pmg --dist stretch --arch amd64
+	tar -cf - ${DEBS} | ssh repoman@repo.proxmox.com -- upload --product pve --dist jessie
@@ -1,74 +1,3 @@
 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
@@ -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,4 +1,4 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From b750abda7a2b24c52a4fba505571a629223ad64e 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
@@ -7,51 +7,30 @@ 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 | 24 --------------------
- debian/control.in | 31 -------------------------
+ debian/rules      | 68 +------------------------------------------------------
- debian/rules      | 67 +------------------------------------------------------
+ 2 files changed, 1 insertion(+), 91 deletions(-)
 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
+index 52c1660..dc6ee96 100644
 --- a/debian/control.in
 +++ b/debian/control.in
-@@ -9,47 +9,16 @@ Build-Depends: autogen,
+@@ -8,40 +8,16 @@ Build-Depends: autogen,
                autotools-dev,
                debhelper (>= 9),
                dh-autoreconf,
 -               dkms (>> 2.2.0.2-1~),
                libtool
- Standards-Version: 4.1.2
+ Standards-Version: 3.9.8
 Homepage: http://www.zfsonlinux.org/
- Vcs-Git: https://salsa.debian.org/zfsonlinux-team/spl.git
+ Vcs-Git: git://anonscm.debian.org/pkg-zfsonlinux/spl.git
- Vcs-Browser: https://salsa.debian.org/zfsonlinux-team/spl
+ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-zfsonlinux/spl.git
 -Package: spl-dkms
 -Architecture: all
-Depends: dkms (>> 2.2.1.0),
+-Depends: dkms (>> 2.2.1.0), file, libc-dev, lsb-release, ${misc:Depends}
-         file,
+-Recommends: spl (>= ${source:Upstream-Version})
 -         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
@@ -79,23 +58,24 @@ index 0e6c3fc..c8fe170 100644
  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
+index b2fc86c..a474ca4 100755
 --- a/debian/rules
 +++ b/debian/rules
-@@ -14,11 +14,8 @@ ifndef KVERS
+@@ -14,12 +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)
+-PACKAGE=spl
 -pmodules = $(PACKAGE)-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
+ 	@cp debian/control.in debian/control
-@@ -44,69 +41,7 @@ override_dh_auto_install:
+@@ -45,69 +41,7 @@ override_dh_auto_install:
 	@# This creates the $(CURDIR)/$(NAME)-$(VERSION)/ tree.
 	$(MAKE) distdir
@@ -115,7 +95,7 @@ index 72ded49..5abeebb 100755
 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
+ 	cp debian/control.in debian/control
 -
 -# ------------
 -
@@ -165,3 +145,6 @@ index 72ded49..5abeebb 100755
 -	dh_md5sums -p${pmodules}
 -
 -	dh_builddeb -p${pmodules}
 -- 
 2.1.4
@@ -1,2 +1 @@
-0001-remove-DKMS-and-module-build.patch
+fix-control.patch
 0002-deadlock-between-mm_sem-and-tx-assign-in-zfs_write-a.patch
@@ -1,122 +1,3 @@
 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
@@ -0,0 +1,174 @@
 From b8f3b081a866fc3d529fb2e72c425ef54c4d141d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
 Date: Wed, 11 Jan 2017 09:16:11 +0100
 Subject: [PATCH 1/6] Undo python changes until PVE 5.0 release
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 Revert "Remove .py extension from utilities in /usr/sbin as per policy 10.4 Scripts  (LP: #1628279)"
 This reverts commit e1c956cc55451476c465aad351c4b9c92294fc36.
 Revert "Use python3 for arcstat.py, arc_summary.py & dbufstat.py (LP: #1627909)"
 This reverts commit a52a9356809b8a09b97957a238a36da82ce9f850.
 Revert "Add missing part in python3 move"
 This reverts commit 9173586640d4a9f64f87a70bb9f93e41c78009fc.
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 ---
 debian/control.in                              |  4 ++--
 debian/patches/1001-cmd-python-exec-path.patch | 30 --------------------------
 debian/control                                 |  4 ++--
 debian/patches/series                          |  1 -
 debian/rules                                   | 11 ++++------
 debian/zfsutils-linux.install                  |  6 +++---
 6 files changed, 11 insertions(+), 45 deletions(-)
 delete mode 100644 debian/patches/1001-cmd-python-exec-path.patch
 diff --git a/debian/control.in b/debian/control.in
 index 76907e4..db75496 100644
 --- a/debian/control.in
 +++ b/debian/control.in
@@ -16,7 +16,7 @@ Build-Depends: dh-autoreconf,
                po-debconf,
                uuid-dev,
                zlib1g-dev,
 -               python3,
 +               python,
                dh-python,
                libblkid-dev,
                libattr1-dev
@@ -127,7 +127,7 @@ Description: OpenZFS root filesystem capabilities for Linux - dracut
 Package: zfsutils-linux
 Section: contrib/admin
 Architecture: linux-any
 -Depends: ${misc:Depends}, ${shlibs:Depends}, ${python3:Depends}, python3
 +Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}
 Recommends: lsb-base, zfs-modules | zfs-dkms, zfs-zed
 Suggests: nfs-kernel-server, samba-common-bin (>= 3.0.23), zfs-initramfs | zfs-dracut
 Conflicts: zfs, zfs-fuse, zutils
 diff --git a/debian/patches/1001-cmd-python-exec-path.patch b/debian/patches/1001-cmd-python-exec-path.patch
 deleted file mode 100644
 index a05afb4..0000000
 --- a/debian/patches/1001-cmd-python-exec-path.patch
 +++ /dev/null
@@ -1,30 +0,0 @@
 -Index: zfs-linux-0.6.5.8/cmd/arc_summary/arc_summary.py
 -===================================================================
 ---- zfs-linux-0.6.5.8.orig/cmd/arc_summary/arc_summary.py
 -+++ zfs-linux-0.6.5.8/cmd/arc_summary/arc_summary.py
 -@@ -1,4 +1,4 @@
 --#!/usr/bin/python
 -+#!/usr/bin/python3
 - #
 - # $Id: arc_summary.pl,v 388:e27800740aa2 2011-07-08 02:53:29Z jhell $
 - #
 -Index: zfs-linux-0.6.5.8/cmd/arcstat/arcstat.py
 -===================================================================
 ---- zfs-linux-0.6.5.8.orig/cmd/arcstat/arcstat.py
 -+++ zfs-linux-0.6.5.8/cmd/arcstat/arcstat.py
 -@@ -1,4 +1,4 @@
 --#!/usr/bin/python
 -+#!/usr/bin/python3
 - #
 - # Print out ZFS ARC Statistics exported via kstat(1)
 - # For a definition of fields, or usage, use arctstat.pl -v
 -Index: zfs-linux-0.6.5.8/cmd/dbufstat/dbufstat.py
 -===================================================================
 ---- zfs-linux-0.6.5.8.orig/cmd/dbufstat/dbufstat.py
 -+++ zfs-linux-0.6.5.8/cmd/dbufstat/dbufstat.py
 -@@ -1,4 +1,4 @@
 --#!/usr/bin/python
 -+#!/usr/bin/python3
 - #
 - # Print out statistics for all cached dmu buffers.  This information
 - # is available through the dbufs kstat and may be post-processed as
 diff --git a/debian/control b/debian/control
 index 76907e4..db75496 100644
 --- a/debian/control
 +++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends: dh-autoreconf,
                po-debconf,
                uuid-dev,
                zlib1g-dev,
 -               python3,
 +               python,
                dh-python,
                libblkid-dev,
                libattr1-dev
@@ -127,7 +127,7 @@ Description: OpenZFS root filesystem capabilities for Linux - dracut
 Package: zfsutils-linux
 Section: contrib/admin
 Architecture: linux-any
 -Depends: ${misc:Depends}, ${shlibs:Depends}, ${python3:Depends}, python3
 +Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}
 Recommends: lsb-base, zfs-modules | zfs-dkms, zfs-zed
 Suggests: nfs-kernel-server, samba-common-bin (>= 3.0.23), zfs-initramfs | zfs-dracut
 Conflicts: zfs, zfs-fuse, zutils
 diff --git a/debian/patches/series b/debian/patches/series
 index df85d5b..0fed690 100644
 --- a/debian/patches/series
 +++ b/debian/patches/series
@@ -4,7 +4,6 @@
 1000-ppc64el-endian-support.patch
 1002-fix-mips-build.patch
 enable-zed.patch
 -1001-cmd-python-exec-path.patch
 1004-zed-service-bindir.patch
 1002-Fix-dev-zfs-device-is-missing.patch
 0001-fix-booting-via-dracut-generated-initramfs.patch
 diff --git a/debian/rules b/debian/rules
 index 9efbace..70e57e5 100755
 --- a/debian/rules
 +++ b/debian/rules
@@ -35,7 +35,7 @@ pmodules = $(PACKAGE)-modules-$(non_epoch_version)
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 %:
 -	dh $@ --with autoreconf,dkms,python3,systemd --parallel
 +	dh $@ --with autoreconf,dkms,python2,systemd --parallel
 override_dh_auto_configure:
 	@cp debian/control.in debian/control
@@ -64,14 +64,11 @@ override_dh_auto_install:
 	@# Install the utilities.
 	$(MAKE) install DESTDIR='$(CURDIR)/debian/tmp'
 - 
 	# 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.py' '$(CURDIR)/debian/tmp/usr/sbin/arc_summary'
 -	mv '$(CURDIR)/debian/tmp/usr/bin/arcstat.py' '$(CURDIR)/debian/tmp/usr/sbin/arcstat'
 -	mv '$(CURDIR)/debian/tmp/usr/bin/dbufstat.py' '$(CURDIR)/debian/tmp/usr/sbin/dbufstat'
 +	mv '$(CURDIR)/debian/tmp/usr/bin/arc_summary.py' '$(CURDIR)/debian/tmp/usr/sbin/arc_summary.py'
 +	mv '$(CURDIR)/debian/tmp/usr/bin/arcstat.py' '$(CURDIR)/debian/tmp/usr/sbin/arcstat.py'
 +	mv '$(CURDIR)/debian/tmp/usr/bin/dbufstat.py' '$(CURDIR)/debian/tmp/usr/sbin/dbufstat.py'
 	@# Zed has dependencies outside of the system root.
 	$(INSTALL) -d '$(CURDIR)/debian/tmp/usr/sbin/'
 diff --git a/debian/zfsutils-linux.install b/debian/zfsutils-linux.install
 index 947ffd9..4badbf1 100644
 --- a/debian/zfsutils-linux.install
 +++ b/debian/zfsutils-linux.install
@@ -19,9 +19,9 @@ sbin/zdb
 sbin/zpios
 sbin/zpool
 sbin/zfs
 -usr/sbin/arc_summary
 -usr/sbin/arcstat
 -usr/sbin/dbufstat
 +usr/sbin/arc_summary.py
 +usr/sbin/arcstat.py
 +usr/sbin/dbufstat.py
 usr/share/zfs/
 usr/share/man/man1/
 usr/share/man/man5/
 -- 
 2.1.4
@@ -1,54 +1,38 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From 0e7871b8878f78fd2c8c73a50cbf805b39afb4e7 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
+Subject: [PATCH 2/6] 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 |  34 +++---------------
- debian/control.in    |  40 ++-----------------
+ debian/rules      | 105 ++----------------------------------------------------
- debian/not-installed |   2 +
+ 2 files changed, 6 insertions(+), 133 deletions(-)
 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
+index db75496..22dd958 100644
 --- a/debian/control.in
 +++ b/debian/control.in
-@@ -10,7 +10,6 @@ Build-Depends: autotools-dev,
+@@ -9,7 +9,6 @@ Build-Depends: dh-autoreconf,
-                debhelper (>= 10.2),
+                dh-systemd,
-                dh-autoreconf,
+                autotools-dev,
-                dh-python,
+                debhelper (>= 9),
 -               dkms (>> 2.1.1.2-5),
                libattr1-dev,
                libblkid-dev,
                libselinux1-dev,
-@@ -95,26 +94,10 @@ Description: OpenZFS pool library for Linux
+                libtool,
                lsb-release,
@@ -85,25 +84,11 @@ 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}.),
+-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@
+-Recommends: zfsutils-linux, zfs-zed
 -Provides: zfs-modules
 -Description: OpenZFS filesystem kernel modules for Linux
 - The Z file system is a pooled filesystem designed for maximum data
@@ -60,22 +44,20 @@ index 96154c5c..0a9ceef6 100644
 -
 Package: zfs-initramfs
 Architecture: all
- Depends: busybox-initramfs | busybox-static | busybox,
+ Depends: initramfs-tools,
-          initramfs-tools,
+  busybox-initramfs | busybox-static | busybox,
-         zfs-modules | zfs-dkms,
+- zfs-modules | zfs-dkms, zfsutils-linux,
-          zfsutils-linux (>= ${binary:Version}),
+ zfsutils-linux,
-          ${misc:Depends}
+  ${misc:Depends}
 Description: OpenZFS root filesystem capabilities for Linux - initramfs
-@@ -125,29 +108,14 @@ Description: OpenZFS root filesystem capabilities for Linux - initramfs
+  The Z file system is a pooled filesystem designed for maximum data
@@ -113,23 +98,12 @@ 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,
+-Depends: dracut, zfs-modules | zfs-dkms, zfsutils-linux, ${misc:Depends}
 -         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
@@ -87,52 +69,30 @@ index 96154c5c..0a9ceef6 100644
 Package: zfsutils-linux
 Section: contrib/admin
 Architecture: linux-any
- Depends: python3, ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}
+ Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}
 -Recommends: lsb-base, zfs-modules | zfs-dkms, zfs-zed
-Breaks: zfs-dkms (<< ${binary:Version}), zfs-dkms (>> ${binary:Version})
+-Suggests: nfs-kernel-server, samba-common-bin (>= 3.0.23), zfs-initramfs | zfs-dracut
 +Recommends: lsb-base, zfs-zed
- Suggests: nfs-kernel-server,
+Suggests: nfs-kernel-server, samba-common-bin (>= 3.0.23), zfs-initramfs
-           samba-common-bin (>= 3.0.23),
+ Conflicts: zfs, zfs-fuse, zutils
 -          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
+@@ -143,7 +117,7 @@ Description: command-line tools to manage OpenZFS filesystems
 Package: zfs-zed
 Section: contrib/admin
 Architecture: linux-any
-Depends: zfs-modules | zfs-dkms,
+-Depends: ${misc:Depends}, ${shlibs:Depends}, zfs-modules | zfs-dkms, zfsutils-linux
-         zfsutils-linux (>= ${binary:Version}),
+Depends: ${misc:Depends}, ${shlibs:Depends}, zfsutils-linux
 +Depends: zfsutils-linux (>= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Description: OpenZFS Event Daemon
-@@ -185,7 +152,6 @@ Depends: acl,
+  The Z file system is a pooled filesystem designed for maximum data
-          python,
+  integrity, supporting data snapshots, multiple copies, and data
          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
+index 70e57e5..0c8a6a2 100755
 --- a/debian/rules
 +++ b/debian/rules
-@@ -6,9 +6,6 @@ LSB_DISTRIBUTOR := $(shell lsb_release -is)
+@@ -5,9 +5,6 @@ NAME := $(shell awk '$$1 == "Name:" { print $$2; }' META)
- NAME := $(shell awk '$$1 == "Name:" { print $$2; }' META)
+ VERSION := $(shell dpkg-parsechangelog \
- LINUX_NEXT := $(shell awk -F. '{print $$1 "." $$2+1}' debian/linux_compat)
+   | awk '$$1 == "Version:" { print $$2; }' | cut -d- -f1)
 -DKMSFILES := module include config zfs.release.in autogen.sh META AUTHORS \
 -		DISCLAIMER COPYRIGHT OPENSOLARIS.LICENSE README.markdown
@@ -140,16 +100,16 @@ index 21b8ccef..3ba4b99a 100755
 ifndef BUILD_UDEB
 BUILD_UDEB=false
 endif
-@@ -18,21 +15,16 @@ KVERS=$(shell uname -r)
+@@ -21,21 +18,16 @@ KVERS=$(shell uname -r)
 endif
 ifndef SPL
-SPL=/usr/src/spl-$(DEB_VERSION_UPSTREAM)
+-SPL=/usr/src/spl-$(VERSION)
 -endif
 -
 -ifndef SPLOBJ
-SPLOBJ=/var/lib/dkms/spl/$(DEB_VERSION_UPSTREAM)/$(KVERS)/$(DEB_TARGET_GNU_CPU)
+-SPLOBJ=/var/lib/dkms/spl/$(VERSION)/$(KVERS)/$(shell dpkg-architecture -qDEB_TARGET_GNU_CPU)
-+SPL=../spl-build
+SPL=../pkg-spl
 endif
 non_epoch_version=$(shell echo $(KVERS) | perl -pe 's/^\d+://')
@@ -159,69 +119,59 @@ index 21b8ccef..3ba4b99a 100755
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 %:
-	dh $@ --with autoreconf,dkms,python3,systemd --parallel
+-	dh $@ --with autoreconf,dkms,python2,systemd --parallel
-+	dh $@ --with autoreconf,python3,systemd --parallel
+	dh $@ --with autoreconf,python2,systemd --parallel
- override_dh_autoreconf:
+ override_dh_auto_configure:
- 	@# Embed the downstream version in the module.
+ 	@cp debian/control.in debian/control
-@@ -57,14 +49,6 @@ endif
+@@ -74,36 +66,6 @@ override_dh_auto_install:
- 	  --with-systemdpresetdir=/lib/systemd/system-preset \
+ 	$(INSTALL) -d '$(CURDIR)/debian/tmp/usr/sbin/'
- 	  --with-config=user
+ 	mv '$(CURDIR)/debian/tmp/sbin/zed' '$(CURDIR)/debian/tmp/usr/sbin/zed'
 -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
+-	@# This creates the $(CURDIR)/$(NAME)-$(VERSION)/ 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' \
+-	mkdir -p '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)'
-		'$(CURDIR)/scripts/enum-extract.pl' \
+-	$(foreach file,$(DKMSFILES),mv '$(CURDIR)/$(NAME)-$(VERSION)/$(file)' '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)' || exit 1;)
 -		'$(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'
+-		'$(CURDIR)/$(NAME)-$(VERSION)/configure.ac' > '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/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'
+-		'$(CURDIR)/$(NAME)-$(VERSION)/Makefile.am' > '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/Makefile.am'
 -	@# Sanity test
-	grep -q 'SUBDIRS = module include' '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/Makefile.am'
+-	grep -q 'SUBDIRS = module include' '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/Makefile.am'
 -	@# Run autogen on the stripped source tree
-	cd '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)'; ./autogen.sh
+-	cd '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)'; ./autogen.sh
-	rm -fr '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/autom4te.cache'
+-	rm -fr '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/autom4te.cache'
 -
 -	@# This shunt allows DKMS to install the Module.symvers and zfs_config.h
 -	@# files to the ${dkms_tree} area through the POST_INSTALL directive.
 -	printf '#!/bin/sh\ncp "$$@"\n' > '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/cp'
 -	chmod 755 '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/cp'
 -
 	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:
+@@ -113,9 +75,6 @@ override_dh_auto_install:
- 	chmod a-x '$(CURDIR)/debian/tmp/etc/default/zfs'
+ 	chmod a-x $(CURDIR)/debian/tmp/etc/zfs/zfs-functions
- 	chmod a-x '$(CURDIR)/debian/tmp/usr/share/bash-completion/completions/zfs'
+ 	chmod a-x $(CURDIR)/debian/tmp/etc/default/zfs
 -override_dh_dkms:
-	'$(CURDIR)/scripts/dkms.mkconf' -n $(NAME) -v $(DEB_VERSION_UPSTREAM) -f '$(CURDIR)/scripts/zfs-dkms.dkms'
+-	dh_dkms -V $(VERSION)
 -	dh_dkms
 -	rm -f '$(CURDIR)/scripts/zfs-dkms.dkms'
 -
 override_dh_makeshlibs:
- 	dh_makeshlibs -a -V
+ 	dh_makeshlibs -a
 ifeq ($(BUILD_UDEB), true)
-@@ -171,65 +127,5 @@ override_dh_installinit:
+@@ -153,65 +112,5 @@ override_dh_install:
 # ------------
@@ -287,3 +237,6 @@ index 21b8ccef..3ba4b99a 100755
 -
 debian-copyright:
 	cme update dpkg-copyright -file debian/copyright.cme
 -- 
 2.1.4
@@ -0,0 +1,68 @@
 From 7e46d0f379706d74d5dc05ff20e58e708a1005a6 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
 Date: Wed, 12 Oct 2016 11:32:17 +0200
 Subject: [PATCH 3/6] add zfsutils.preinst/postinst for wheezy upgrade path
 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>
 ---
 debian/zfsutils-linux.postinst | 20 ++++++++++++++++++++
 debian/zfsutils-linux.preinst  | 17 +++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100755 debian/zfsutils-linux.postinst
 create mode 100755 debian/zfsutils-linux.preinst
 diff --git a/debian/zfsutils-linux.postinst b/debian/zfsutils-linux.postinst
 new file mode 100755
 index 0000000..7d57919
 --- /dev/null
 +++ b/debian/zfsutils-linux.postinst
@@ -0,0 +1,20 @@
 +#!/bin/sh
 +
 +set -e
 +
 +# Source debconf library
 +. /usr/share/debconf/confmodule
 +
 +if dpkg-maintscript-helper supports rm_conffile 2>/dev/null
 +then
 +	dpkg-maintscript-helper rm_conffile /etc/default/zfsload -- "$@"
 +	dpkg-maintscript-helper rm_conffile /etc/init.d/zfs -- "$@"
 +	dpkg-maintscript-helper rm_conffile /etc/init.d/zed -- "$@"
 +	dpkg-maintscript-helper rm_conffile /etc/init.d/zfs-zed -- "$@"
 +	dpkg-maintscript-helper rm_conffile /etc/init.d/zfs-mount -- "$@"
 +	dpkg-maintscript-helper rm_conffile /etc/init.d/zfs-share -- "$@"
 +	dpkg-maintscript-helper rm_conffile /etc/init.d/zfs-import -- "$@"
 +fi
 +
 +#DEBHELPER#
 +
 diff --git a/debian/zfsutils-linux.preinst b/debian/zfsutils-linux.preinst
 new file mode 100755
 index 0000000..9338a7c
 --- /dev/null
 +++ b/debian/zfsutils-linux.preinst
@@ -0,0 +1,17 @@
 +#!/bin/sh
 +
 +set -e
 +
 +if dpkg-maintscript-helper supports rm_conffile 2>/dev/null
 +then
 +	dpkg-maintscript-helper rm_conffile /etc/default/zfsload -- "$@"
 +	dpkg-maintscript-helper rm_conffile /etc/init.d/zfs -- "$@"
 +	dpkg-maintscript-helper rm_conffile /etc/init.d/zed -- "$@"
 +	dpkg-maintscript-helper rm_conffile /etc/init.d/zfs-zed -- "$@"
 +	dpkg-maintscript-helper rm_conffile /etc/init.d/zfs-mount -- "$@"
 +	dpkg-maintscript-helper rm_conffile /etc/init.d/zfs-share -- "$@"
 +	dpkg-maintscript-helper rm_conffile /etc/init.d/zfs-import -- "$@"
 +fi
 +
 +#DEBHELPER#
 +
 -- 
 2.1.4
@@ -1,28 +0,0 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
 Date: Fri, 19 Jan 2018 12:13:46 +0100
 Subject: [PATCH] always load ZFS module on boot
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 since zfs-import-scan.service is disabled by default, and
 zfs-import-cache.service only gets started if a cache file exists, this
 is needed for zfs-mount, zfs-share and zfs-zed services in case ZFS is
 not actually used.
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 ---
 etc/modules-load.d/zfs.conf.in | 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
 index 8b41baa3..59b058c9 100644
 --- a/etc/modules-load.d/zfs.conf.in
 +++ b/etc/modules-load.d/zfs.conf.in
@@ -1,3 +1,3 @@
 # Always load kernel modules at boot.  The default behavior is to load the
 # kernel modules in the zfs-import-*.service or when blkid(8) detects a pool.
 -#zfs
 +zfs
@@ -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;
@@ -0,0 +1,141 @@
 From 97a0ced45e12cd4cca627392f2d9eea6963ee00e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
 Date: Wed, 12 Oct 2016 13:16:03 +0200
 Subject: [PATCH 4/6] ensure upgrade path from existing PVE ZFS packages
 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>
 ---
 debian/control.in | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 58 insertions(+), 1 deletion(-)
 diff --git a/debian/control.in b/debian/control.in
 index 22dd958..2bee2bf 100644
 --- a/debian/control.in
 +++ b/debian/control.in
@@ -28,6 +28,8 @@ Package: libnvpair1linux
 Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 +Replaces: libnvpair1 (<< 0.6.5.8-pve11~bpo80)
 +Breaks: libnvpair1 (<< 0.6.5.8-pve11~bpo80)
 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
@@ -37,6 +39,8 @@ Package: libuutil1linux
 Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 +Replaces: libuutil1 (<< 0.6.5.8-pve11~bpo80)
 +Breaks: libuutil1 (<< 0.6.5.8-pve11~bpo80)
 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
@@ -54,6 +58,8 @@ Architecture: linux-any
 Depends: libzfs2linux (= ${binary:Version}), libzpool2linux (= ${binary:Version}),
  libnvpair1linux (= ${binary:Version}), libuutil1linux (= ${binary:Version}),
  ${misc:Depends}
 +Replaces: libzfs-dev (<< 0.6.5.8-pve11~bpo80)
 +Breaks: libzfs-dev (<< 0.6.5.8-pve11~bpo80)
 Provides: libnvpair-dev, libuutil-dev
 Description: OpenZFS filesystem development files for Linux
  Header files and static libraries for compiling software against
@@ -66,6 +72,8 @@ Package: libzfs2linux
 Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 +Replaces: libzfs2 (<< 0.6.5.8-pve11~bpo80)
 +Breaks: libzfs2 (<< 0.6.5.8-pve11~bpo80)
 Description: OpenZFS filesystem library for Linux
  The Z file system is a pooled filesystem designed for maximum data
  integrity, supporting data snapshots, multiple copies, and data
@@ -77,6 +85,8 @@ Package: libzpool2linux
 Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 +Replaces: libzpool2 (<< 0.6.5.8-pve11~bpo80)
 +Breaks: libzpool2 (<< 0.6.5.8-pve11~bpo80)
 Description: OpenZFS pool library for Linux
  The Z file system is a pooled filesystem designed for maximum data
  integrity, supporting data snapshots, multiple copies, and data
@@ -88,8 +98,10 @@ Package: zfs-initramfs
 Architecture: all
 Depends: initramfs-tools,
  busybox-initramfs | busybox-static | busybox,
 - zfsutils-linux,
 + zfsutils-linux (>= 0.6.5.8-pve11~bpo80),
  ${misc:Depends}
 +Breaks: zfs-initramfs (<< 0.6.5.8-pve11~bpo80)
 +Replaces: zfs-initramfs (<< 0.6.5.8-pve11~bpo80)
 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
@@ -104,7 +116,9 @@ Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}
 Recommends: lsb-base, zfs-zed
 Suggests: nfs-kernel-server, samba-common-bin (>= 3.0.23), zfs-initramfs
 +Replaces: zfsutils (<< 0.6.5.8-pve11~bpo80)
 Conflicts: zfs, zfs-fuse, zutils
 +Breaks: zfsutils (<< 0.6.5.8-pve11~bpo80)
 Provides: zfsutils
 Description: command-line tools to manage OpenZFS filesystems
  The Z file system is a pooled filesystem designed for maximum data
@@ -118,6 +132,7 @@ Package: zfs-zed
 Section: contrib/admin
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}, zfsutils-linux
 +Replaces: zfsutils (<< 0.6.5.8-pve11~bpo80)
 Description: OpenZFS Event Daemon
  The Z file system is a pooled filesystem designed for maximum data
  integrity, supporting data snapshots, multiple copies, and data
@@ -142,3 +157,45 @@ Description: Debugging symbols for OpenZFS userland libraries and tools
  .
  This package contains the debugging symbols for libzpool2linux, libzfs2linux,
  libnvpair1linux, libuutil1linux, zfs-zed and zfsutils-linux.
 +
 +# Transitional packages
 +
 +Package: libzfs2
 +Depends: libzfs2linux, ${misc:Depends}
 +Architecture: all
 +Priority: extra
 +Section: oldlibs
 +Description: transitional package
 + This is a transitional package. It can safely be removed.
 +
 +Package: libzpool2
 +Depends: libzpool2linux, ${misc:Depends}
 +Architecture: all
 +Priority: extra
 +Section: oldlibs
 +Description: transitional package
 + This is a transitional package. It can safely be removed.
 +
 +Package: libnvpair1
 +Depends: libnvpair1linux, ${misc:Depends}
 +Architecture: all
 +Priority: extra
 +Section: oldlibs
 +Description: transitional package
 + This is a transitional package. It can safely be removed.
 +
 +Package: libuutil1
 +Depends: libuutil1linux, ${misc:Depends}
 +Architecture: all
 +Priority: extra
 +Section: oldlibs
 +Description: transitional package
 + This is a transitional package. It can safely be removed.
 +
 +Package: zfsutils
 +Depends: zfsutils-linux, ${misc:Depends}
 +Architecture: all
 +Priority: extra
 +Section: oldlibs
 +Description: transitional package
 + This is a transitional package. It can safely be removed.
 -- 
 2.1.4
@@ -1,256 +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>
 Requires-spl: spl-0.7-release
 Issue #7147
 Issue #7388
 Issue #7997
 (cherry-picked from behlendorf/issue-7997 4764f6f3be90be073d2700653dff286371e52583)
 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 ---
 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,27 +1,29 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From 9a97a884f8a409395e00891afdc28fa92b9f79b3 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
 Date: Mon, 24 Oct 2016 13:47:06 +0200
-Subject: [PATCH] import with -d /dev/disk/by-id in scan service
+Subject: [PATCH 5/6] import with -d /dev/disk/by-id in scan service
 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>
 ---
 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 0105283..665b9c8 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
+@@ -10,7 +10,7 @@ ConditionPathExists=!@sysconfdir@/zfs/zpool.cache
 Type=oneshot
 RemainAfterExit=yes
- ExecStartPre=-/sbin/modprobe zfs
+ ExecStartPre=/sbin/modprobe zfs
 -ExecStart=@sbindir@/zpool import -aN -o cachefile=none
 +ExecStart=@sbindir@/zpool import -aN -d /dev/disk/by-id -o cachefile=none
 [Install]
- WantedBy=zfs-import.target
+ WantedBy=zfs-mount.service
 -- 
 2.1.4
@@ -1,861 +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
 Requires-spl: spl-0.7-release
 Closes #7736
 (cherry-picked from behlendorf/issue-7736 496657ab3bcfeb638b1786e1759980ccfcacb08e)
 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 ---
 include/sys/zio.h |   4 +-
 module/zfs/zio.c  | 250 +++++++++++++++++++++++++++++-------------------------
 2 files changed, 137 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..b08b4747 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,7 @@ zio_free_bp_init(zio_t *zio)
 			zio->io_pipeline = ZIO_DDT_FREE_PIPELINE;
 	}
 -	return (ZIO_PIPELINE_CONTINUE);
 +	return (zio);
 }
 /*
@@ -1541,12 +1559,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 +1705,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 +1753,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 +2236,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 +2248,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 +2271,7 @@ zio_gang_issue(zio_t *zio)
 	zio->io_pipeline = ZIO_INTERLOCK_PIPELINE;
 -	return (ZIO_PIPELINE_CONTINUE);
 +	return (zio);
 }
 static void
@@ -2290,7 +2311,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 +2370,7 @@ zio_write_gang_block(zio_t *pio)
 		}
 		pio->io_error = error;
 -		return (ZIO_PIPELINE_CONTINUE);
 +		return (pio);
 	}
 	if (pio == gio) {
@@ -2423,7 +2444,7 @@ zio_write_gang_block(zio_t *pio)
 	zio_nowait(zio);
 -	return (ZIO_PIPELINE_CONTINUE);
 +	return (pio);
 }
 /*
@@ -2444,7 +2465,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 +2492,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 +2512,7 @@ zio_nop_write(zio_t *zio)
 		zio->io_flags |= ZIO_FLAG_NOPWRITE;
 	}
 -	return (ZIO_PIPELINE_CONTINUE);
 +	return (zio);
 }
 /*
@@ -2519,7 +2540,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 +2561,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 +2574,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 +2602,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 +2620,7 @@ zio_ddt_read_done(zio_t *zio)
 	ASSERT(zio->io_vsd == NULL);
 -	return (ZIO_PIPELINE_CONTINUE);
 +	return (zio);
 }
 static boolean_t
@@ -2780,7 +2801,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 +2843,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 +2869,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 +2911,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 +2937,7 @@ zio_ddt_free(zio_t *zio)
 	}
 	ddt_exit(ddt);
 -	return (ZIO_PIPELINE_CONTINUE);
 +	return (zio);
 }
 /*
@@ -2953,7 +2974,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 +2984,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 +3000,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 +3019,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 +3060,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 +3080,7 @@ zio_dva_claim(zio_t *zio)
 	if (error)
 		zio->io_error = error;
 -	return (ZIO_PIPELINE_CONTINUE);
 +	return (zio);
 }
 /*
@@ -3172,7 +3178,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 +3198,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 +3275,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 +3307,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 +3343,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 +3372,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 +3408,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 +3448,7 @@ zio_vdev_io_assess(zio_t *zio)
 		zio->io_physdone(zio->io_logical);
 	}
 -	return (ZIO_PIPELINE_CONTINUE);
 +	return (zio);
 }
 void
@@ -3477,7 +3483,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 +3497,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 +3511,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 +3529,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 +3544,7 @@ zio_checksum_verify(zio_t *zio)
 		}
 	}
 -	return (ZIO_PIPELINE_CONTINUE);
 +	return (zio);
 }
 /*
@@ -3581,7 +3587,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 +3596,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 +3642,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 +3658,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 +3722,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 +3739,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 +3963,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 +3980,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 +4002,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 +4038,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 +4060,7 @@ zio_done(zio_t *zio)
 		zio_destroy(zio);
 	}
 -	return (ZIO_PIPELINE_STOP);
 +	return (next_to_execute);
 }
 /*
@@ -0,0 +1,29 @@
 From 4264f648987efc980002ede5add258a427ad9a05 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
 Date: Thu, 27 Oct 2016 10:18:55 +0200
 Subject: [PATCH 6/6] fix rm path in zfs-share.service
 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>
 ---
 etc/systemd/system/zfs-share.service.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/etc/systemd/system/zfs-share.service.in b/etc/systemd/system/zfs-share.service.in
 index 688731e..494f5cb 100644
 --- a/etc/systemd/system/zfs-share.service.in
 +++ b/etc/systemd/system/zfs-share.service.in
@@ -9,7 +9,7 @@ PartOf=smb.service
 [Service]
 Type=oneshot
 RemainAfterExit=yes
 -ExecStartPre=-@bindir@/rm -f /etc/dfs/sharetab
 +ExecStartPre=-/bin/rm -f /etc/dfs/sharetab
 ExecStart=@sbindir@/zfs share -a
 [Install]
 -- 
 2.1.4
@@ -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,43 +0,0 @@
 From 5ac80068e911d3b0935903f713c5f492d518da91 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 4d22ff50..a414e449 100644
 --- a/debian/control
 +++ b/debian/control
@@ -117,6 +117,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 96154c5c..b9c34331 100644
 --- a/debian/control.in
 +++ b/debian/control.in
@@ -117,6 +117,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
 -- 
 2.11.0
@@ -1,78 +0,0 @@
 From c37a6401469cae16519db06d623d49c6f606f312 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 5fba58ff..81c301e4 100644
 --- a/debian/rules
 +++ b/debian/rules
@@ -161,14 +153,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
 -
 # ------------
 override_dh_prep-deb-files:
 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
 -- 
 2.19.1
@@ -1,9 +1,6 @@
-0001-remove-DKMS-modules-and-dracut-build.patch
+0001-Undo-python-changes-until-PVE-5.0-release.patch
-0002-import-with-d-dev-disk-by-id-in-scan-service.patch
+0002-remove-DKMS-modules-and-dracut-build.patch
-0003-always-load-ZFS-module-on-boot.patch
+0003-add-zfsutils.preinst-postinst-for-wheezy-upgrade-pat.patch
-0004-Fix-deadlock-between-zfs-umount-snapentry_expire.patch
+0004-ensure-upgrade-path-from-existing-PVE-ZFS-packages.patch
-0005-Fix-race-in-dnode_check_slots_free.patch
+0005-import-with-d-dev-disk-by-id-in-scan-service.patch
-0006-Reduce-taskq-and-context-switch-cost-of-zio-pipe.patch
+0006-fix-rm-path-in-zfs-share.service.patch
 0007-deadlock-between-mm_sem-and-tx-assign-in-zfs_write-a.patch
 0008-Add-Breaks-Replaces-to-zfs-initramfs.patch
 0009-Revert-Install-init-scripts-to-support-non-systemd-s.patch
`@@ -1,2 +1 @@`
	`0001-remove-DKMS-and-module-build.patch`	`fix-control.patch`
	`0002-deadlock-between-mm_sem-and-tx-assign-in-zfs_write-a.patch`