bump version to 0.7.12-pve1~bpo1

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
update/rebase to zfs-0.7.12 with patches from ZOL
2018-11-14 18:27:04 +01:00 · 2018-11-14 18:27:04 +01:00 · 2018-11-14 18:27:04 +01:00 · 2018-10-31 15:52:47 +01:00 · 2018-10-30 14:24:20 +01:00 · 2018-10-30 14:24:20 +01:00
41 changed files with 6577 additions and 559 deletions
@@ -0,0 +1,6 @@
+[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=4.1
+RELEASE=5.1

 # source form https://github.com/zfsonlinux/

-ZFSVER=0.6.5.9
-ZFSPKGREL=pve15~bpo80
-SPLPKGREL=pve8~bpo80
+ZFSVER=0.7.12
+ZFSPKGREL=pve1~bpo1
+SPLPKGREL=pve1~bpo1
 ZFSPKGVER=${ZFSVER}-${ZFSPKGREL}
 SPLPKGVER=${ZFSVER}-${SPLPKGREL}

-SPLDIR=pkg-spl
-SPLSRC=pkg-spl.tar.gz
-ZFSDIR=pkg-zfs
-ZFSSRC=pkg-zfs.tar.gz
+SPLDIR=spl-build
+SPLSRC=spl-debian
+ZFSDIR=zfs-build
+ZFSSRC=zfs-debian

-SPL_DEBS= 					\
+SPL_DEB = 					\
 spl_${SPLPKGVER}_amd64.deb

-ZFS_DEBS= 					\
-libnvpair1linux_${ZFSPKGVER}_amd64.deb		\
+ZFS_DEB1= libnvpair1linux_${ZFSPKGVER}_amd64.deb
+ZFS_DEB2= 					\
 libuutil1linux_${ZFSPKGVER}_amd64.deb		\
 libzfs2linux_${ZFSPKGVER}_amd64.deb		\
 libzfslinux-dev_${ZFSPKGVER}_amd64.deb		\
@@ -25,58 +25,54 @@ libzpool2linux_${ZFSPKGVER}_amd64.deb		\
 zfs-dbg_${ZFSPKGVER}_amd64.deb			\
 zfs-zed_${ZFSPKGVER}_amd64.deb			\
 zfs-initramfs_${ZFSPKGVER}_all.deb		\
+zfs-test_${ZFSPKGVER}_amd64.deb		\
 zfsutils-linux_${ZFSPKGVER}_amd64.deb
+ZFS_DEBS= $(ZFS_DEB1) $(ZFS_DEB2)

-ZFS_TRANS_DEBS=					\
-libnvpair1_${ZFSPKGVER}_all.deb			\
-libuutil1_${ZFSPKGVER}_all.deb			\
-libzfs2_${ZFSPKGVER}_all.deb			\
-libzpool2_${ZFSPKGVER}_all.deb			\
-zfsutils_${ZFSPKGVER}_all.deb
+DEBS=${SPL_DEB} ${ZFS_DEBS}

-DEBS=${SPL_DEBS} ${ZFS_DEBS} ${ZFS_TRANS_DEBS}
-
-all: ${DEBS}
+all: deb
+deb: ${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_DEBS}: ${SPLSRC}
+spl: ${SPL_DEB}
+${SPL_DEB}: ${SPLSRC}
 	rm -rf ${SPLDIR}
-	tar xf ${SPLSRC}
+	mkdir ${SPLDIR}
+	cp -a ${SPLSRC}/* ${SPLDIR}/
 	mv ${SPLDIR}/debian/changelog ${SPLDIR}/debian/changelog.org
 	cat spl-changelog.Debian ${SPLDIR}/debian/changelog.org > ${SPLDIR}/debian/changelog
 	cd ${SPLDIR}; ln -s ../spl-patches patches
 	cd ${SPLDIR}; quilt push -a
 	cd ${SPLDIR}; rm -rf .pc ./patches
-	cd ${SPLDIR}; dpkg-buildpackage -b -uc -us 
+	cd ${SPLDIR}; dpkg-buildpackage -b -uc -us

 .PHONY: zfs
-zfs ${ZFS_DEBS} ${ZFS_TRANS_DEBS}: ${ZFSSRC}
+zfs: $(ZFS_DEBS)
+$(ZFS_DEB2): $(ZFS_DEB1)
+$(ZFS_DEB1): $(ZFSSRC)
 	rm -rf ${ZFSDIR}
-	tar xf ${ZFSSRC}
+	mkdir ${ZFSDIR}
+	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
 	cd ${ZFSDIR}; quilt push -a
 	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
+	cd ${ZFSDIR}; dpkg-buildpackage -b -uc -us

 .PHONY: clean
 clean: 	
-	rm -rf *~ *.deb *.changes ${ZFSDIR} ${SPLDIR}
+	rm -rf *~ *.deb *.changes *.buildinfo ${ZFSDIR} ${SPLDIR}

 .PHONY: distclean
 distclean: clean
@@ -84,4 +80,4 @@ distclean: clean

 .PHONY: upload
 upload: ${DEBS}
-	tar -cf - ${DEBS} | ssh repoman@repo.proxmox.com upload
+	tar -cf - ${DEBS} | ssh repoman@repo.proxmox.com -- upload --product pve,pmg --dist stretch --arch amd64
@@ -1,3 +1,80 @@
+spl-linux (0.7.12-pve1~bpo1) unstable; urgency=medium
+
+  * update SPL to 0.7.12
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 14 Nov 2018 17:51:59 +0100
+
+spl-linux (0.7.11-pve2~bpo1) unstable; urgency=medium
+
+  * update SPL to debian/0.7.11
+
+  * Backport deadlock fix between mm_sem and tx assign in zfs_write() and page
+    fault
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 29 Oct 2018 13:47:39 +0100
+
+spl-linux (0.7.11-pve1~bpo1) unstable; urgency=medium
+
+  * update SPL to 0.7.11
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 10 Sep 2018 15:47:06 +0200
+
+spl-linux (0.7.9-pve1~bpo9) unstable; urgency=medium
+
+  * update SPL to 0.7.9
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 18 May 2018 13:49:09 +0200
+
+spl-linux (0.7.8-pve1~bpo9) unstable; urgency=medium
+
+  * update SPL to 0.7.8 (no changes)
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 30 Apr 2018 13:47:22 +0200
+
+spl-linux (0.7.7-pve1~bpo9) unstable; urgency=medium
+
+  * update SPL to 0.7.7
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 3 Apr 2018 14:28:35 +0200
+
+spl-linux (0.7.6-pve1~bpo9) unstable; urgency=medium
+
+  * update SPL to 0.7.6
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 21 Feb 2018 09:47:54 +0100
+
+spl-linux (0.7.4-pve1~bpo9) unstable; urgency=medium
+
+  * update SPL to 0.7.4
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 19 Dec 2017 12:52:42 +0100
+
+spl-linux (0.7.3-pve1~bpo9) unstable; urgency=medium
+
+  * update spl to 0.7.3
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 6 Nov 2017 09:14:19 +0100
+
+spl-linux (0.7.2-pve1~bpo90) unstable; urgency=medium
+
+  * update spl to 0.7.2
+
+  * clean up man pages
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 12 Oct 2017 13:33:04 +0200
+
+spl-linux (0.6.5.11-pve10~bpo90) unstable; urgency=medium
+
+  * update spl to debian/0.6.5.11-1
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 27 Jul 2017 13:11:45 +0200
+
+spl-linux (0.6.5.9-pve9~bpo90) unstable; urgency=medium
+
+  * rebuild for PVE 5.0 / Debian Stretch
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 10 Mar 2017 09:45:52 +0100
+
 spl-linux (0.6.5.9-pve8~bpo80) unstable; urgency=medium

  * update spl to debian/0.6.5.9-1
@@ -1,4 +1,4 @@
-From b750abda7a2b24c52a4fba505571a629223ad64e Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
 Date: Wed, 12 Oct 2016 10:57:39 +0200
 Subject: [PATCH] remove DKMS and module build
@@ -7,30 +7,51 @@ 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.in | 24 --------------------
- debian/rules      | 68 +------------------------------------------------------
- 2 files changed, 1 insertion(+), 91 deletions(-)
+ debian/control    |  1 -
+ debian/control.in | 31 -------------------------
+ debian/rules      | 67 +------------------------------------------------------
+ 3 files changed, 1 insertion(+), 98 deletions(-)

-diff --git a/debian/control.in b/debian/control.in
-index 52c1660..dc6ee96 100644
--- a/debian/control.in
-+++ b/debian/control.in
-@@ -8,40 +8,16 @@ Build-Depends: autogen,
+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: 3.9.8
+ Standards-Version: 4.1.2
 Homepage: http://www.zfsonlinux.org/
- Vcs-Git: git://anonscm.debian.org/pkg-zfsonlinux/spl.git
- Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-zfsonlinux/spl.git
+diff --git a/debian/control.in b/debian/control.in
+index 0e6c3fc..c8fe170 100644
+--- a/debian/control.in
+++ b/debian/control.in
+@@ -9,47 +9,16 @@ Build-Depends: autogen,
+                autotools-dev,
+                debhelper (>= 9),
+                dh-autoreconf,
+-               dkms (>> 2.2.0.2-1~),
+                libtool
+ Standards-Version: 4.1.2
+ Homepage: http://www.zfsonlinux.org/
+ Vcs-Git: https://salsa.debian.org/zfsonlinux-team/spl.git
+ Vcs-Browser: https://salsa.debian.org/zfsonlinux-team/spl
 
 -Package: spl-dkms
 -Architecture: all
-Depends: dkms (>> 2.2.1.0), file, libc-dev, lsb-release, ${misc:Depends}
-Recommends: spl (>= ${source:Upstream-Version})
+-Depends: dkms (>> 2.2.1.0),
+-         file,
+-         libc-dev,
+-         libelf-dev,
+-         lsb-release,
+-         ${misc:Depends}
+-Suggests: spl (>= ${source:Upstream-Version}),
+-         @LINUX_COMPAT@
+-Conflicts: spl (<< 0.7.9~)
 -Provides: spl-modules
 -Description: Solaris Porting Layer kernel modules for Linux
 - The Solaris Porting Layer (SPL) is a Linux kernel module which provides
@@ -58,24 +79,23 @@ index 52c1660..dc6ee96 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 b2fc86c..a474ca4 100755
+index 72ded49..5abeebb 100755
 --- a/debian/rules
 +++ b/debian/rules
-@@ -14,12 +14,8 @@ ifndef KVERS
+@@ -14,11 +14,8 @@ ifndef KVERS
 KVERS=$(shell uname -r)
 endif
 
 -non_epoch_version=$(shell echo $(KVERS) | perl -pe 's/^\d+://')
-PACKAGE=spl
-pmodules = $(PACKAGE)-modules-$(non_epoch_version)
+-pmodules = $(NAME)-modules-$(non_epoch_version)
 -
 %:
 -	dh $@ --with dkms,autoreconf --parallel
 +	dh $@ --with autoreconf --parallel
 
 override_dh_auto_configure:
- 	@cp debian/control.in debian/control
-@@ -45,69 +41,7 @@ override_dh_auto_install:
+ 	sed "s/@LINUX_COMPAT@/linux-libc-dev \(<< $(LINUX_NEXT)~\)/" debian/control.in > debian/control
+@@ -44,69 +41,7 @@ override_dh_auto_install:
 	@# This creates the $(CURDIR)/$(NAME)-$(VERSION)/ tree.
 	$(MAKE) distdir
 
@@ -95,7 +115,7 @@ index b2fc86c..a474ca4 100755
 override_dh_auto_clean:
 	dh_auto_clean
 	@if test -e META.orig; then mv META.orig META; fi
- 	cp debian/control.in debian/control
+ 	sed "s/@LINUX_COMPAT@/linux-libc-dev \(<< $(LINUX_NEXT)~\)/" debian/control.in > debian/control
 -
 -# ------------
 -
@@ -145,6 +165,3 @@ index b2fc86c..a474ca4 100755
 -	dh_md5sums -p${pmodules}
 -
 -	dh_builddeb -p${pmodules}
-- 
-2.1.4
-
@@ -0,0 +1,42 @@
+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;
@@ -0,0 +1,34 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Tony Hutter <hutter2@llnl.gov>
+Date: Fri, 26 Oct 2018 01:24:24 -0400
+Subject: [PATCH] Define timestruc_t for Lustre compatibility
+
+Lustre 2.8 (and possibly other versions) are still using timestruc_t,
+which was removed in spl-0.7.10 in favor of inode_timespec_t.  Add
+in a backwards compatibility #define for timestruc_t so that Lustre
+builds.
+
+Reviewed by: Brian Behlendorf <behlendorf1@llnl.gov>
+Reviewed-by: George Melikov <mail@gmelikov.ru>
+Signed-off-by: Tony Hutter <hutter2@llnl.gov>
+Closes #8014
+
+Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
+---
+ include/sys/time.h | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/include/sys/time.h b/include/sys/time.h
+index 59557af..9029671 100644
+--- a/include/sys/time.h
+++ b/include/sys/time.h
+@@ -66,6 +66,9 @@ typedef struct timespec64	inode_timespec_t;
+ typedef struct timespec		inode_timespec_t;
+ #endif
+ 
+/* Include for Lustre compatibility */
+#define        timestruc_t     inode_timespec_t
+
+ static inline void
+ gethrestime(inode_timespec_t *ts)
+  {
@@ -0,0 +1,35 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Tony Hutter <hutter2@llnl.gov>
+Date: Fri, 26 Oct 2018 06:51:38 -0400
+Subject: [PATCH] Backport vnode.h changes from zfs:93ce2b4c
+
+This backports the vnode.h changes from zfs:93ce2b4c for zfs-0.7.12.
+
+Signed-off-by: Tony Hutter <hutter2@llnl.gov>
+Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
+---
+ include/sys/vnode.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/sys/vnode.h b/include/sys/vnode.h
+index 87f12d6..279bd87 100644
+--- a/include/sys/vnode.h
+++ b/include/sys/vnode.h
+@@ -87,7 +87,7 @@
+ #define	AT_MTIME	ATTR_MTIME
+ #define	AT_CTIME	ATTR_CTIME
+ 
+-#define	ATTR_XVATTR	(1 << 31)
+#define	ATTR_XVATTR	(1U << 31)
+ #define	AT_XVATTR	ATTR_XVATTR
+ 
+ #define	ATTR_IATTR_MASK	(ATTR_MODE | ATTR_UID | ATTR_GID | ATTR_SIZE | \
+@@ -121,7 +121,7 @@ typedef enum vtype {
+ 
+ typedef struct vattr {
+ 	enum vtype	va_type;	/* vnode type */
+-	uint_t		va_mask;	/* attribute bit-mask */
+	uint32_t        va_mask;        /* attribute bit-mask */
+ 	ushort_t	va_mode;	/* acc mode */
+ 	uid_t		va_uid;		/* owner uid */
+ 	gid_t		va_gid;		/* owner gid */
@@ -0,0 +1,40 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Tony Hutter <hutter2@llnl.gov>
+Date: Wed, 24 Oct 2018 22:42:14 -0700
+Subject: [PATCH] Linux 4.20 compat: current_kernel_time()
+
+Commit torvalds/linux@976516404 removed the current_kernel_time()
+function (and several others).  All callers are expected to use
+current_kernel_time64().  Update the gethrestime_sec() wrapper
+accordingly.
+
+Backported to SPL from zfs:82c0a050f
+
+Reviewed-by: Olaf Faaland <faaland1@llnl.gov>
+Reviewed-by: Tony Hutter <hutter2@llnl.gov>
+Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
+Closes #8074
+
+Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
+---
+ include/sys/time.h | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/include/sys/time.h b/include/sys/time.h
+index 9029671..563c210 100644
+--- a/include/sys/time.h
+++ b/include/sys/time.h
+@@ -82,8 +82,11 @@ gethrestime(inode_timespec_t *ts)
+ static inline time_t
+ gethrestime_sec(void)
+ {
+-	struct timespec ts;
+-	ts = current_kernel_time();
+#if defined(HAVE_INODE_TIMESPEC64_TIMES)
+	inode_timespec_t ts = current_kernel_time64();
+#else
+	inode_timespec_t ts = current_kernel_time();
+#endif
+ 	return (ts.tv_sec);
+ }
+ 
@@ -0,0 +1,57 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Tony Hutter <hutter2@llnl.gov>
+Date: Wed, 7 Nov 2018 22:13:20 -0800
+Subject: [PATCH] Add BuildRequires gcc, make, elfutils-libelf-devel
+
+This adds a BuildRequires for gcc, make, and elfutils-libelf-devel
+into our spec files.  gcc has been a packaging requirement for
+awhile now:
+
+https://fedoraproject.org/wiki/Packaging:C_and_C%2B%2B
+
+These additional BuildRequires allow us to mock build in
+Fedora 29.
+
+(This is the backported SPL equivalent of the original ZFS patch)
+
+Reviewed-by: Neal Gompa <ngompa@datto.com>
+Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
+Signed-off-by:  Tony Hutter <hutter2@llnl.gov>
+Closes #8095
+Closes #8102
+
+Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
+---
+ rpm/generic/spl-kmod.spec.in | 4 ++++
+ rpm/generic/spl.spec.in      | 3 +++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/rpm/generic/spl-kmod.spec.in b/rpm/generic/spl-kmod.spec.in
+index 4cc1faf..f986cde 100644
+--- a/rpm/generic/spl-kmod.spec.in
+++ b/rpm/generic/spl-kmod.spec.in
+@@ -26,6 +26,10 @@ URL:            http://zfsonlinux.org/
+ Source0:        %{module}-%{version}.tar.gz
+ Source10:       kmodtool
+ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id} -u -n)
+%if 0%{?rhel}%{?fedora}
+BuildRequires:  gcc, make
+BuildRequires:  elfutils-libelf-devel
+%endif
+ 
+ # The developments headers will conflict with the dkms packages.
+ Conflicts:      %{module}-dkms
+diff --git a/rpm/generic/spl.spec.in b/rpm/generic/spl.spec.in
+index 4b3a3d7..b17c68e 100644
+--- a/rpm/generic/spl.spec.in
+++ b/rpm/generic/spl.spec.in
+@@ -20,6 +20,9 @@ Source0:        %{name}-%{version}.tar.gz
+ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ Requires:       %{name}-kmod = %{version}
+ Provides:       %{name}-kmod-common = %{version}
+%if 0%{?rhel}%{?fedora}%{?suse_version}
+BuildRequires:  gcc, make
+%endif
+ 
+ %description
+ This package contains the commands to verify the SPL
@@ -0,0 +1,56 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Tony Hutter <hutter2@llnl.gov>
+Date: Thu, 8 Nov 2018 14:38:28 -0800
+Subject: [PATCH] Tag spl-0.7.12
+
+META file and changelog updated.
+
+Signed-off-by: Tony Hutter <hutter2@llnl.gov>
+Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
+---
+ META                         | 2 +-
+ rpm/generic/spl-kmod.spec.in | 3 +++
+ rpm/generic/spl.spec.in      | 3 +++
+ 3 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/META b/META
+index fc98597..de72c4f 100644
+--- a/META
+++ b/META
+@@ -1,7 +1,7 @@
+ Meta:         1
+ Name:         spl
+ Branch:       1.0
+-Version:      0.7.11
+Version:      0.7.12
+ Release:      1
+ Release-Tags: relext
+ License:      GPL
+diff --git a/rpm/generic/spl-kmod.spec.in b/rpm/generic/spl-kmod.spec.in
+index f986cde..ef32f93 100644
+--- a/rpm/generic/spl-kmod.spec.in
+++ b/rpm/generic/spl-kmod.spec.in
+@@ -171,6 +171,9 @@ chmod u+x ${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/*/extra/*/*/*
+ rm -rf $RPM_BUILD_ROOT
+ 
+ %changelog
+* Thu Nov 08 2018 Tony Hutter <hutter2@llnl.gov> - 0.7.12-1
+- Released 0.7.12-1, detailed release notes are available at:
+- https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.7.12
+ * Thu Sep 13 2018 Tony Hutter <hutter2@llnl.gov> - 0.7.11-1
+ - Released 0.7.11-1, detailed release notes are available at:
+ - https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.7.11
+diff --git a/rpm/generic/spl.spec.in b/rpm/generic/spl.spec.in
+index b17c68e..30ed496 100644
+--- a/rpm/generic/spl.spec.in
+++ b/rpm/generic/spl.spec.in
+@@ -47,6 +47,9 @@ make install DESTDIR=%{?buildroot}
+ %{_mandir}/man5/*
+ 
+ %changelog
+* Thu Nov 08 2018 Tony Hutter <hutter2@llnl.gov> - 0.7.12-1
+- Released 0.7.12-1, detailed release notes are available at:
+- https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.7.12
+ * Thu Sep 13 2018 Tony Hutter <hutter2@llnl.gov> - 0.7.11-1
+ - Released 0.7.11-1, detailed release notes are available at:
+ - https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.7.11
@@ -1 +1,7 @@
-fix-control.patch
+0001-remove-DKMS-and-module-build.patch
+0002-deadlock-between-mm_sem-and-tx-assign-in-zfs_write-a.patch
+0003-Define-timestruc_t-for-Lustre-compatibility.patch
+0004-Backport-vnode.h-changes-from-zfs-93ce2b4c.patch
+0005-Linux-4.20-compat-current_kernel_time.patch
+0006-Add-BuildRequires-gcc-make-elfutils-libelf-devel.patch
+0007-Tag-spl-0.7.12.patch
@@ -1,3 +1,128 @@
+zfs-linux (0.7.12-pve1~bpo1) unstable; urgency=medium
+
+  * update ZFS to 0.7.12
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 14 Nov 2018 17:51:59 +0100
+
+zfs-linux (0.7.11-pve2~bpo1) unstable; urgency=medium
+
+  * update ZFS to debian/0.7.11-3
+
+  * Cherry-pick two fixes planned for 0.7.12
+
+  * Backport deadlock fix between mm_sem and tx assign in zfs_write() and page
+    fault
+
+  * Fix missing Breaks/Replaces in zfs-initramfs
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 29 Oct 2018 13:45:49 +0100
+
+zfs-linux (0.7.11-pve1~bpo1) unstable; urgency=medium
+
+  * update ZFS to 0.7.11
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 10 Sep 2018 15:47:31 +0200
+
+zfs-linux (0.7.9-pve3~bpo9) unstable; urgency=medium
+
+  *  Cherry-pick fix for deadlock umount/snapentry_expire
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 03 Aug 2018 11:41:11 +0200
+
+zfs-linux (0.7.9-pve2~bpo9) unstable; urgency=medium
+
+  * Cherry-pick fix for zpl_mount deadlock
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 12 Jul 2018 12:37:50 +0200
+
+zfs-linux (0.7.9-pve1~bpo9) unstable; urgency=medium
+
+  * update ZFS to 0.7.9
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 18 May 2018 13:49:09 +0200
+
+zfs-linux (0.7.8-pve1~bpo9) unstable; urgency=medium
+
+  * update ZFS to 0.7.8 (no changes)
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 30 Apr 2018 13:47:22 +0200
+
+zfs-linux (0.7.7-pve2~bpo9) unstable; urgency=medium
+
+  * (temporarily) revert likely cause of #7401
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 9 Apr 2018 09:49:27 +0200
+
+zfs-linux (0.7.7-pve1~bpo9) unstable; urgency=medium
+
+  * update ZFS to 0.7.7
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 3 Apr 2018 14:28:35 +0200
+
+zfs-linux (0.7.6-pve1~bpo9) unstable; urgency=medium
+
+  * update ZFS to 0.7.6
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 21 Feb 2018 09:48:29 +0100
+
+zfs-linux (0.7.4-pve2~bpo9) unstable; urgency=medium
+
+  * cherry-pick ARC hit rate fix from 0.7.6
+
+  * always load ZFS modules on boot
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 19 Jan 2018 11:31:14 +0100
+
+zfs-linux (0.7.4-pve1~bpo9) unstable; urgency=medium
+
+  * update ZFS to 0.7.4
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 19 Dec 2017 12:52:42 +0100
+
+zfs-linux (0.7.3-pve1~bpo9) unstable; urgency=medium
+
+  * update ZFS to 0.7.3
+
+  * include fix for user namespace setgid issue (#6800 upstream)
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 6 Nov 2017 09:14:19 +0100
+
+zfs-linux (0.7.2-pve1~bpo90) unstable; urgency=medium
+
+  * update zfs to 0.7.2
+
+  * add PR 6616 - zfs send/recv compatibility with 0.6.5
+
+  * add PR 6695 - zfs recv: don't skip over objects which should be freed
+
+  * various small fixes
+
+  * split test suite into zfs-test package
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 12 Oct 2017 13:34:05 +0200
+
+zfs-linux (0.6.5.11-pve18~bpo90) unstable; urgency=medium
+
+  * fix #1509: arc_summary error with L2ARC
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 2 Oct 2017 09:30:41 +0200
+
+zfs-linux (0.6.5.11-pve17~bpo90) unstable; urgency=medium
+
+  * update zfs to debian/0.6.5.11-1
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 27 Jul 2017 13:11:45 +0200
+
+zfs-linux (0.6.5.9-pve16~bpo90) unstable; urgency=medium
+
+  * drop transitional packages
+
+  * convert python scripts to python 3, drop .py suffix
+
+  * rebuild for PVE 5.0 / Debian Stretch
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 10 Mar 2017 09:45:52 +0100
+
 zfs-linux (0.6.5.9-pve15~bpo80) unstable; urgency=medium

  * update zfs to debian/0.6.5.9-1
@@ -1,174 +0,0 @@
-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,38 +1,54 @@
-From 0e7871b8878f78fd2c8c73a50cbf805b39afb4e7 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
 Date: Mon, 6 Feb 2017 11:03:10 +0100
-Subject: [PATCH 2/6] remove DKMS, modules and dracut build
+Subject: [PATCH] remove DKMS, modules and dracut build
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
+Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 ---
- debian/control.in |  34 +++---------------
- debian/rules      | 105 ++----------------------------------------------------
- 2 files changed, 6 insertions(+), 133 deletions(-)
+ debian/control       |   1 -
+ debian/control.in    |  40 ++-----------------
+ debian/not-installed |   2 +
+ debian/rules         | 108 +--------------------------------------------------
+ 4 files changed, 7 insertions(+), 144 deletions(-)

+diff --git a/debian/control b/debian/control
+index 4d22ff50..f33008df 100644
+--- a/debian/control
+++ b/debian/control
+@@ -10,7 +10,6 @@ Build-Depends: autotools-dev,
+                debhelper (>= 10.2),
+                dh-autoreconf,
+                dh-python,
+-               dkms (>> 2.1.1.2-5),
+                libattr1-dev,
+                libblkid-dev,
+                libselinux1-dev,
 diff --git a/debian/control.in b/debian/control.in
-index db75496..22dd958 100644
+index 96154c5c..0a9ceef6 100644
 --- a/debian/control.in
 +++ b/debian/control.in
-@@ -9,7 +9,6 @@ Build-Depends: dh-autoreconf,
-                dh-systemd,
-                autotools-dev,
-                debhelper (>= 9),
+@@ -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,
-                libtool,
-                lsb-release,
-@@ -85,25 +84,11 @@ Description: OpenZFS pool library for Linux
+@@ -95,26 +94,10 @@ Description: OpenZFS pool library for Linux
  .
  This zpool library provides support for managing zpools.
 
 -Package: zfs-dkms
 -Architecture: all
-Pre-Depends: spl-dkms (>= ${source:Upstream-Version})
+-Pre-Depends: spl-dkms (<<${source:Upstream-Version}.),
+-             spl-dkms (>= ${source:Upstream-Version})
 -Depends: dkms (>> 2.1.1.2-5), lsb-release, ${misc:Depends}
-Recommends: zfsutils-linux, zfs-zed
+-Recommends: zfs-zed, zfsutils-linux (>= ${binary:Version}), @LINUX_COMPAT@
 -Provides: zfs-modules
 -Description: OpenZFS filesystem kernel modules for Linux
 - The Z file system is a pooled filesystem designed for maximum data
@@ -44,20 +60,22 @@ index db75496..22dd958 100644
 -
 Package: zfs-initramfs
 Architecture: all
- Depends: initramfs-tools,
-  busybox-initramfs | busybox-static | busybox,
- zfs-modules | zfs-dkms, zfsutils-linux,
-+ zfsutils-linux,
-  ${misc:Depends}
+ Depends: busybox-initramfs | busybox-static | busybox,
+          initramfs-tools,
+-         zfs-modules | zfs-dkms,
+          zfsutils-linux (>= ${binary:Version}),
+          ${misc:Depends}
 Description: OpenZFS root filesystem capabilities for Linux - initramfs
-  The Z file system is a pooled filesystem designed for maximum data
-@@ -113,23 +98,12 @@ Description: OpenZFS root filesystem capabilities for Linux - initramfs
+@@ -125,29 +108,14 @@ Description: OpenZFS root filesystem capabilities for Linux - initramfs
  This package adds OpenZFS to the system initramfs with a hook
  for the initramfs-tools infrastructure.
 
 -Package: zfs-dracut
 -Architecture: all
-Depends: dracut, zfs-modules | zfs-dkms, zfsutils-linux, ${misc:Depends}
+-Depends: dracut,
+-         zfs-modules | zfs-dkms,
+-         zfsutils-linux (>= ${binary:Version}),
+-         ${misc:Depends}
 -Description: OpenZFS root filesystem capabilities for Linux - dracut
 - The Z file system is a pooled filesystem designed for maximum data
 - integrity, supporting data snapshots, multiple copies, and data
@@ -69,30 +87,52 @@ index db75496..22dd958 100644
 Package: zfsutils-linux
 Section: contrib/admin
 Architecture: linux-any
- Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}
+ Depends: python3, ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}
 -Recommends: lsb-base, zfs-modules | zfs-dkms, zfs-zed
-Suggests: nfs-kernel-server, samba-common-bin (>= 3.0.23), zfs-initramfs | zfs-dracut
+-Breaks: zfs-dkms (<< ${binary:Version}), zfs-dkms (>> ${binary:Version})
 +Recommends: lsb-base, zfs-zed
-+Suggests: nfs-kernel-server, samba-common-bin (>= 3.0.23), zfs-initramfs
- Conflicts: zfs, zfs-fuse, zutils
+ Suggests: nfs-kernel-server,
+           samba-common-bin (>= 3.0.23),
+-          zfs-initramfs | zfs-dracut
+          zfs-initramfs
+ Conflicts: zfs, zfs-fuse
 Provides: zfsutils
 Description: command-line tools to manage OpenZFS filesystems
-@@ -143,7 +117,7 @@ Description: command-line tools to manage OpenZFS filesystems
+@@ -161,8 +129,7 @@ Description: command-line tools to manage OpenZFS filesystems
 Package: zfs-zed
 Section: contrib/admin
 Architecture: linux-any
-Depends: ${misc:Depends}, ${shlibs:Depends}, zfs-modules | zfs-dkms, zfsutils-linux
-+Depends: ${misc:Depends}, ${shlibs:Depends}, zfsutils-linux
+-Depends: zfs-modules | zfs-dkms,
+-         zfsutils-linux (>= ${binary:Version}),
+Depends: zfsutils-linux (>= ${binary:Version}),
+          ${misc:Depends},
+          ${shlibs:Depends}
 Description: OpenZFS Event Daemon
-  The Z file system is a pooled filesystem designed for maximum data
-  integrity, supporting data snapshots, multiple copies, and data
+@@ -185,7 +152,6 @@ Depends: acl,
+          python,
+          sudo,
+          sysstat,
+-         zfs-modules | zfs-dkms,
+          zfsutils-linux (>=${binary:Version}),
+          ${misc:Depends},
+          ${shlibs:Depends}
+diff --git a/debian/not-installed b/debian/not-installed
+index a008985c..c60b0016 100644
+--- a/debian/not-installed
+++ b/debian/not-installed
+@@ -6,3 +6,5 @@ etc/zfs/vdev_id.conf.alias.example
+ etc/zfs/vdev_id.conf.multipath.example
+ etc/zfs/vdev_id.conf.sas_direct.example
+ etc/zfs/vdev_id.conf.sas_switch.example
+usr/lib/dracut
+usr/share/zfs/enum-extract.pl
 diff --git a/debian/rules b/debian/rules
-index 70e57e5..0c8a6a2 100755
+index 21b8ccef..3ba4b99a 100755
 --- a/debian/rules
 +++ b/debian/rules
-@@ -5,9 +5,6 @@ NAME := $(shell awk '$$1 == "Name:" { print $$2; }' META)
- VERSION := $(shell dpkg-parsechangelog \
-   | awk '$$1 == "Version:" { print $$2; }' | cut -d- -f1)
+@@ -6,9 +6,6 @@ LSB_DISTRIBUTOR := $(shell lsb_release -is)
+ NAME := $(shell awk '$$1 == "Name:" { print $$2; }' META)
+ LINUX_NEXT := $(shell awk -F. '{print $$1 "." $$2+1}' debian/linux_compat)
 
 -DKMSFILES := module include config zfs.release.in autogen.sh META AUTHORS \
 -		DISCLAIMER COPYRIGHT OPENSOLARIS.LICENSE README.markdown
@@ -100,16 +140,16 @@ index 70e57e5..0c8a6a2 100755
 ifndef BUILD_UDEB
 BUILD_UDEB=false
 endif
-@@ -21,21 +18,16 @@ KVERS=$(shell uname -r)
+@@ -18,21 +15,16 @@ KVERS=$(shell uname -r)
 endif
 
 ifndef SPL
-SPL=/usr/src/spl-$(VERSION)
+-SPL=/usr/src/spl-$(DEB_VERSION_UPSTREAM)
 -endif
 -
 -ifndef SPLOBJ
-SPLOBJ=/var/lib/dkms/spl/$(VERSION)/$(KVERS)/$(shell dpkg-architecture -qDEB_TARGET_GNU_CPU)
-+SPL=../pkg-spl
+-SPLOBJ=/var/lib/dkms/spl/$(DEB_VERSION_UPSTREAM)/$(KVERS)/$(DEB_TARGET_GNU_CPU)
+SPL=../spl-build
 endif
 
 non_epoch_version=$(shell echo $(KVERS) | perl -pe 's/^\d+://')
@@ -119,59 +159,69 @@ index 70e57e5..0c8a6a2 100755
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
-	dh $@ --with autoreconf,dkms,python2,systemd --parallel
-+	dh $@ --with autoreconf,python2,systemd --parallel
+-	dh $@ --with autoreconf,dkms,python3,systemd --parallel
+	dh $@ --with autoreconf,python3,systemd --parallel
 
- override_dh_auto_configure:
- 	@cp debian/control.in debian/control
-@@ -74,36 +66,6 @@ override_dh_auto_install:
- 	$(INSTALL) -d '$(CURDIR)/debian/tmp/usr/sbin/'
- 	mv '$(CURDIR)/debian/tmp/sbin/zed' '$(CURDIR)/debian/tmp/usr/sbin/zed'
+ override_dh_autoreconf:
+ 	@# Embed the downstream version in the module.
+@@ -57,14 +49,6 @@ endif
+ 	  --with-systemdpresetdir=/lib/systemd/system-preset \
+ 	  --with-config=user
 
+-override_dh_auto_build:
 -	@# Get a bare copy of the source code for DKMS.
-	@# This creates the $(CURDIR)/$(NAME)-$(VERSION)/ tree, which does not
+-	@# This creates the $(CURDIR)/$(NAME)-$(DEB_VERSION_UPSTREAM)/ tree, which does not
 -	@# contain the userland sources. NB: Remove-userland-dist-rules.patch
 -	$(MAKE) distdir
 -
+-	dh_auto_build
+-
+ override_dh_auto_test:
+ 	# The dh_auto_test rule is disabled because
+ 	# `make check` cannot run in an unprivileged build environment.
+@@ -88,29 +72,6 @@ override_dh_auto_install:
+ 	@# Zed has dependencies outside of the system root.
+ 	mv '$(CURDIR)/debian/tmp/sbin/zed' '$(CURDIR)/debian/tmp/usr/sbin/zed'
+ 
 -	@# Install the DKMS source.
 -	@# We only want the files needed to build the modules
-	mkdir -p '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)'
-	$(foreach file,$(DKMSFILES),mv '$(CURDIR)/$(NAME)-$(VERSION)/$(file)' '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)' || exit 1;)
+-	install -D -t '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/scripts' \
+-		'$(CURDIR)/scripts/enum-extract.pl' \
+-		'$(CURDIR)/scripts/dkms.postbuild'
+-	$(foreach file,$(DKMSFILES),mv '$(CURDIR)/$(NAME)-$(DEB_VERSION_UPSTREAM)/$(file)' '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)' || exit 1;)
 -	@# Hellish awk line:
 -	@#  * Deletes from configure.ac the parts not needed for building the kernel module
 -	@#     * It deletes from inside AC_CONFIG_FILES([]) everything except:
 -	@#        (Makefile$|include/|module/|*.release$)
 -	@#  * Takes care of spaces and tabs
+-	@#  * Remove reference to ZFS_AC_PACKAGE
 -	awk '/^AC_CONFIG_FILES\(\[/,/^\]\)/ { if ($$0 !~ /^(AC_CONFIG_FILES\(\[([ \t]+)?$$|\]\)([ \t]+)?$$|([ \t]+)?(include\/|module\/|Makefile([ \t]+)?$$|zfs\.release([ \t]+)?$$))/){next} } {print}' \
-		'$(CURDIR)/$(NAME)-$(VERSION)/configure.ac' > '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/configure.ac'
+-		'$(CURDIR)/$(NAME)-$(DEB_VERSION_UPSTREAM)/configure.ac' | sed '/ZFS_AC_PACKAGE/d' > '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/configure.ac'
 -	@# Set "SUBDIRS = module include" for CONFIG_KERNEL and remove SUBDIRS for all other configs.
 -	sed '1,/CONFIG_KERNEL/s/SUBDIRS.*=.*//g;s/SUBDIRS.*=.*/SUBDIRS = module include/g;' \
-		'$(CURDIR)/$(NAME)-$(VERSION)/Makefile.am' > '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/Makefile.am'
+-		'$(CURDIR)/$(NAME)-$(DEB_VERSION_UPSTREAM)/Makefile.am' > '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/Makefile.am'
 -	@# Sanity test
-	grep -q 'SUBDIRS = module include' '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/Makefile.am'
+-	grep -q 'SUBDIRS = module include' '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/Makefile.am'
 -	@# Run autogen on the stripped source tree
-	cd '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)'; ./autogen.sh
-	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'
+-	cd '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)'; ./autogen.sh
+-	rm -fr '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/autom4te.cache'
 -
 	mkdir -p $(CURDIR)/debian/tmp/usr/lib
 	for i in `ls $(CURDIR)/debian/tmp/lib/*.so`; do \
 		ln -s /lib/`readlink $${i}` $(CURDIR)/debian/tmp/usr/lib/`basename $${i}`; \
-@@ -113,9 +75,6 @@ override_dh_auto_install:
- 	chmod a-x $(CURDIR)/debian/tmp/etc/zfs/zfs-functions
- 	chmod a-x $(CURDIR)/debian/tmp/etc/default/zfs
+@@ -121,11 +82,6 @@ override_dh_auto_install:
+ 	chmod a-x '$(CURDIR)/debian/tmp/etc/default/zfs'
+ 	chmod a-x '$(CURDIR)/debian/tmp/usr/share/bash-completion/completions/zfs'
 
 -override_dh_dkms:
-	dh_dkms -V $(VERSION)
+-	'$(CURDIR)/scripts/dkms.mkconf' -n $(NAME) -v $(DEB_VERSION_UPSTREAM) -f '$(CURDIR)/scripts/zfs-dkms.dkms'
+-	dh_dkms
+-	rm -f '$(CURDIR)/scripts/zfs-dkms.dkms'
 -
 override_dh_makeshlibs:
- 	dh_makeshlibs -a
+ 	dh_makeshlibs -a -V
 ifeq ($(BUILD_UDEB), true)
-@@ -153,65 +112,5 @@ override_dh_install:
+@@ -171,65 +127,5 @@ override_dh_installinit:
 
 # ------------
 
@@ -237,6 +287,3 @@ index 70e57e5..0c8a6a2 100755
 -
 debian-copyright:
 	cme update dpkg-copyright -file debian/copyright.cme
-- 
-2.1.4
-
@@ -1,29 +1,27 @@
-From 9a97a884f8a409395e00891afdc28fa92b9f79b3 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 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 5/6] import with -d /dev/disk/by-id in scan service
+Subject: [PATCH] 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 0105283..665b9c8 100644
+index abc8e8e6..8fe2c107 100644
 --- a/etc/systemd/system/zfs-import-scan.service.in
 +++ b/etc/systemd/system/zfs-import-scan.service.in
-@@ -10,7 +10,7 @@ ConditionPathExists=!@sysconfdir@/zfs/zpool.cache
+@@ -12,7 +12,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-mount.service
-- 
-2.1.4
-
+ WantedBy=zfs-import.target
@@ -1,68 +0,0 @@
-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
-
@@ -0,0 +1,28 @@
+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
@@ -0,0 +1,40 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Stoiko Ivanov <s.ivanov@proxmox.com>
+Date: Mon, 29 Oct 2018 15:49:20 +0100
+Subject: [PATCH] Add Breaks/Replaces to zfs-initramfs
+
+addressing the move of zdev initramfs hook from zfsutils-linux to
+zfs-initramfs
+
+Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
+---
+ debian/control    | 2 ++
+ debian/control.in | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/debian/control b/debian/control
+index f33008df..d3d1034e 100644
+--- a/debian/control
+++ b/debian/control
+@@ -116,6 +116,8 @@ Depends: busybox-initramfs | busybox-static | busybox,
+          zfs-modules | zfs-dkms,
+          zfsutils-linux (>= ${binary:Version}),
+          ${misc:Depends}
+Breaks: zfsutils-linux (<= 0.7.11-pve1~bpo1)
+Replaces: zfsutils-linux (<= 0.7.11-pve1~bpo1)
+ Description: OpenZFS root filesystem capabilities for Linux - initramfs
+  The Z file system is a pooled filesystem designed for maximum data
+  integrity, supporting data snapshots, multiple copies, and data
+diff --git a/debian/control.in b/debian/control.in
+index 0a9ceef6..09ef18cc 100644
+--- a/debian/control.in
+++ b/debian/control.in
+@@ -100,6 +100,8 @@ Depends: busybox-initramfs | busybox-static | busybox,
+          initramfs-tools,
+          zfsutils-linux (>= ${binary:Version}),
+          ${misc:Depends}
+Breaks: zfsutils-linux (<= 0.7.11-pve1~bpo1)
+Replaces: zfsutils-linux (<= 0.7.11-pve1~bpo1)
+ Description: OpenZFS root filesystem capabilities for Linux - initramfs
+  The Z file system is a pooled filesystem designed for maximum data
+  integrity, supporting data snapshots, multiple copies, and data
@@ -1,141 +0,0 @@
-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
-
@@ -0,0 +1,75 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Thomas Lamprecht <t.lamprecht@proxmox.com>
+Date: Wed, 31 Oct 2018 15:37:39 +0100
+Subject: [PATCH] Revert "Install init scripts to support non-systemd setups.
+ (Closes: #826994)"
+
+This reverts commit 2ad6c7f9e150e9c2fa146891785b09465aa0c7e5.
+
+Breaks on systems with sysv-rc installed (possible on Jessie upgraded
+systems)
+
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ debian/rules                          | 8 --------
+ debian/zfs-zed.zfs-zed.init           | 1 -
+ debian/zfsutils-linux.zfs-import.init | 1 -
+ debian/zfsutils-linux.zfs-mount.init  | 1 -
+ debian/zfsutils-linux.zfs-share.init  | 1 -
+ 5 files changed, 12 deletions(-)
+ delete mode 120000 debian/zfs-zed.zfs-zed.init
+ delete mode 120000 debian/zfsutils-linux.zfs-import.init
+ delete mode 120000 debian/zfsutils-linux.zfs-mount.init
+ delete mode 120000 debian/zfsutils-linux.zfs-share.init
+
+diff --git a/debian/rules b/debian/rules
+index 3ba4b99a..d6cf5a56 100755
+--- a/debian/rules
+++ b/debian/rules
+@@ -117,14 +117,6 @@ override_dh_install:
+ 	find . -name lib*.la -delete
+ 	dh_install --fail-missing
+ 
+-override_dh_installinit:
+-	dh_installinit -r --no-start --name zfs-import
+-	dh_installinit -r --no-start --name zfs-mount
+-	dh_installinit -r --no-start --name zfs-share
+-	dh_installinit -R --no-start --name zfs-zed
+-	mkdir -p debian/zfsutils-linux/lib/systemd/system
+-	ln -sr /dev/null debian/zfsutils-linux/lib/systemd/system/zfs-import.service
+-
+ # ------------
+ 
+ debian-copyright:
+diff --git a/debian/zfs-zed.zfs-zed.init b/debian/zfs-zed.zfs-zed.init
+deleted file mode 120000
+index 3f41f681..00000000
+--- a/debian/zfs-zed.zfs-zed.init
+++ /dev/null
+@@ -1 +0,0 @@
+-../etc/init.d/zfs-zed
+\ No newline at end of file
+diff --git a/debian/zfsutils-linux.zfs-import.init b/debian/zfsutils-linux.zfs-import.init
+deleted file mode 120000
+index bfc368fd..00000000
+--- a/debian/zfsutils-linux.zfs-import.init
+++ /dev/null
+@@ -1 +0,0 @@
+-../etc/init.d/zfs-import
+\ No newline at end of file
+diff --git a/debian/zfsutils-linux.zfs-mount.init b/debian/zfsutils-linux.zfs-mount.init
+deleted file mode 120000
+index 62a54433..00000000
+--- a/debian/zfsutils-linux.zfs-mount.init
+++ /dev/null
+@@ -1 +0,0 @@
+-../etc/init.d/zfs-mount
+\ No newline at end of file
+diff --git a/debian/zfsutils-linux.zfs-share.init b/debian/zfsutils-linux.zfs-share.init
+deleted file mode 120000
+index 3f069f9b..00000000
+--- a/debian/zfsutils-linux.zfs-share.init
+++ /dev/null
+@@ -1 +0,0 @@
+-../etc/init.d/zfs-share
+\ No newline at end of file
@@ -0,0 +1,61 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Rohan Puri <rohan.puri15@gmail.com>
+Date: Sat, 28 Jul 2018 18:32:12 +0530
+Subject: [PATCH] Fix deadlock between zfs umount & snapentry_expire
+
+zfs umount -> zfsctl_destroy() takes the zfs_snapshot_lock as a
+writer and calls zfsctl_snapshot_unmount_cancel(), which waits
+for snapentry_expire() if present (when snap is automounted).
+This snapentry_expire() itself then waits for zfs_snapshot_lock
+as a reader, resulting in a deadlock.
+
+The fix is to only hold the zfs_snapshot_lock over the tree
+lookup and removal.  After a successful lookup the lock can
+be dropped and zfs_snapentry_t will remain valid until the
+reference taken by the lookup is released.
+
+Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
+Signed-off-by: Rohan Puri <rohan.puri15@gmail.com>
+Closes #7751
+Closes #7752
+
+(Cherry-picked from fd7265c646f40e364396af5014bbb83e809e124a)
+Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
+
+Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
+---
+ module/zfs/zfs_ctldir.c | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/module/zfs/zfs_ctldir.c b/module/zfs/zfs_ctldir.c
+index 98897fe6..0ab5b4f0 100644
+--- a/module/zfs/zfs_ctldir.c
+++ b/module/zfs/zfs_ctldir.c
+@@ -358,8 +358,6 @@ snapentry_expire(void *data)
+ static void
+ zfsctl_snapshot_unmount_cancel(zfs_snapentry_t *se)
+ {
+-	ASSERT(RW_LOCK_HELD(&zfs_snapshot_lock));
+-
+ 	if (taskq_cancel_id(system_delay_taskq, se->se_taskqid) == 0) {
+ 		se->se_taskqid = TASKQID_INVALID;
+ 		zfsctl_snapshot_rele(se);
+@@ -570,13 +568,14 @@ zfsctl_destroy(zfsvfs_t *zfsvfs)
+ 		uint64_t objsetid = dmu_objset_id(zfsvfs->z_os);
+ 
+ 		rw_enter(&zfs_snapshot_lock, RW_WRITER);
+-		if ((se = zfsctl_snapshot_find_by_objsetid(spa, objsetid))
+-		    != NULL) {
+-			zfsctl_snapshot_unmount_cancel(se);
+		se = zfsctl_snapshot_find_by_objsetid(spa, objsetid);
+		if (se != NULL)
+ 			zfsctl_snapshot_remove(se);
+		rw_exit(&zfs_snapshot_lock);
+		if (se != NULL) {
+			zfsctl_snapshot_unmount_cancel(se);
+ 			zfsctl_snapshot_rele(se);
+ 		}
+-		rw_exit(&zfs_snapshot_lock);
+ 	} else if (zfsvfs->z_ctldir) {
+ 		iput(zfsvfs->z_ctldir);
+ 		zfsvfs->z_ctldir = NULL;
@@ -1,29 +0,0 @@
-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
-
@@ -0,0 +1,376 @@
+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."
@@ -0,0 +1,251 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Tom Caputi <tcaputi@datto.com>
+Date: Tue, 10 Apr 2018 14:15:05 -0400
+Subject: [PATCH] Fix race in dnode_check_slots_free()
+
+Currently, dnode_check_slots_free() works by checking dn->dn_type
+in the dnode to determine if the dnode is reclaimable. However,
+there is a small window of time between dnode_free_sync() in the
+first call to dsl_dataset_sync() and when the useraccounting code
+is run when the type is set DMU_OT_NONE, but the dnode is not yet
+evictable, leading to crashes. This patch adds the ability for
+dnodes to track which txg they were last dirtied in and adds a
+check for this before performing the reclaim.
+
+This patch also corrects several instances when dn_dirty_link was
+treated as a list_node_t when it is technically a multilist_node_t.
+
+Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
+Signed-off-by: Tom Caputi <tcaputi@datto.com>
+Closes #7147
+Closes #7388
+---
+ include/sys/dmu_impl.h  |  1 +
+ include/sys/dnode.h     |  4 ++++
+ module/zfs/dbuf.c       |  3 +++
+ module/zfs/dmu.c        |  2 +-
+ module/zfs/dmu_objset.c | 15 +++++++++++++++
+ module/zfs/dnode.c      | 29 +++++++++++++++++++----------
+ 6 files changed, 43 insertions(+), 11 deletions(-)
+
+diff --git a/include/sys/dmu_impl.h b/include/sys/dmu_impl.h
+index 65e417e3..03a63077 100644
+--- a/include/sys/dmu_impl.h
+++ b/include/sys/dmu_impl.h
+@@ -161,6 +161,7 @@ extern "C" {
+  * 	dn_allocated_txg
+  * 	dn_free_txg
+  * 	dn_assigned_txg
+ * 	dn_dirty_txg
+  * 	dd_assigned_tx
+  * 	dn_notxholds
+  * 	dn_dirtyctx
+diff --git a/include/sys/dnode.h b/include/sys/dnode.h
+index ea7defe1..2dd087b3 100644
+--- a/include/sys/dnode.h
+++ b/include/sys/dnode.h
+@@ -260,6 +260,7 @@ struct dnode {
+ 	uint64_t dn_allocated_txg;
+ 	uint64_t dn_free_txg;
+ 	uint64_t dn_assigned_txg;
+	uint64_t dn_dirty_txg;			/* txg dnode was last dirtied */
+ 	kcondvar_t dn_notxholds;
+ 	enum dnode_dirtycontext dn_dirtyctx;
+ 	uint8_t *dn_dirtyctx_firstset;		/* dbg: contents meaningless */
+@@ -362,6 +363,9 @@ void dnode_evict_dbufs(dnode_t *dn);
+ void dnode_evict_bonus(dnode_t *dn);
+ void dnode_free_interior_slots(dnode_t *dn);
+ 
+#define	DNODE_IS_DIRTY(_dn)						\
+	((_dn)->dn_dirty_txg >= spa_syncing_txg((_dn)->dn_objset->os_spa))
+
+ #define	DNODE_IS_CACHEABLE(_dn)						\
+ 	((_dn)->dn_objset->os_primary_cache == ZFS_CACHE_ALL ||		\
+ 	(DMU_OT_IS_METADATA((_dn)->dn_type) &&				\
+diff --git a/module/zfs/dbuf.c b/module/zfs/dbuf.c
+index 4ee121f5..6edb39d6 100644
+--- a/module/zfs/dbuf.c
+++ b/module/zfs/dbuf.c
+@@ -1606,6 +1606,9 @@ dbuf_dirty(dmu_buf_impl_t *db, dmu_tx_t *tx)
+ 			    FTAG);
+ 		}
+ 	}
+
+	if (tx->tx_txg > dn->dn_dirty_txg)
+		dn->dn_dirty_txg = tx->tx_txg;
+ 	mutex_exit(&dn->dn_mtx);
+ 
+ 	if (db->db_blkid == DMU_SPILL_BLKID)
+diff --git a/module/zfs/dmu.c b/module/zfs/dmu.c
+index 6f09aa2f..a09ac4f9 100644
+--- a/module/zfs/dmu.c
+++ b/module/zfs/dmu.c
+@@ -2044,7 +2044,7 @@ dmu_offset_next(objset_t *os, uint64_t object, boolean_t hole, uint64_t *off)
+ 	 * Check if dnode is dirty
+ 	 */
+ 	for (i = 0; i < TXG_SIZE; i++) {
+-		if (list_link_active(&dn->dn_dirty_link[i])) {
+		if (multilist_link_active(&dn->dn_dirty_link[i])) {
+ 			clean = B_FALSE;
+ 			break;
+ 		}
+diff --git a/module/zfs/dmu_objset.c b/module/zfs/dmu_objset.c
+index 449ebedf..0bed2d3e 100644
+--- a/module/zfs/dmu_objset.c
+++ b/module/zfs/dmu_objset.c
+@@ -1213,10 +1213,23 @@ dmu_objset_sync_dnodes(multilist_sublist_t *list, dmu_tx_t *tx)
+ 		ASSERT3U(dn->dn_nlevels, <=, DN_MAX_LEVELS);
+ 		multilist_sublist_remove(list, dn);
+ 
+		/*
+		 * If we are not doing useraccounting (os_synced_dnodes == NULL)
+		 * we are done with this dnode for this txg. Unset dn_dirty_txg
+		 * if later txgs aren't dirtying it so that future holders do
+		 * not get a stale value. Otherwise, we will do this in
+		 * userquota_updates_task() when processing has completely
+		 * finished for this txg.
+		 */
+ 		multilist_t *newlist = dn->dn_objset->os_synced_dnodes;
+ 		if (newlist != NULL) {
+ 			(void) dnode_add_ref(dn, newlist);
+ 			multilist_insert(newlist, dn);
+		} else {
+			mutex_enter(&dn->dn_mtx);
+			if (dn->dn_dirty_txg == tx->tx_txg)
+				dn->dn_dirty_txg = 0;
+			mutex_exit(&dn->dn_mtx);
+ 		}
+ 
+ 		dnode_sync(dn, tx);
+@@ -1621,6 +1634,8 @@ userquota_updates_task(void *arg)
+ 				dn->dn_id_flags |= DN_ID_CHKED_BONUS;
+ 		}
+ 		dn->dn_id_flags &= ~(DN_ID_NEW_EXIST);
+		if (dn->dn_dirty_txg == spa_syncing_txg(os->os_spa))
+			dn->dn_dirty_txg = 0;
+ 		mutex_exit(&dn->dn_mtx);
+ 
+ 		multilist_sublist_remove(list, dn);
+diff --git a/module/zfs/dnode.c b/module/zfs/dnode.c
+index d465b545..4a169c49 100644
+--- a/module/zfs/dnode.c
+++ b/module/zfs/dnode.c
+@@ -137,7 +137,7 @@ dnode_cons(void *arg, void *unused, int kmflag)
+ 	bzero(&dn->dn_next_blksz[0], sizeof (dn->dn_next_blksz));
+ 
+ 	for (i = 0; i < TXG_SIZE; i++) {
+-		list_link_init(&dn->dn_dirty_link[i]);
+		multilist_link_init(&dn->dn_dirty_link[i]);
+ 		dn->dn_free_ranges[i] = NULL;
+ 		list_create(&dn->dn_dirty_records[i],
+ 		    sizeof (dbuf_dirty_record_t),
+@@ -147,6 +147,7 @@ dnode_cons(void *arg, void *unused, int kmflag)
+ 	dn->dn_allocated_txg = 0;
+ 	dn->dn_free_txg = 0;
+ 	dn->dn_assigned_txg = 0;
+	dn->dn_dirty_txg = 0;
+ 	dn->dn_dirtyctx = 0;
+ 	dn->dn_dirtyctx_firstset = NULL;
+ 	dn->dn_bonus = NULL;
+@@ -184,7 +185,7 @@ dnode_dest(void *arg, void *unused)
+ 	ASSERT(!list_link_active(&dn->dn_link));
+ 
+ 	for (i = 0; i < TXG_SIZE; i++) {
+-		ASSERT(!list_link_active(&dn->dn_dirty_link[i]));
+		ASSERT(!multilist_link_active(&dn->dn_dirty_link[i]));
+ 		ASSERT3P(dn->dn_free_ranges[i], ==, NULL);
+ 		list_destroy(&dn->dn_dirty_records[i]);
+ 		ASSERT0(dn->dn_next_nblkptr[i]);
+@@ -199,6 +200,7 @@ dnode_dest(void *arg, void *unused)
+ 	ASSERT0(dn->dn_allocated_txg);
+ 	ASSERT0(dn->dn_free_txg);
+ 	ASSERT0(dn->dn_assigned_txg);
+	ASSERT0(dn->dn_dirty_txg);
+ 	ASSERT0(dn->dn_dirtyctx);
+ 	ASSERT3P(dn->dn_dirtyctx_firstset, ==, NULL);
+ 	ASSERT3P(dn->dn_bonus, ==, NULL);
+@@ -523,6 +525,7 @@ dnode_destroy(dnode_t *dn)
+ 	dn->dn_allocated_txg = 0;
+ 	dn->dn_free_txg = 0;
+ 	dn->dn_assigned_txg = 0;
+	dn->dn_dirty_txg = 0;
+ 
+ 	dn->dn_dirtyctx = 0;
+ 	if (dn->dn_dirtyctx_firstset != NULL) {
+@@ -592,6 +595,7 @@ dnode_allocate(dnode_t *dn, dmu_object_type_t ot, int blocksize, int ibs,
+ 	ASSERT0(dn->dn_maxblkid);
+ 	ASSERT0(dn->dn_allocated_txg);
+ 	ASSERT0(dn->dn_assigned_txg);
+	ASSERT0(dn->dn_dirty_txg);
+ 	ASSERT(refcount_is_zero(&dn->dn_tx_holds));
+ 	ASSERT3U(refcount_count(&dn->dn_holds), <=, 1);
+ 	ASSERT(avl_is_empty(&dn->dn_dbufs));
+@@ -604,7 +608,7 @@ dnode_allocate(dnode_t *dn, dmu_object_type_t ot, int blocksize, int ibs,
+ 		ASSERT0(dn->dn_next_bonustype[i]);
+ 		ASSERT0(dn->dn_rm_spillblk[i]);
+ 		ASSERT0(dn->dn_next_blksz[i]);
+-		ASSERT(!list_link_active(&dn->dn_dirty_link[i]));
+		ASSERT(!multilist_link_active(&dn->dn_dirty_link[i]));
+ 		ASSERT3P(list_head(&dn->dn_dirty_records[i]), ==, NULL);
+ 		ASSERT3P(dn->dn_free_ranges[i], ==, NULL);
+ 	}
+@@ -779,6 +783,7 @@ dnode_move_impl(dnode_t *odn, dnode_t *ndn)
+ 	ndn->dn_allocated_txg = odn->dn_allocated_txg;
+ 	ndn->dn_free_txg = odn->dn_free_txg;
+ 	ndn->dn_assigned_txg = odn->dn_assigned_txg;
+	ndn->dn_dirty_txg = odn->dn_dirty_txg;
+ 	ndn->dn_dirtyctx = odn->dn_dirtyctx;
+ 	ndn->dn_dirtyctx_firstset = odn->dn_dirtyctx_firstset;
+ 	ASSERT(refcount_count(&odn->dn_tx_holds) == 0);
+@@ -845,6 +850,7 @@ dnode_move_impl(dnode_t *odn, dnode_t *ndn)
+ 	odn->dn_allocated_txg = 0;
+ 	odn->dn_free_txg = 0;
+ 	odn->dn_assigned_txg = 0;
+	odn->dn_dirty_txg = 0;
+ 	odn->dn_dirtyctx = 0;
+ 	odn->dn_dirtyctx_firstset = NULL;
+ 	odn->dn_have_spill = B_FALSE;
+@@ -1069,6 +1075,10 @@ dnode_check_slots_free(dnode_children_t *children, int idx, int slots)
+ {
+ 	ASSERT3S(idx + slots, <=, DNODES_PER_BLOCK);
+ 
+	/*
+	 * If all dnode slots are either already free or
+	 * evictable return B_TRUE.
+	 */
+ 	for (int i = idx; i < idx + slots; i++) {
+ 		dnode_handle_t *dnh = &children->dnc_children[i];
+ 		dnode_t *dn = dnh->dnh_dnode;
+@@ -1077,18 +1087,17 @@ dnode_check_slots_free(dnode_children_t *children, int idx, int slots)
+ 			continue;
+ 		} else if (DN_SLOT_IS_PTR(dn)) {
+ 			mutex_enter(&dn->dn_mtx);
+-			dmu_object_type_t type = dn->dn_type;
+			boolean_t can_free = (dn->dn_type == DMU_OT_NONE &&
+			    !DNODE_IS_DIRTY(dn));
+ 			mutex_exit(&dn->dn_mtx);
+ 
+-			if (type != DMU_OT_NONE)
+			if (!can_free)
+ 				return (B_FALSE);
+-
+-			continue;
+			else
+				continue;
+ 		} else {
+ 			return (B_FALSE);
+ 		}
+-
+-		return (B_FALSE);
+ 	}
+ 
+ 	return (B_TRUE);
+@@ -1594,7 +1603,7 @@ dnode_setdirty(dnode_t *dn, dmu_tx_t *tx)
+ 	/*
+ 	 * If we are already marked dirty, we're done.
+ 	 */
+-	if (list_link_active(&dn->dn_dirty_link[txg & TXG_MASK])) {
+	if (multilist_link_active(&dn->dn_dirty_link[txg & TXG_MASK])) {
+ 		multilist_sublist_unlock(mls);
+ 		return;
+ 	}
@@ -0,0 +1,859 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Matthew Ahrens <mahrens@delphix.com>
+Date: Thu, 2 Aug 2018 15:51:45 -0700
+Subject: [PATCH] Reduce taskq and context-switch cost of zio pipe
+
+When doing a read from disk, ZFS creates 3 ZIO's: a zio_null(), the
+logical zio_read(), and then a physical zio. Currently, each of these
+results in a separate taskq_dispatch(zio_execute).
+
+On high-read-iops workloads, this causes a significant performance
+impact. By processing all 3 ZIO's in a single taskq entry, we reduce the
+overhead on taskq locking and context switching.  We accomplish this by
+allowing zio_done() to return a "next zio to execute" to zio_execute().
+
+This results in a ~12% performance increase for random reads, from
+96,000 iops to 108,000 iops (with recordsize=8k, on SSD's).
+
+Reviewed by: Pavel Zakharov <pavel.zakharov@delphix.com>
+Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
+Reviewed by: George Wilson <george.wilson@delphix.com>
+Signed-off-by: Matthew Ahrens <mahrens@delphix.com>
+External-issue: DLPX-59292
+Closes #7736
+---
+ include/sys/zio.h |   4 +-
+ module/zfs/zio.c  | 252 +++++++++++++++++++++++++++++-------------------------
+ 2 files changed, 139 insertions(+), 117 deletions(-)
+
+diff --git a/include/sys/zio.h b/include/sys/zio.h
+index 4b0eecc2..3618912c 100644
+--- a/include/sys/zio.h
+++ b/include/sys/zio.h
+@@ -237,7 +237,7 @@ enum zio_child {
+ #define	ZIO_CHILD_DDT_BIT		ZIO_CHILD_BIT(ZIO_CHILD_DDT)
+ #define	ZIO_CHILD_LOGICAL_BIT		ZIO_CHILD_BIT(ZIO_CHILD_LOGICAL)
+ #define	ZIO_CHILD_ALL_BITS					\
+-	(ZIO_CHILD_VDEV_BIT | ZIO_CHILD_GANG_BIT | 		\
+	(ZIO_CHILD_VDEV_BIT | ZIO_CHILD_GANG_BIT |		\
+ 	ZIO_CHILD_DDT_BIT | ZIO_CHILD_LOGICAL_BIT)
+ 
+ enum zio_wait_type {
+@@ -375,7 +375,7 @@ typedef struct zio_transform {
+ 	struct zio_transform	*zt_next;
+ } zio_transform_t;
+ 
+-typedef int zio_pipe_stage_t(zio_t *zio);
+typedef zio_t *zio_pipe_stage_t(zio_t *zio);
+ 
+ /*
+  * The io_reexecute flags are distinct from io_flags because the child must
+diff --git a/module/zfs/zio.c b/module/zfs/zio.c
+index 9a465e1b..dd0dfcdb 100644
+--- a/module/zfs/zio.c
+++ b/module/zfs/zio.c
+@@ -75,9 +75,6 @@ uint64_t zio_buf_cache_frees[SPA_MAXBLOCKSIZE >> SPA_MINBLOCKSHIFT];
+ 
+ int zio_delay_max = ZIO_DELAY_MAX;
+ 
+-#define	ZIO_PIPELINE_CONTINUE		0x100
+-#define	ZIO_PIPELINE_STOP		0x101
+-
+ #define	BP_SPANB(indblkshift, level) \
+ 	(((uint64_t)1) << ((level) * ((indblkshift) - SPA_BLKPTRSHIFT)))
+ #define	COMPARE_META_LEVEL	0x80000000ul
+@@ -516,7 +513,8 @@ zio_wait_for_children(zio_t *zio, uint8_t childbits, enum zio_wait_type wait)
+ 
+ __attribute__((always_inline))
+ static inline void
+-zio_notify_parent(zio_t *pio, zio_t *zio, enum zio_wait_type wait)
+zio_notify_parent(zio_t *pio, zio_t *zio, enum zio_wait_type wait,
+    zio_t **next_to_executep)
+ {
+ 	uint64_t *countp = &pio->io_children[zio->io_child_type][wait];
+ 	int *errorp = &pio->io_child_error[zio->io_child_type];
+@@ -535,13 +533,33 @@ zio_notify_parent(zio_t *pio, zio_t *zio, enum zio_wait_type wait)
+ 		    ZIO_TASKQ_INTERRUPT;
+ 		pio->io_stall = NULL;
+ 		mutex_exit(&pio->io_lock);
+
+ 		/*
+-		 * Dispatch the parent zio in its own taskq so that
+-		 * the child can continue to make progress. This also
+-		 * prevents overflowing the stack when we have deeply nested
+-		 * parent-child relationships.
+		 * If we can tell the caller to execute this parent next, do
+		 * so.  Otherwise dispatch the parent zio as its own task.
+		 *
+		 * Having the caller execute the parent when possible reduces
+		 * locking on the zio taskq's, reduces context switch
+		 * overhead, and has no recursion penalty.  Note that one
+		 * read from disk typically causes at least 3 zio's: a
+		 * zio_null(), the logical zio_read(), and then a physical
+		 * zio.  When the physical ZIO completes, we are able to call
+		 * zio_done() on all 3 of these zio's from one invocation of
+		 * zio_execute() by returning the parent back to
+		 * zio_execute().  Since the parent isn't executed until this
+		 * thread returns back to zio_execute(), the caller should do
+		 * so promptly.
+		 *
+		 * In other cases, dispatching the parent prevents
+		 * overflowing the stack when we have deeply nested
+		 * parent-child relationships, as we do with the "mega zio"
+		 * of writes for spa_sync(), and the chain of ZIL blocks.
+ 		 */
+-		zio_taskq_dispatch(pio, type, B_FALSE);
+		if (next_to_executep != NULL && *next_to_executep == NULL) {
+			*next_to_executep = pio;
+		} else {
+			zio_taskq_dispatch(pio, type, B_FALSE);
+		}
+ 	} else {
+ 		mutex_exit(&pio->io_lock);
+ 	}
+@@ -1187,7 +1205,7 @@ zio_shrink(zio_t *zio, uint64_t size)
+  * ==========================================================================
+  */
+ 
+-static int
+static zio_t *
+ zio_read_bp_init(zio_t *zio)
+ {
+ 	blkptr_t *bp = zio->io_bp;
+@@ -1221,15 +1239,15 @@ zio_read_bp_init(zio_t *zio)
+ 	if (BP_GET_DEDUP(bp) && zio->io_child_type == ZIO_CHILD_LOGICAL)
+ 		zio->io_pipeline = ZIO_DDT_READ_PIPELINE;
+ 
+-	return (ZIO_PIPELINE_CONTINUE);
+	return (zio);
+ }
+ 
+-static int
+static zio_t *
+ zio_write_bp_init(zio_t *zio)
+ {
+ 
+ 	if (!IO_IS_ALLOCATING(zio))
+-		return (ZIO_PIPELINE_CONTINUE);
+		return (zio);
+ 
+ 	ASSERT(zio->io_child_type != ZIO_CHILD_DDT);
+ 
+@@ -1244,7 +1262,7 @@ zio_write_bp_init(zio_t *zio)
+ 		zio->io_pipeline = ZIO_INTERLOCK_PIPELINE;
+ 
+ 		if (BP_IS_EMBEDDED(bp))
+-			return (ZIO_PIPELINE_CONTINUE);
+			return (zio);
+ 
+ 		/*
+ 		 * If we've been overridden and nopwrite is set then
+@@ -1255,13 +1273,13 @@ zio_write_bp_init(zio_t *zio)
+ 			ASSERT(!zp->zp_dedup);
+ 			ASSERT3U(BP_GET_CHECKSUM(bp), ==, zp->zp_checksum);
+ 			zio->io_flags |= ZIO_FLAG_NOPWRITE;
+-			return (ZIO_PIPELINE_CONTINUE);
+			return (zio);
+ 		}
+ 
+ 		ASSERT(!zp->zp_nopwrite);
+ 
+ 		if (BP_IS_HOLE(bp) || !zp->zp_dedup)
+-			return (ZIO_PIPELINE_CONTINUE);
+			return (zio);
+ 
+ 		ASSERT((zio_checksum_table[zp->zp_checksum].ci_flags &
+ 		    ZCHECKSUM_FLAG_DEDUP) || zp->zp_dedup_verify);
+@@ -1269,7 +1287,7 @@ zio_write_bp_init(zio_t *zio)
+ 		if (BP_GET_CHECKSUM(bp) == zp->zp_checksum) {
+ 			BP_SET_DEDUP(bp, 1);
+ 			zio->io_pipeline |= ZIO_STAGE_DDT_WRITE;
+-			return (ZIO_PIPELINE_CONTINUE);
+			return (zio);
+ 		}
+ 
+ 		/*
+@@ -1281,10 +1299,10 @@ zio_write_bp_init(zio_t *zio)
+ 		zio->io_pipeline = zio->io_orig_pipeline;
+ 	}
+ 
+-	return (ZIO_PIPELINE_CONTINUE);
+	return (zio);
+ }
+ 
+-static int
+static zio_t *
+ zio_write_compress(zio_t *zio)
+ {
+ 	spa_t *spa = zio->io_spa;
+@@ -1303,11 +1321,11 @@ zio_write_compress(zio_t *zio)
+ 	 */
+ 	if (zio_wait_for_children(zio, ZIO_CHILD_LOGICAL_BIT |
+ 	    ZIO_CHILD_GANG_BIT, ZIO_WAIT_READY)) {
+-		return (ZIO_PIPELINE_STOP);
+		return (NULL);
+ 	}
+ 
+ 	if (!IO_IS_ALLOCATING(zio))
+-		return (ZIO_PIPELINE_CONTINUE);
+		return (zio);
+ 
+ 	if (zio->io_children_ready != NULL) {
+ 		/*
+@@ -1366,7 +1384,7 @@ zio_write_compress(zio_t *zio)
+ 			zio->io_pipeline = ZIO_INTERLOCK_PIPELINE;
+ 			ASSERT(spa_feature_is_active(spa,
+ 			    SPA_FEATURE_EMBEDDED_DATA));
+-			return (ZIO_PIPELINE_CONTINUE);
+			return (zio);
+ 		} else {
+ 			/*
+ 			 * Round up compressed size up to the ashift
+@@ -1459,10 +1477,10 @@ zio_write_compress(zio_t *zio)
+ 			zio->io_pipeline |= ZIO_STAGE_NOP_WRITE;
+ 		}
+ 	}
+-	return (ZIO_PIPELINE_CONTINUE);
+	return (zio);
+ }
+ 
+-static int
+static zio_t *
+ zio_free_bp_init(zio_t *zio)
+ {
+ 	blkptr_t *bp = zio->io_bp;
+@@ -1472,7 +1490,9 @@ zio_free_bp_init(zio_t *zio)
+ 			zio->io_pipeline = ZIO_DDT_FREE_PIPELINE;
+ 	}
+ 
+-	return (ZIO_PIPELINE_CONTINUE);
+	ASSERT3P(zio->io_bp, ==, &zio->io_bp_copy);
+
+	return (zio);
+ }
+ 
+ /*
+@@ -1541,12 +1561,12 @@ zio_taskq_member(zio_t *zio, zio_taskq_type_t q)
+ 	return (B_FALSE);
+ }
+ 
+-static int
+static zio_t *
+ zio_issue_async(zio_t *zio)
+ {
+ 	zio_taskq_dispatch(zio, ZIO_TASKQ_ISSUE, B_FALSE);
+ 
+-	return (ZIO_PIPELINE_STOP);
+	return (NULL);
+ }
+ 
+ void
+@@ -1687,14 +1707,13 @@ __attribute__((always_inline))
+ static inline void
+ __zio_execute(zio_t *zio)
+ {
+-	zio->io_executor = curthread;
+-
+ 	ASSERT3U(zio->io_queued_timestamp, >, 0);
+ 
+ 	while (zio->io_stage < ZIO_STAGE_DONE) {
+ 		enum zio_stage pipeline = zio->io_pipeline;
+ 		enum zio_stage stage = zio->io_stage;
+-		int rv;
+
+		zio->io_executor = curthread;
+ 
+ 		ASSERT(!MUTEX_HELD(&zio->io_lock));
+ 		ASSERT(ISP2(stage));
+@@ -1736,12 +1755,16 @@ __zio_execute(zio_t *zio)
+ 
+ 		zio->io_stage = stage;
+ 		zio->io_pipeline_trace |= zio->io_stage;
+-		rv = zio_pipeline[highbit64(stage) - 1](zio);
+ 
+-		if (rv == ZIO_PIPELINE_STOP)
+-			return;
+		/*
+		 * The zio pipeline stage returns the next zio to execute
+		 * (typically the same as this one), or NULL if we should
+		 * stop.
+		 */
+		zio = zio_pipeline[highbit64(stage) - 1](zio);
+ 
+-		ASSERT(rv == ZIO_PIPELINE_CONTINUE);
+		if (zio == NULL)
+			return;
+ 	}
+ }
+ 
+@@ -2215,7 +2238,7 @@ zio_gang_tree_issue(zio_t *pio, zio_gang_node_t *gn, blkptr_t *bp, abd_t *data,
+ 		zio_nowait(zio);
+ }
+ 
+-static int
+static zio_t *
+ zio_gang_assemble(zio_t *zio)
+ {
+ 	blkptr_t *bp = zio->io_bp;
+@@ -2227,16 +2250,16 @@ zio_gang_assemble(zio_t *zio)
+ 
+ 	zio_gang_tree_assemble(zio, bp, &zio->io_gang_tree);
+ 
+-	return (ZIO_PIPELINE_CONTINUE);
+	return (zio);
+ }
+ 
+-static int
+static zio_t *
+ zio_gang_issue(zio_t *zio)
+ {
+ 	blkptr_t *bp = zio->io_bp;
+ 
+ 	if (zio_wait_for_children(zio, ZIO_CHILD_GANG_BIT, ZIO_WAIT_DONE)) {
+-		return (ZIO_PIPELINE_STOP);
+		return (NULL);
+ 	}
+ 
+ 	ASSERT(BP_IS_GANG(bp) && zio->io_gang_leader == zio);
+@@ -2250,7 +2273,7 @@ zio_gang_issue(zio_t *zio)
+ 
+ 	zio->io_pipeline = ZIO_INTERLOCK_PIPELINE;
+ 
+-	return (ZIO_PIPELINE_CONTINUE);
+	return (zio);
+ }
+ 
+ static void
+@@ -2290,7 +2313,7 @@ zio_write_gang_done(zio_t *zio)
+ 	abd_put(zio->io_abd);
+ }
+ 
+-static int
+static zio_t *
+ zio_write_gang_block(zio_t *pio)
+ {
+ 	spa_t *spa = pio->io_spa;
+@@ -2349,7 +2372,7 @@ zio_write_gang_block(zio_t *pio)
+ 		}
+ 
+ 		pio->io_error = error;
+-		return (ZIO_PIPELINE_CONTINUE);
+		return (pio);
+ 	}
+ 
+ 	if (pio == gio) {
+@@ -2423,7 +2446,7 @@ zio_write_gang_block(zio_t *pio)
+ 
+ 	zio_nowait(zio);
+ 
+-	return (ZIO_PIPELINE_CONTINUE);
+	return (pio);
+ }
+ 
+ /*
+@@ -2444,7 +2467,7 @@ zio_write_gang_block(zio_t *pio)
+  * used for nopwrite, assuming that the salt and the checksums
+  * themselves remain secret.
+  */
+-static int
+static zio_t *
+ zio_nop_write(zio_t *zio)
+ {
+ 	blkptr_t *bp = zio->io_bp;
+@@ -2471,7 +2494,7 @@ zio_nop_write(zio_t *zio)
+ 	    BP_GET_COMPRESS(bp) != BP_GET_COMPRESS(bp_orig) ||
+ 	    BP_GET_DEDUP(bp) != BP_GET_DEDUP(bp_orig) ||
+ 	    zp->zp_copies != BP_GET_NDVAS(bp_orig))
+-		return (ZIO_PIPELINE_CONTINUE);
+		return (zio);
+ 
+ 	/*
+ 	 * If the checksums match then reset the pipeline so that we
+@@ -2491,7 +2514,7 @@ zio_nop_write(zio_t *zio)
+ 		zio->io_flags |= ZIO_FLAG_NOPWRITE;
+ 	}
+ 
+-	return (ZIO_PIPELINE_CONTINUE);
+	return (zio);
+ }
+ 
+ /*
+@@ -2519,7 +2542,7 @@ zio_ddt_child_read_done(zio_t *zio)
+ 	mutex_exit(&pio->io_lock);
+ }
+ 
+-static int
+static zio_t *
+ zio_ddt_read_start(zio_t *zio)
+ {
+ 	blkptr_t *bp = zio->io_bp;
+@@ -2540,7 +2563,7 @@ zio_ddt_read_start(zio_t *zio)
+ 		zio->io_vsd = dde;
+ 
+ 		if (ddp_self == NULL)
+-			return (ZIO_PIPELINE_CONTINUE);
+			return (zio);
+ 
+ 		for (p = 0; p < DDT_PHYS_TYPES; p++, ddp++) {
+ 			if (ddp->ddp_phys_birth == 0 || ddp == ddp_self)
+@@ -2553,23 +2576,23 @@ zio_ddt_read_start(zio_t *zio)
+ 			    zio->io_priority, ZIO_DDT_CHILD_FLAGS(zio) |
+ 			    ZIO_FLAG_DONT_PROPAGATE, &zio->io_bookmark));
+ 		}
+-		return (ZIO_PIPELINE_CONTINUE);
+		return (zio);
+ 	}
+ 
+ 	zio_nowait(zio_read(zio, zio->io_spa, bp,
+ 	    zio->io_abd, zio->io_size, NULL, NULL, zio->io_priority,
+ 	    ZIO_DDT_CHILD_FLAGS(zio), &zio->io_bookmark));
+ 
+-	return (ZIO_PIPELINE_CONTINUE);
+	return (zio);
+ }
+ 
+-static int
+static zio_t *
+ zio_ddt_read_done(zio_t *zio)
+ {
+ 	blkptr_t *bp = zio->io_bp;
+ 
+ 	if (zio_wait_for_children(zio, ZIO_CHILD_DDT_BIT, ZIO_WAIT_DONE)) {
+-		return (ZIO_PIPELINE_STOP);
+		return (NULL);
+ 	}
+ 
+ 	ASSERT(BP_GET_DEDUP(bp));
+@@ -2581,12 +2604,12 @@ zio_ddt_read_done(zio_t *zio)
+ 		ddt_entry_t *dde = zio->io_vsd;
+ 		if (ddt == NULL) {
+ 			ASSERT(spa_load_state(zio->io_spa) != SPA_LOAD_NONE);
+-			return (ZIO_PIPELINE_CONTINUE);
+			return (zio);
+ 		}
+ 		if (dde == NULL) {
+ 			zio->io_stage = ZIO_STAGE_DDT_READ_START >> 1;
+ 			zio_taskq_dispatch(zio, ZIO_TASKQ_ISSUE, B_FALSE);
+-			return (ZIO_PIPELINE_STOP);
+			return (NULL);
+ 		}
+ 		if (dde->dde_repair_abd != NULL) {
+ 			abd_copy(zio->io_abd, dde->dde_repair_abd,
+@@ -2599,7 +2622,7 @@ zio_ddt_read_done(zio_t *zio)
+ 
+ 	ASSERT(zio->io_vsd == NULL);
+ 
+-	return (ZIO_PIPELINE_CONTINUE);
+	return (zio);
+ }
+ 
+ static boolean_t
+@@ -2780,7 +2803,7 @@ zio_ddt_ditto_write_done(zio_t *zio)
+ 	ddt_exit(ddt);
+ }
+ 
+-static int
+static zio_t *
+ zio_ddt_write(zio_t *zio)
+ {
+ 	spa_t *spa = zio->io_spa;
+@@ -2822,7 +2845,7 @@ zio_ddt_write(zio_t *zio)
+ 		}
+ 		zio->io_pipeline = ZIO_WRITE_PIPELINE;
+ 		ddt_exit(ddt);
+-		return (ZIO_PIPELINE_CONTINUE);
+		return (zio);
+ 	}
+ 
+ 	ditto_copies = ddt_ditto_copies_needed(ddt, dde, ddp);
+@@ -2848,7 +2871,7 @@ zio_ddt_write(zio_t *zio)
+ 			zio->io_bp_override = NULL;
+ 			BP_ZERO(bp);
+ 			ddt_exit(ddt);
+-			return (ZIO_PIPELINE_CONTINUE);
+			return (zio);
+ 		}
+ 
+ 		dio = zio_write(zio, spa, txg, bp, zio->io_orig_abd,
+@@ -2890,12 +2913,12 @@ zio_ddt_write(zio_t *zio)
+ 	if (dio)
+ 		zio_nowait(dio);
+ 
+-	return (ZIO_PIPELINE_CONTINUE);
+	return (zio);
+ }
+ 
+ ddt_entry_t *freedde; /* for debugging */
+ 
+-static int
+static zio_t *
+ zio_ddt_free(zio_t *zio)
+ {
+ 	spa_t *spa = zio->io_spa;
+@@ -2916,7 +2939,7 @@ zio_ddt_free(zio_t *zio)
+ 	}
+ 	ddt_exit(ddt);
+ 
+-	return (ZIO_PIPELINE_CONTINUE);
+	return (zio);
+ }
+ 
+ /*
+@@ -2953,7 +2976,7 @@ zio_io_to_allocate(spa_t *spa)
+ 	return (zio);
+ }
+ 
+-static int
+static zio_t *
+ zio_dva_throttle(zio_t *zio)
+ {
+ 	spa_t *spa = zio->io_spa;
+@@ -2963,7 +2986,7 @@ zio_dva_throttle(zio_t *zio)
+ 	    !spa_normal_class(zio->io_spa)->mc_alloc_throttle_enabled ||
+ 	    zio->io_child_type == ZIO_CHILD_GANG ||
+ 	    zio->io_flags & ZIO_FLAG_NODATA) {
+-		return (ZIO_PIPELINE_CONTINUE);
+		return (zio);
+ 	}
+ 
+ 	ASSERT(zio->io_child_type > ZIO_CHILD_GANG);
+@@ -2979,22 +3002,7 @@ zio_dva_throttle(zio_t *zio)
+ 	nio = zio_io_to_allocate(zio->io_spa);
+ 	mutex_exit(&spa->spa_alloc_lock);
+ 
+-	if (nio == zio)
+-		return (ZIO_PIPELINE_CONTINUE);
+-
+-	if (nio != NULL) {
+-		ASSERT(nio->io_stage == ZIO_STAGE_DVA_THROTTLE);
+-		/*
+-		 * We are passing control to a new zio so make sure that
+-		 * it is processed by a different thread. We do this to
+-		 * avoid stack overflows that can occur when parents are
+-		 * throttled and children are making progress. We allow
+-		 * it to go to the head of the taskq since it's already
+-		 * been waiting.
+-		 */
+-		zio_taskq_dispatch(nio, ZIO_TASKQ_ISSUE, B_TRUE);
+-	}
+-	return (ZIO_PIPELINE_STOP);
+	return (nio);
+ }
+ 
+ void
+@@ -3013,7 +3021,7 @@ zio_allocate_dispatch(spa_t *spa)
+ 	zio_taskq_dispatch(zio, ZIO_TASKQ_ISSUE, B_TRUE);
+ }
+ 
+-static int
+static zio_t *
+ zio_dva_allocate(zio_t *zio)
+ {
+ 	spa_t *spa = zio->io_spa;
+@@ -3054,18 +3062,18 @@ zio_dva_allocate(zio_t *zio)
+ 		zio->io_error = error;
+ 	}
+ 
+-	return (ZIO_PIPELINE_CONTINUE);
+	return (zio);
+ }
+ 
+-static int
+static zio_t *
+ zio_dva_free(zio_t *zio)
+ {
+ 	metaslab_free(zio->io_spa, zio->io_bp, zio->io_txg, B_FALSE);
+ 
+-	return (ZIO_PIPELINE_CONTINUE);
+	return (zio);
+ }
+ 
+-static int
+static zio_t *
+ zio_dva_claim(zio_t *zio)
+ {
+ 	int error;
+@@ -3074,7 +3082,7 @@ zio_dva_claim(zio_t *zio)
+ 	if (error)
+ 		zio->io_error = error;
+ 
+-	return (ZIO_PIPELINE_CONTINUE);
+	return (zio);
+ }
+ 
+ /*
+@@ -3172,7 +3180,7 @@ zio_free_zil(spa_t *spa, uint64_t txg, blkptr_t *bp)
+  * force the underlying vdev layers to call either zio_execute() or
+  * zio_interrupt() to ensure that the pipeline continues with the correct I/O.
+  */
+-static int
+static zio_t *
+ zio_vdev_io_start(zio_t *zio)
+ {
+ 	vdev_t *vd = zio->io_vd;
+@@ -3192,7 +3200,7 @@ zio_vdev_io_start(zio_t *zio)
+ 		 * The mirror_ops handle multiple DVAs in a single BP.
+ 		 */
+ 		vdev_mirror_ops.vdev_op_io_start(zio);
+-		return (ZIO_PIPELINE_STOP);
+		return (NULL);
+ 	}
+ 
+ 	ASSERT3P(zio->io_logical, !=, zio);
+@@ -3269,31 +3277,31 @@ zio_vdev_io_start(zio_t *zio)
+ 	    !vdev_dtl_contains(vd, DTL_PARTIAL, zio->io_txg, 1)) {
+ 		ASSERT(zio->io_type == ZIO_TYPE_WRITE);
+ 		zio_vdev_io_bypass(zio);
+-		return (ZIO_PIPELINE_CONTINUE);
+		return (zio);
+ 	}
+ 
+ 	if (vd->vdev_ops->vdev_op_leaf &&
+ 	    (zio->io_type == ZIO_TYPE_READ || zio->io_type == ZIO_TYPE_WRITE)) {
+ 
+ 		if (zio->io_type == ZIO_TYPE_READ && vdev_cache_read(zio))
+-			return (ZIO_PIPELINE_CONTINUE);
+			return (zio);
+ 
+ 		if ((zio = vdev_queue_io(zio)) == NULL)
+-			return (ZIO_PIPELINE_STOP);
+			return (NULL);
+ 
+ 		if (!vdev_accessible(vd, zio)) {
+ 			zio->io_error = SET_ERROR(ENXIO);
+ 			zio_interrupt(zio);
+-			return (ZIO_PIPELINE_STOP);
+			return (NULL);
+ 		}
+ 		zio->io_delay = gethrtime();
+ 	}
+ 
+ 	vd->vdev_ops->vdev_op_io_start(zio);
+-	return (ZIO_PIPELINE_STOP);
+	return (NULL);
+ }
+ 
+-static int
+static zio_t *
+ zio_vdev_io_done(zio_t *zio)
+ {
+ 	vdev_t *vd = zio->io_vd;
+@@ -3301,7 +3309,7 @@ zio_vdev_io_done(zio_t *zio)
+ 	boolean_t unexpected_error = B_FALSE;
+ 
+ 	if (zio_wait_for_children(zio, ZIO_CHILD_VDEV_BIT, ZIO_WAIT_DONE)) {
+-		return (ZIO_PIPELINE_STOP);
+		return (NULL);
+ 	}
+ 
+ 	ASSERT(zio->io_type == ZIO_TYPE_READ || zio->io_type == ZIO_TYPE_WRITE);
+@@ -3337,7 +3345,7 @@ zio_vdev_io_done(zio_t *zio)
+ 	if (unexpected_error)
+ 		VERIFY(vdev_probe(vd, zio) == NULL);
+ 
+-	return (ZIO_PIPELINE_CONTINUE);
+	return (zio);
+ }
+ 
+ /*
+@@ -3366,13 +3374,13 @@ zio_vsd_default_cksum_report(zio_t *zio, zio_cksum_report_t *zcr, void *ignored)
+ 	zcr->zcr_free = zio_abd_free;
+ }
+ 
+-static int
+static zio_t *
+ zio_vdev_io_assess(zio_t *zio)
+ {
+ 	vdev_t *vd = zio->io_vd;
+ 
+ 	if (zio_wait_for_children(zio, ZIO_CHILD_VDEV_BIT, ZIO_WAIT_DONE)) {
+-		return (ZIO_PIPELINE_STOP);
+		return (NULL);
+ 	}
+ 
+ 	if (vd == NULL && !(zio->io_flags & ZIO_FLAG_CONFIG_WRITER))
+@@ -3402,7 +3410,7 @@ zio_vdev_io_assess(zio_t *zio)
+ 		zio->io_stage = ZIO_STAGE_VDEV_IO_START >> 1;
+ 		zio_taskq_dispatch(zio, ZIO_TASKQ_ISSUE,
+ 		    zio_requeue_io_start_cut_in_line);
+-		return (ZIO_PIPELINE_STOP);
+		return (NULL);
+ 	}
+ 
+ 	/*
+@@ -3442,7 +3450,7 @@ zio_vdev_io_assess(zio_t *zio)
+ 		zio->io_physdone(zio->io_logical);
+ 	}
+ 
+-	return (ZIO_PIPELINE_CONTINUE);
+	return (zio);
+ }
+ 
+ void
+@@ -3477,7 +3485,7 @@ zio_vdev_io_bypass(zio_t *zio)
+  * Generate and verify checksums
+  * ==========================================================================
+  */
+-static int
+static zio_t *
+ zio_checksum_generate(zio_t *zio)
+ {
+ 	blkptr_t *bp = zio->io_bp;
+@@ -3491,7 +3499,7 @@ zio_checksum_generate(zio_t *zio)
+ 		checksum = zio->io_prop.zp_checksum;
+ 
+ 		if (checksum == ZIO_CHECKSUM_OFF)
+-			return (ZIO_PIPELINE_CONTINUE);
+			return (zio);
+ 
+ 		ASSERT(checksum == ZIO_CHECKSUM_LABEL);
+ 	} else {
+@@ -3505,10 +3513,10 @@ zio_checksum_generate(zio_t *zio)
+ 
+ 	zio_checksum_compute(zio, checksum, zio->io_abd, zio->io_size);
+ 
+-	return (ZIO_PIPELINE_CONTINUE);
+	return (zio);
+ }
+ 
+-static int
+static zio_t *
+ zio_checksum_verify(zio_t *zio)
+ {
+ 	zio_bad_cksum_t info;
+@@ -3523,7 +3531,7 @@ zio_checksum_verify(zio_t *zio)
+ 		 * We're either verifying a label checksum, or nothing at all.
+ 		 */
+ 		if (zio->io_prop.zp_checksum == ZIO_CHECKSUM_OFF)
+-			return (ZIO_PIPELINE_CONTINUE);
+			return (zio);
+ 
+ 		ASSERT(zio->io_prop.zp_checksum == ZIO_CHECKSUM_LABEL);
+ 	}
+@@ -3538,7 +3546,7 @@ zio_checksum_verify(zio_t *zio)
+ 		}
+ 	}
+ 
+-	return (ZIO_PIPELINE_CONTINUE);
+	return (zio);
+ }
+ 
+ /*
+@@ -3581,7 +3589,7 @@ zio_worst_error(int e1, int e2)
+  * I/O completion
+  * ==========================================================================
+  */
+-static int
+static zio_t *
+ zio_ready(zio_t *zio)
+ {
+ 	blkptr_t *bp = zio->io_bp;
+@@ -3590,7 +3598,7 @@ zio_ready(zio_t *zio)
+ 
+ 	if (zio_wait_for_children(zio, ZIO_CHILD_GANG_BIT | ZIO_CHILD_DDT_BIT,
+ 	    ZIO_WAIT_READY)) {
+-		return (ZIO_PIPELINE_STOP);
+		return (NULL);
+ 	}
+ 
+ 	if (zio->io_ready) {
+@@ -3636,7 +3644,7 @@ zio_ready(zio_t *zio)
+ 	 */
+ 	for (; pio != NULL; pio = pio_next) {
+ 		pio_next = zio_walk_parents(zio, &zl);
+-		zio_notify_parent(pio, zio, ZIO_WAIT_READY);
+		zio_notify_parent(pio, zio, ZIO_WAIT_READY, NULL);
+ 	}
+ 
+ 	if (zio->io_flags & ZIO_FLAG_NODATA) {
+@@ -3652,7 +3660,7 @@ zio_ready(zio_t *zio)
+ 	    zio->io_spa->spa_syncing_txg == zio->io_txg)
+ 		zio_handle_ignored_writes(zio);
+ 
+-	return (ZIO_PIPELINE_CONTINUE);
+	return (zio);
+ }
+ 
+ /*
+@@ -3716,7 +3724,7 @@ zio_dva_throttle_done(zio_t *zio)
+ 	zio_allocate_dispatch(zio->io_spa);
+ }
+ 
+-static int
+static zio_t *
+ zio_done(zio_t *zio)
+ {
+ 	/*
+@@ -3733,7 +3741,7 @@ zio_done(zio_t *zio)
+ 	 * wait for them and then repeat this pipeline stage.
+ 	 */
+ 	if (zio_wait_for_children(zio, ZIO_CHILD_ALL_BITS, ZIO_WAIT_DONE)) {
+-		return (ZIO_PIPELINE_STOP);
+		return (NULL);
+ 	}
+ 
+ 	/*
+@@ -3957,7 +3965,12 @@ zio_done(zio_t *zio)
+ 			if ((pio->io_flags & ZIO_FLAG_GODFATHER) &&
+ 			    (zio->io_reexecute & ZIO_REEXECUTE_SUSPEND)) {
+ 				zio_remove_child(pio, zio, remove_zl);
+-				zio_notify_parent(pio, zio, ZIO_WAIT_DONE);
+				/*
+				 * This is a rare code path, so we don't
+				 * bother with "next_to_execute".
+				 */
+				zio_notify_parent(pio, zio, ZIO_WAIT_DONE,
+				    NULL);
+ 			}
+ 		}
+ 
+@@ -3969,7 +3982,11 @@ zio_done(zio_t *zio)
+ 			 */
+ 			ASSERT(!(zio->io_flags & ZIO_FLAG_GODFATHER));
+ 			zio->io_flags |= ZIO_FLAG_DONT_PROPAGATE;
+-			zio_notify_parent(pio, zio, ZIO_WAIT_DONE);
+			/*
+			 * This is a rare code path, so we don't bother with
+			 * "next_to_execute".
+			 */
+			zio_notify_parent(pio, zio, ZIO_WAIT_DONE, NULL);
+ 		} else if (zio->io_reexecute & ZIO_REEXECUTE_SUSPEND) {
+ 			/*
+ 			 * We'd fail again if we reexecuted now, so suspend
+@@ -3987,7 +4004,7 @@ zio_done(zio_t *zio)
+ 			    (task_func_t *)zio_reexecute, zio, 0,
+ 			    &zio->io_tqent);
+ 		}
+-		return (ZIO_PIPELINE_STOP);
+		return (NULL);
+ 	}
+ 
+ 	ASSERT(zio->io_child_count == 0);
+@@ -4023,12 +4040,17 @@ zio_done(zio_t *zio)
+ 	zio->io_state[ZIO_WAIT_DONE] = 1;
+ 	mutex_exit(&zio->io_lock);
+ 
+	/*
+	 * We are done executing this zio.  We may want to execute a parent
+	 * next.  See the comment in zio_notify_parent().
+	 */
+	zio_t *next_to_execute = NULL;
+ 	zl = NULL;
+ 	for (pio = zio_walk_parents(zio, &zl); pio != NULL; pio = pio_next) {
+ 		zio_link_t *remove_zl = zl;
+ 		pio_next = zio_walk_parents(zio, &zl);
+ 		zio_remove_child(pio, zio, remove_zl);
+-		zio_notify_parent(pio, zio, ZIO_WAIT_DONE);
+		zio_notify_parent(pio, zio, ZIO_WAIT_DONE, &next_to_execute);
+ 	}
+ 
+ 	if (zio->io_waiter != NULL) {
+@@ -4040,7 +4062,7 @@ zio_done(zio_t *zio)
+ 		zio_destroy(zio);
+ 	}
+ 
+-	return (ZIO_PIPELINE_STOP);
+	return (next_to_execute);
+ }
+ 
+ /*
@@ -0,0 +1,221 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Olaf Faaland <faaland1@llnl.gov>
+Date: Mon, 20 Aug 2018 10:05:23 -0700
+Subject: [PATCH] Skip import activity test in more zdb code paths
+
+Since zdb opens the pools read-only, it cannot damage the pool in the
+event the pool is already imported either on the same host or on
+another one.
+
+If the pool vdev structure is changing while zdb is importing the
+pool, it may cause zdb to crash.  However this is unlikely, and in any
+case it's a user space process and can simply be run again.
+
+For this reason, zdb should disable the multihost activity test on
+import that is normally run.
+
+This commit fixes a few zdb code paths where that had been overlooked.
+It also adds tests to ensure that several common use cases handle this
+properly in the future.
+
+Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
+Reviewed-by: Gu Zheng <guzheng2331314@163.com>
+Signed-off-by: Olaf Faaland <faaland1@llnl.gov>
+Closes #7797
+Closes #7801
+---
+ cmd/zdb/zdb.c                                      | 39 +++++++-----
+ tests/runfiles/linux.run                           |  3 +-
+ tests/zfs-tests/tests/functional/mmp/Makefile.am   |  1 +
+ .../zfs-tests/tests/functional/mmp/mmp_on_zdb.ksh  | 74 ++++++++++++++++++++++
+ 4 files changed, 101 insertions(+), 16 deletions(-)
+ create mode 100755 tests/zfs-tests/tests/functional/mmp/mmp_on_zdb.ksh
+
+diff --git a/cmd/zdb/zdb.c b/cmd/zdb/zdb.c
+index 17a0ae25..bb9fd3f1 100644
+--- a/cmd/zdb/zdb.c
+++ b/cmd/zdb/zdb.c
+@@ -24,7 +24,7 @@
+  * Copyright (c) 2011, 2016 by Delphix. All rights reserved.
+  * Copyright (c) 2014 Integros [integros.com]
+  * Copyright 2016 Nexenta Systems, Inc.
+- * Copyright (c) 2017 Lawrence Livermore National Security, LLC.
+ * Copyright (c) 2017, 2018 Lawrence Livermore National Security, LLC.
+  * Copyright (c) 2015, 2017, Intel Corporation.
+  */
+ 
+@@ -3660,6 +3660,22 @@ dump_simulated_ddt(spa_t *spa)
+ }
+ 
+ static void
+zdb_set_skip_mmp(char *target)
+{
+	spa_t *spa;
+
+	/*
+	 * Disable the activity check to allow examination of
+	 * active pools.
+	 */
+	mutex_enter(&spa_namespace_lock);
+	if ((spa = spa_lookup(target)) != NULL) {
+		spa->spa_import_flags |= ZFS_IMPORT_SKIP_MMP;
+	}
+	mutex_exit(&spa_namespace_lock);
+}
+
+static void
+ dump_zpool(spa_t *spa)
+ {
+ 	dsl_pool_t *dp = spa_get_dsl(spa);
+@@ -4412,14 +4428,15 @@ main(int argc, char **argv)
+ 				    target, strerror(ENOMEM));
+ 			}
+ 
+-			/*
+-			 * Disable the activity check to allow examination of
+-			 * active pools.
+-			 */
+ 			if (dump_opt['C'] > 1) {
+ 				(void) printf("\nConfiguration for import:\n");
+ 				dump_nvlist(cfg, 8);
+ 			}
+
+			/*
+			 * Disable the activity check to allow examination of
+			 * active pools.
+			 */
+ 			error = spa_import(target_pool, cfg, NULL,
+ 			    flags | ZFS_IMPORT_SKIP_MMP);
+ 		}
+@@ -4430,16 +4447,7 @@ main(int argc, char **argv)
+ 
+ 	if (error == 0) {
+ 		if (target_is_spa || dump_opt['R']) {
+-			/*
+-			 * Disable the activity check to allow examination of
+-			 * active pools.
+-			 */
+-			mutex_enter(&spa_namespace_lock);
+-			if ((spa = spa_lookup(target)) != NULL) {
+-				spa->spa_import_flags |= ZFS_IMPORT_SKIP_MMP;
+-			}
+-			mutex_exit(&spa_namespace_lock);
+-
+			zdb_set_skip_mmp(target);
+ 			error = spa_open_rewind(target, &spa, FTAG, policy,
+ 			    NULL);
+ 			if (error) {
+@@ -4462,6 +4470,7 @@ main(int argc, char **argv)
+ 				}
+ 			}
+ 		} else {
+			zdb_set_skip_mmp(target);
+ 			error = open_objset(target, DMU_OST_ANY, FTAG, &os);
+ 		}
+ 	}
+diff --git a/tests/runfiles/linux.run b/tests/runfiles/linux.run
+index d8fe6f3a..ddf01aaf 100644
+--- a/tests/runfiles/linux.run
+++ b/tests/runfiles/linux.run
+@@ -499,7 +499,8 @@ tags = ['functional', 'mmap']
+ [tests/functional/mmp]
+ tests = ['mmp_on_thread', 'mmp_on_uberblocks', 'mmp_on_off', 'mmp_interval',
+     'mmp_active_import', 'mmp_inactive_import', 'mmp_exported_import',
+-    'mmp_write_uberblocks', 'mmp_reset_interval', 'multihost_history']
+    'mmp_write_uberblocks', 'mmp_reset_interval', 'multihost_history',
+    'mmp_on_zdb']
+ tags = ['functional', 'mmp']
+ 
+ [tests/functional/mount]
+diff --git a/tests/zfs-tests/tests/functional/mmp/Makefile.am b/tests/zfs-tests/tests/functional/mmp/Makefile.am
+index ecf16f80..f2d0ad0e 100644
+--- a/tests/zfs-tests/tests/functional/mmp/Makefile.am
+++ b/tests/zfs-tests/tests/functional/mmp/Makefile.am
+@@ -10,6 +10,7 @@ dist_pkgdata_SCRIPTS = \
+ 	mmp_exported_import.ksh \
+ 	mmp_write_uberblocks.ksh \
+ 	mmp_reset_interval.ksh \
+	mmp_on_zdb.ksh \
+ 	setup.ksh \
+ 	cleanup.ksh
+ 
+diff --git a/tests/zfs-tests/tests/functional/mmp/mmp_on_zdb.ksh b/tests/zfs-tests/tests/functional/mmp/mmp_on_zdb.ksh
+new file mode 100755
+index 00000000..b646475a
+--- /dev/null
+++ b/tests/zfs-tests/tests/functional/mmp/mmp_on_zdb.ksh
+@@ -0,0 +1,74 @@
+#!/bin/ksh
+
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright (c) 2018 Lawrence Livermore National Security, LLC.
+# Copyright (c) 2018 by Nutanix. All rights reserved.
+#
+
+. $STF_SUITE/include/libtest.shlib
+. $STF_SUITE/tests/functional/mmp/mmp.cfg
+. $STF_SUITE/tests/functional/mmp/mmp.kshlib
+
+#
+# Description:
+# zdb will work while multihost is enabled.
+#
+# Strategy:
+# 1. Create a pool
+# 2. Enable multihost
+# 3. Run zdb -d with pool and dataset arguments.
+# 4. Create a checkpoint
+# 5. Run zdb -kd with pool and dataset arguments.
+# 6. Discard the checkpoint
+# 7. Export the pool
+# 8. Run zdb -ed with pool and dataset arguments.
+#
+
+function cleanup
+{
+	datasetexists $TESTPOOL && destroy_pool $TESTPOOL
+	for DISK in $DISKS; do
+		zpool labelclear -f $DEV_RDSKDIR/$DISK
+	done
+	log_must mmp_clear_hostid
+}
+
+log_assert "Verify zdb -d works while multihost is enabled"
+log_onexit cleanup
+
+verify_runnable "global"
+verify_disk_count "$DISKS" 2
+
+default_mirror_setup_noexit $DISKS
+log_must mmp_set_hostid $HOSTID1
+log_must zpool set multihost=on $TESTPOOL
+log_must zfs snap $TESTPOOL/$TESTFS@snap
+
+log_must zdb -d $TESTPOOL
+log_must zdb -d $TESTPOOL/
+log_must zdb -d $TESTPOOL/$TESTFS
+log_must zdb -d $TESTPOOL/$TESTFS@snap
+
+log_must zpool export $TESTPOOL
+
+log_must zdb -ed $TESTPOOL
+log_must zdb -ed $TESTPOOL/
+log_must zdb -ed $TESTPOOL/$TESTFS
+log_must zdb -ed $TESTPOOL/$TESTFS@snap
+
+log_must zpool import $TESTPOOL
+
+cleanup
+
+log_pass "zdb -d works while multihost is enabled"
@@ -0,0 +1,180 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Brian Behlendorf <behlendorf1@llnl.gov>
+Date: Mon, 24 Sep 2018 17:11:25 -0700
+Subject: [PATCH] Fix statfs(2) for 32-bit user space
+
+When handling a 32-bit statfs() system call the returned fields,
+although 64-bit in the kernel, must be limited to 32-bits or an
+EOVERFLOW error will be returned.
+
+This is less of an issue for block counts since the default
+reported block size in 128KiB. But since it is possible to
+set a smaller block size, these values will be scaled as
+needed to fit in a 32-bit unsigned long.
+
+Unlike most other filesystems the total possible file counts
+are more likely to overflow because they are calculated based
+on the available free space in the pool. In order to prevent
+this the reported value must be capped at 2^32-1. This is
+only for statfs(2) reporting, there are no changes to the
+internal ZFS limits.
+
+Reviewed-by: Andreas Dilger <andreas.dilger@whamcloud.com>
+Reviewed-by: Richard Yao <ryao@gentoo.org>
+Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
+Issue #7927
+Closes #7122
+Closes #7937
+---
+ config/kernel-in-compat-syscall.m4 | 20 ++++++++++++++++++++
+ config/kernel.m4                   |  1 +
+ include/linux/vfs_compat.h         | 18 ++++++++++++++++++
+ module/zfs/zfs_vfsops.c            |  8 +++-----
+ module/zfs/zpl_super.c             | 22 ++++++++++++++++++++++
+ 5 files changed, 64 insertions(+), 5 deletions(-)
+ create mode 100644 config/kernel-in-compat-syscall.m4
+
+diff --git a/config/kernel-in-compat-syscall.m4 b/config/kernel-in-compat-syscall.m4
+new file mode 100644
+index 00000000..9fca9da2
+--- /dev/null
+++ b/config/kernel-in-compat-syscall.m4
+@@ -0,0 +1,20 @@
+dnl #
+dnl # 4.5 API change
+dnl # Added in_compat_syscall() which can be overridden on a per-
+dnl # architecture basis.  Prior to this is_compat_task() was the
+dnl # provided interface.
+dnl #
+AC_DEFUN([ZFS_AC_KERNEL_IN_COMPAT_SYSCALL], [
+	AC_MSG_CHECKING([whether in_compat_syscall() is available])
+	ZFS_LINUX_TRY_COMPILE([
+		#include <linux/compat.h>
+	],[
+		in_compat_syscall();
+	],[
+		AC_MSG_RESULT(yes)
+		AC_DEFINE(HAVE_IN_COMPAT_SYSCALL, 1,
+		    [in_compat_syscall() is available])
+	],[
+		AC_MSG_RESULT(no)
+	])
+])
+diff --git a/config/kernel.m4 b/config/kernel.m4
+index c7ca260c..3777f45c 100644
+--- a/config/kernel.m4
+++ b/config/kernel.m4
+@@ -129,6 +129,7 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
+ 	ZFS_AC_KERNEL_GLOBAL_PAGE_STATE
+ 	ZFS_AC_KERNEL_ACL_HAS_REFCOUNT
+ 	ZFS_AC_KERNEL_USERNS_CAPABILITIES
+	ZFS_AC_KERNEL_IN_COMPAT_SYSCALL
+ 
+ 	AS_IF([test "$LINUX_OBJ" != "$LINUX"], [
+ 		KERNELMAKE_PARAMS="$KERNELMAKE_PARAMS O=$LINUX_OBJ"
+diff --git a/include/linux/vfs_compat.h b/include/linux/vfs_compat.h
+index c8203bd5..90b3cca7 100644
+--- a/include/linux/vfs_compat.h
+++ b/include/linux/vfs_compat.h
+@@ -30,6 +30,7 @@
+ #include <sys/taskq.h>
+ #include <sys/cred.h>
+ #include <linux/backing-dev.h>
+#include <linux/compat.h>
+ 
+ /*
+  * 2.6.28 API change,
+@@ -626,4 +627,21 @@ inode_set_iversion(struct inode *ip, u64 val)
+ }
+ #endif
+ 
+/*
+ * Returns true when called in the context of a 32-bit system call.
+ */
+static inline int
+zpl_is_32bit_api(void)
+{
+#ifdef CONFIG_COMPAT
+#ifdef HAVE_IN_COMPAT_SYSCALL
+	return (in_compat_syscall());
+#else
+	return (is_compat_task());
+#endif
+#else
+	return (BITS_PER_LONG == 32);
+#endif
+}
+
+ #endif /* _ZFS_VFS_H */
+diff --git a/module/zfs/zfs_vfsops.c b/module/zfs/zfs_vfsops.c
+index 76113393..bcdfa26b 100644
+--- a/module/zfs/zfs_vfsops.c
+++ b/module/zfs/zfs_vfsops.c
+@@ -1245,15 +1245,13 @@ zfs_statvfs(struct dentry *dentry, struct kstatfs *statp)
+ {
+ 	zfsvfs_t *zfsvfs = dentry->d_sb->s_fs_info;
+ 	uint64_t refdbytes, availbytes, usedobjs, availobjs;
+-	uint64_t fsid;
+-	uint32_t bshift;
+ 
+ 	ZFS_ENTER(zfsvfs);
+ 
+ 	dmu_objset_space(zfsvfs->z_os,
+ 	    &refdbytes, &availbytes, &usedobjs, &availobjs);
+ 
+-	fsid = dmu_objset_fsid_guid(zfsvfs->z_os);
+	uint64_t fsid = dmu_objset_fsid_guid(zfsvfs->z_os);
+ 	/*
+ 	 * The underlying storage pool actually uses multiple block
+ 	 * size.  Under Solaris frsize (fragment size) is reported as
+@@ -1265,7 +1263,7 @@ zfs_statvfs(struct dentry *dentry, struct kstatfs *statp)
+ 	 */
+ 	statp->f_frsize = zfsvfs->z_max_blksz;
+ 	statp->f_bsize = zfsvfs->z_max_blksz;
+-	bshift = fls(statp->f_bsize) - 1;
+	uint32_t bshift = fls(statp->f_bsize) - 1;
+ 
+ 	/*
+ 	 * The following report "total" blocks of various kinds in
+@@ -1282,7 +1280,7 @@ zfs_statvfs(struct dentry *dentry, struct kstatfs *statp)
+ 	 * static metadata.  ZFS doesn't preallocate files, so the best
+ 	 * we can do is report the max that could possibly fit in f_files,
+ 	 * and that minus the number actually used in f_ffree.
+-	 * For f_ffree, report the smaller of the number of object available
+	 * For f_ffree, report the smaller of the number of objects available
+ 	 * and the number of blocks (each object will take at least a block).
+ 	 */
+ 	statp->f_ffree = MIN(availobjs, availbytes >> DNODE_SHIFT);
+diff --git a/module/zfs/zpl_super.c b/module/zfs/zpl_super.c
+index 5c426b0a..216c7940 100644
+--- a/module/zfs/zpl_super.c
+++ b/module/zfs/zpl_super.c
+@@ -181,6 +181,28 @@ zpl_statfs(struct dentry *dentry, struct kstatfs *statp)
+ 	spl_fstrans_unmark(cookie);
+ 	ASSERT3S(error, <=, 0);
+ 
+	/*
+	 * If required by a 32-bit system call, dynamically scale the
+	 * block size up to 16MiB and decrease the block counts.  This
+	 * allows for a maximum size of 64EiB to be reported.  The file
+	 * counts must be artificially capped at 2^32-1.
+	 */
+	if (unlikely(zpl_is_32bit_api())) {
+		while (statp->f_blocks > UINT32_MAX &&
+		    statp->f_bsize < SPA_MAXBLOCKSIZE) {
+			statp->f_frsize <<= 1;
+			statp->f_bsize <<= 1;
+
+			statp->f_blocks >>= 1;
+			statp->f_bfree >>= 1;
+			statp->f_bavail >>= 1;
+		}
+
+		uint64_t usedobjs = statp->f_files - statp->f_ffree;
+		statp->f_ffree = MIN(statp->f_ffree, UINT32_MAX - usedobjs);
+		statp->f_files = statp->f_ffree + usedobjs;
+	}
+
+ 	return (error);
+ }
+ 
@@ -0,0 +1,86 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Gregor Kopka <mailfrom-github@kopka.net>
+Date: Wed, 26 Sep 2018 01:29:16 +0200
+Subject: [PATCH] Zpool iostat: remove latency/queue scaling
+
+Bandwidth and iops are average per second while *_wait are averages
+per request for latency or, for queue depths, an instantaneous
+measurement at the end of an interval (according to man zpool).
+
+When calculating the first two it makes sense to do
+x/interval_duration (x being the increase in total bytes or number of
+requests over the duration of the interval, interval_duration in
+seconds) to 'scale' from amount/interval_duration to amount/second.
+
+But applying the same math for the latter (*_wait latencies/queue) is
+wrong as there is no interval_duration component in the values (these
+are time/requests to get to average_time/request or already an
+absulute number).
+
+This bug leads to the only correct continuous *_wait figures for both
+latencies and queue depths from 'zpool iostat -l/q' being with
+duration=1 as then the wrong math cancels itself (x/1 is a nop).
+
+This removes temporal scaling from latency and queue depth figures.
+
+Reviewed-by: Tony Hutter <hutter2@llnl.gov>
+Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
+Signed-off-by: Gregor Kopka <gregor@kopka.net>
+Closes #7945
+Closes #7694
+---
+ cmd/zpool/zpool_main.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/cmd/zpool/zpool_main.c b/cmd/zpool/zpool_main.c
+index a4fd0321..591e2e5c 100644
+--- a/cmd/zpool/zpool_main.c
+++ b/cmd/zpool/zpool_main.c
+@@ -3493,7 +3493,7 @@ single_histo_average(uint64_t *histo, unsigned int buckets)
+ 
+ static void
+ print_iostat_queues(iostat_cbdata_t *cb, nvlist_t *oldnv,
+-    nvlist_t *newnv, double scale)
+    nvlist_t *newnv)
+ {
+ 	int i;
+ 	uint64_t val;
+@@ -3523,7 +3523,7 @@ print_iostat_queues(iostat_cbdata_t *cb, nvlist_t *oldnv,
+ 		format = ZFS_NICENUM_1024;
+ 
+ 	for (i = 0; i < ARRAY_SIZE(names); i++) {
+-		val = nva[i].data[0] * scale;
+		val = nva[i].data[0];
+ 		print_one_stat(val, format, column_width, cb->cb_scripted);
+ 	}
+ 
+@@ -3532,7 +3532,7 @@ print_iostat_queues(iostat_cbdata_t *cb, nvlist_t *oldnv,
+ 
+ static void
+ print_iostat_latency(iostat_cbdata_t *cb, nvlist_t *oldnv,
+-    nvlist_t *newnv, double scale)
+    nvlist_t *newnv)
+ {
+ 	int i;
+ 	uint64_t val;
+@@ -3562,7 +3562,7 @@ print_iostat_latency(iostat_cbdata_t *cb, nvlist_t *oldnv,
+ 	/* Print our avg latencies on the line */
+ 	for (i = 0; i < ARRAY_SIZE(names); i++) {
+ 		/* Compute average latency for a latency histo */
+-		val = single_histo_average(nva[i].data, nva[i].count) * scale;
+		val = single_histo_average(nva[i].data, nva[i].count);
+ 		print_one_stat(val, format, column_width, cb->cb_scripted);
+ 	}
+ 	free_calc_stats(nva, ARRAY_SIZE(names));
+@@ -3701,9 +3701,9 @@ print_vdev_stats(zpool_handle_t *zhp, const char *name, nvlist_t *oldnv,
+ 		print_iostat_default(calcvs, cb, scale);
+ 	}
+ 	if (cb->cb_flags & IOS_LATENCY_M)
+-		print_iostat_latency(cb, oldnv, newnv, scale);
+		print_iostat_latency(cb, oldnv, newnv);
+ 	if (cb->cb_flags & IOS_QUEUES_M)
+-		print_iostat_queues(cb, oldnv, newnv, scale);
+		print_iostat_queues(cb, oldnv, newnv);
+ 	if (cb->cb_flags & IOS_ANYHISTO_M) {
+ 		printf("\n");
+ 		print_iostat_histos(cb, oldnv, newnv, scale, name);
@@ -0,0 +1,878 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Tim Schumacher <timschumi@gmx.de>
+Date: Wed, 26 Sep 2018 19:29:26 +0200
+Subject: [PATCH] Linux 4.19-rc3+ compat: Remove refcount_t compat
+
+torvalds/linux@59b57717f ("blkcg: delay blkg destruction until
+after writeback has finished") added a refcount_t to the blkcg
+structure. Due to the refcount_t compatibility code, zfs_refcount_t
+was used by mistake.
+
+Resolve this by removing the compatibility code and replacing the
+occurrences of refcount_t with zfs_refcount_t.
+
+Reviewed-by: Franz Pletz <fpletz@fnordicwalking.de>
+Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
+Signed-off-by: Tim Schumacher <timschumi@gmx.de>
+Closes #7885
+Closes #7932
+---
+ cmd/ztest/ztest.c           |  6 +++---
+ include/linux/vfs_compat.h  |  5 -----
+ include/sys/abd.h           |  2 +-
+ include/sys/arc.h           |  2 +-
+ include/sys/arc_impl.h      |  8 +++----
+ include/sys/dbuf.h          |  2 +-
+ include/sys/dmu_tx.h        |  4 ++--
+ include/sys/dnode.h         |  4 ++--
+ include/sys/dsl_dataset.h   |  2 +-
+ include/sys/metaslab_impl.h |  5 ++---
+ include/sys/refcount.h      | 52 ++++++++++++++++++++-------------------------
+ include/sys/rrwlock.h       |  4 ++--
+ include/sys/sa_impl.h       |  2 +-
+ include/sys/spa_impl.h      |  6 +++---
+ include/sys/zap.h           |  2 +-
+ include/sys/zfs_znode.h     |  2 +-
+ module/zfs/arc.c            | 12 +++++------
+ module/zfs/dbuf.c           | 10 ++++-----
+ module/zfs/dmu.c            |  2 +-
+ module/zfs/dmu_tx.c         |  6 +++---
+ module/zfs/dnode.c          |  6 +++---
+ module/zfs/dsl_dataset.c    |  2 +-
+ module/zfs/metaslab.c       |  4 ++--
+ module/zfs/refcount.c       | 30 +++++++++++++-------------
+ module/zfs/rrwlock.c        |  4 ++--
+ module/zfs/sa.c             |  2 +-
+ module/zfs/spa_misc.c       |  8 +++----
+ module/zfs/zfs_ctldir.c     | 10 ++++-----
+ module/zfs/zfs_znode.c      |  2 +-
+ 29 files changed, 97 insertions(+), 109 deletions(-)
+
+diff --git a/cmd/ztest/ztest.c b/cmd/ztest/ztest.c
+index a410eeef..24967a76 100644
+--- a/cmd/ztest/ztest.c
+++ b/cmd/ztest/ztest.c
+@@ -1189,7 +1189,7 @@ ztest_spa_prop_set_uint64(zpool_prop_t prop, uint64_t value)
+  */
+ typedef struct {
+ 	list_node_t z_lnode;
+-	refcount_t z_refcnt;
+	zfs_refcount_t z_refcnt;
+ 	uint64_t z_object;
+ 	zfs_rlock_t z_range_lock;
+ } ztest_znode_t;
+@@ -1248,13 +1248,13 @@ ztest_znode_get(ztest_ds_t *zd, uint64_t object)
+ 	for (zp = list_head(&zll->z_list); (zp);
+ 	    zp = list_next(&zll->z_list, zp)) {
+ 		if (zp->z_object == object) {
+-			refcount_add(&zp->z_refcnt, RL_TAG);
+			zfs_refcount_add(&zp->z_refcnt, RL_TAG);
+ 			break;
+ 		}
+ 	}
+ 	if (zp == NULL) {
+ 		zp = ztest_znode_init(object);
+-		refcount_add(&zp->z_refcnt, RL_TAG);
+		zfs_refcount_add(&zp->z_refcnt, RL_TAG);
+ 		list_insert_head(&zll->z_list, zp);
+ 	}
+ 	mutex_exit(&zll->z_lock);
+diff --git a/include/linux/vfs_compat.h b/include/linux/vfs_compat.h
+index 90b3cca7..c01f5850 100644
+--- a/include/linux/vfs_compat.h
+++ b/include/linux/vfs_compat.h
+@@ -297,9 +297,6 @@ lseek_execute(
+  * This is several orders of magnitude larger than expected grace period.
+  * At 60 seconds the kernel will also begin issuing RCU stall warnings.
+  */
+-#ifdef refcount_t
+-#undef refcount_t
+-#endif
+ 
+ #include <linux/posix_acl.h>
+ 
+@@ -430,8 +427,6 @@ typedef mode_t zpl_equivmode_t;
+ #define	zpl_posix_acl_valid(ip, acl)  posix_acl_valid(acl)
+ #endif
+ 
+-#define	refcount_t	zfs_refcount_t
+-
+ #endif /* CONFIG_FS_POSIX_ACL */
+ 
+ /*
+diff --git a/include/sys/abd.h b/include/sys/abd.h
+index cd710501..4898606a 100644
+--- a/include/sys/abd.h
+++ b/include/sys/abd.h
+@@ -52,7 +52,7 @@ typedef struct abd {
+ 	abd_flags_t	abd_flags;
+ 	uint_t		abd_size;	/* excludes scattered abd_offset */
+ 	struct abd	*abd_parent;
+-	refcount_t	abd_children;
+	zfs_refcount_t	abd_children;
+ 	union {
+ 		struct abd_scatter {
+ 			uint_t		abd_offset;
+diff --git a/include/sys/arc.h b/include/sys/arc.h
+index 1ea4937b..943ebfb5 100644
+--- a/include/sys/arc.h
+++ b/include/sys/arc.h
+@@ -76,7 +76,7 @@ struct arc_prune {
+ 	void			*p_private;
+ 	uint64_t		p_adjust;
+ 	list_node_t		p_node;
+-	refcount_t		p_refcnt;
+	zfs_refcount_t		p_refcnt;
+ };
+ 
+ typedef enum arc_strategy {
+diff --git a/include/sys/arc_impl.h b/include/sys/arc_impl.h
+index c6363f2a..ed2b0abe 100644
+--- a/include/sys/arc_impl.h
+++ b/include/sys/arc_impl.h
+@@ -74,12 +74,12 @@ typedef struct arc_state {
+ 	/*
+ 	 * total amount of evictable data in this state
+ 	 */
+-	refcount_t arcs_esize[ARC_BUFC_NUMTYPES];
+	zfs_refcount_t arcs_esize[ARC_BUFC_NUMTYPES];
+ 	/*
+ 	 * total amount of data in this state; this includes: evictable,
+ 	 * non-evictable, ARC_BUFC_DATA, and ARC_BUFC_METADATA.
+ 	 */
+-	refcount_t arcs_size;
+	zfs_refcount_t arcs_size;
+ 	/*
+ 	 * supports the "dbufs" kstat
+ 	 */
+@@ -163,7 +163,7 @@ typedef struct l1arc_buf_hdr {
+ 	uint32_t		b_l2_hits;
+ 
+ 	/* self protecting */
+-	refcount_t		b_refcnt;
+	zfs_refcount_t		b_refcnt;
+ 
+ 	arc_callback_t		*b_acb;
+ 	abd_t			*b_pabd;
+@@ -180,7 +180,7 @@ typedef struct l2arc_dev {
+ 	kmutex_t		l2ad_mtx;	/* lock for buffer list */
+ 	list_t			l2ad_buflist;	/* buffer list */
+ 	list_node_t		l2ad_node;	/* device list node */
+-	refcount_t		l2ad_alloc;	/* allocated bytes */
+	zfs_refcount_t		l2ad_alloc;	/* allocated bytes */
+ } l2arc_dev_t;
+ 
+ typedef struct l2arc_buf_hdr {
+diff --git a/include/sys/dbuf.h b/include/sys/dbuf.h
+index f3f2007d..127acad3 100644
+--- a/include/sys/dbuf.h
+++ b/include/sys/dbuf.h
+@@ -212,7 +212,7 @@ typedef struct dmu_buf_impl {
+ 	 * If nonzero, the buffer can't be destroyed.
+ 	 * Protected by db_mtx.
+ 	 */
+-	refcount_t db_holds;
+	zfs_refcount_t db_holds;
+ 
+ 	/* buffer holding our data */
+ 	arc_buf_t *db_buf;
+diff --git a/include/sys/dmu_tx.h b/include/sys/dmu_tx.h
+index 74b7e111..96bbcb05 100644
+--- a/include/sys/dmu_tx.h
+++ b/include/sys/dmu_tx.h
+@@ -97,8 +97,8 @@ typedef struct dmu_tx_hold {
+ 	dmu_tx_t *txh_tx;
+ 	list_node_t txh_node;
+ 	struct dnode *txh_dnode;
+-	refcount_t txh_space_towrite;
+-	refcount_t txh_memory_tohold;
+	zfs_refcount_t txh_space_towrite;
+	zfs_refcount_t txh_memory_tohold;
+ 	enum dmu_tx_hold_type txh_type;
+ 	uint64_t txh_arg1;
+ 	uint64_t txh_arg2;
+diff --git a/include/sys/dnode.h b/include/sys/dnode.h
+index 2dd087b3..1e77e0a3 100644
+--- a/include/sys/dnode.h
+++ b/include/sys/dnode.h
+@@ -266,8 +266,8 @@ struct dnode {
+ 	uint8_t *dn_dirtyctx_firstset;		/* dbg: contents meaningless */
+ 
+ 	/* protected by own devices */
+-	refcount_t dn_tx_holds;
+-	refcount_t dn_holds;
+	zfs_refcount_t dn_tx_holds;
+	zfs_refcount_t dn_holds;
+ 
+ 	kmutex_t dn_dbufs_mtx;
+ 	/*
+diff --git a/include/sys/dsl_dataset.h b/include/sys/dsl_dataset.h
+index 1281674b..d96f526d 100644
+--- a/include/sys/dsl_dataset.h
+++ b/include/sys/dsl_dataset.h
+@@ -186,7 +186,7 @@ typedef struct dsl_dataset {
+ 	 * Owning counts as a long hold.  See the comments above
+ 	 * dsl_pool_hold() for details.
+ 	 */
+-	refcount_t ds_longholds;
+	zfs_refcount_t ds_longholds;
+ 
+ 	/* no locking; only for making guesses */
+ 	uint64_t ds_trysnap_txg;
+diff --git a/include/sys/metaslab_impl.h b/include/sys/metaslab_impl.h
+index f8a713a4..60151937 100644
+--- a/include/sys/metaslab_impl.h
+++ b/include/sys/metaslab_impl.h
+@@ -179,8 +179,7 @@ struct metaslab_class {
+ 	 * number of allocations allowed.
+ 	 */
+ 	uint64_t		mc_alloc_max_slots;
+-	refcount_t		mc_alloc_slots;
+-
+	zfs_refcount_t		mc_alloc_slots;
+ 	uint64_t		mc_alloc_groups; /* # of allocatable groups */
+ 
+ 	uint64_t		mc_alloc;	/* total allocated space */
+@@ -230,7 +229,7 @@ struct metaslab_group {
+ 	 * are unable to handle their share of allocations.
+ 	 */
+ 	uint64_t		mg_max_alloc_queue_depth;
+-	refcount_t		mg_alloc_queue_depth;
+	zfs_refcount_t		mg_alloc_queue_depth;
+ 
+ 	/*
+ 	 * A metalab group that can no longer allocate the minimum block
+diff --git a/include/sys/refcount.h b/include/sys/refcount.h
+index a96220b2..5c5198d8 100644
+--- a/include/sys/refcount.h
+++ b/include/sys/refcount.h
+@@ -41,17 +41,6 @@ extern "C" {
+  */
+ #define	FTAG ((char *)__func__)
+ 
+-/*
+- * Starting with 4.11, torvalds/linux@f405df5, the linux kernel defines a
+- * refcount_t type of its own.  The macro below effectively changes references
+- * in the ZFS code from refcount_t to zfs_refcount_t at compile time, so that
+- * existing code need not be altered, reducing conflicts when landing openZFS
+- * patches.
+- */
+-
+-#define	refcount_t	zfs_refcount_t
+-#define	refcount_add	zfs_refcount_add
+-
+ #ifdef	ZFS_DEBUG
+ typedef struct reference {
+ 	list_node_t ref_link;
+@@ -69,23 +58,28 @@ typedef struct refcount {
+ 	uint64_t rc_removed_count;
+ } zfs_refcount_t;
+ 
+-/* Note: refcount_t must be initialized with refcount_create[_untracked]() */
+-
+-void refcount_create(refcount_t *rc);
+-void refcount_create_untracked(refcount_t *rc);
+-void refcount_create_tracked(refcount_t *rc);
+-void refcount_destroy(refcount_t *rc);
+-void refcount_destroy_many(refcount_t *rc, uint64_t number);
+-int refcount_is_zero(refcount_t *rc);
+-int64_t refcount_count(refcount_t *rc);
+-int64_t zfs_refcount_add(refcount_t *rc, void *holder_tag);
+-int64_t refcount_remove(refcount_t *rc, void *holder_tag);
+-int64_t refcount_add_many(refcount_t *rc, uint64_t number, void *holder_tag);
+-int64_t refcount_remove_many(refcount_t *rc, uint64_t number, void *holder_tag);
+-void refcount_transfer(refcount_t *dst, refcount_t *src);
+-void refcount_transfer_ownership(refcount_t *, void *, void *);
+-boolean_t refcount_held(refcount_t *, void *);
+-boolean_t refcount_not_held(refcount_t *, void *);
+/*
+ * Note: zfs_refcount_t must be initialized with
+ * refcount_create[_untracked]()
+ */
+
+void refcount_create(zfs_refcount_t *rc);
+void refcount_create_untracked(zfs_refcount_t *rc);
+void refcount_create_tracked(zfs_refcount_t *rc);
+void refcount_destroy(zfs_refcount_t *rc);
+void refcount_destroy_many(zfs_refcount_t *rc, uint64_t number);
+int refcount_is_zero(zfs_refcount_t *rc);
+int64_t refcount_count(zfs_refcount_t *rc);
+int64_t zfs_refcount_add(zfs_refcount_t *rc, void *holder_tag);
+int64_t refcount_remove(zfs_refcount_t *rc, void *holder_tag);
+int64_t refcount_add_many(zfs_refcount_t *rc, uint64_t number,
+    void *holder_tag);
+int64_t refcount_remove_many(zfs_refcount_t *rc, uint64_t number,
+    void *holder_tag);
+void refcount_transfer(zfs_refcount_t *dst, zfs_refcount_t *src);
+void refcount_transfer_ownership(zfs_refcount_t *, void *, void *);
+boolean_t refcount_held(zfs_refcount_t *, void *);
+boolean_t refcount_not_held(zfs_refcount_t *, void *);
+ 
+ void refcount_init(void);
+ void refcount_fini(void);
+@@ -94,7 +88,7 @@ void refcount_fini(void);
+ 
+ typedef struct refcount {
+ 	uint64_t rc_count;
+-} refcount_t;
+} zfs_refcount_t;
+ 
+ #define	refcount_create(rc) ((rc)->rc_count = 0)
+ #define	refcount_create_untracked(rc) ((rc)->rc_count = 0)
+diff --git a/include/sys/rrwlock.h b/include/sys/rrwlock.h
+index 7a328fd6..e1c1756c 100644
+--- a/include/sys/rrwlock.h
+++ b/include/sys/rrwlock.h
+@@ -57,8 +57,8 @@ typedef struct rrwlock {
+ 	kmutex_t	rr_lock;
+ 	kcondvar_t	rr_cv;
+ 	kthread_t	*rr_writer;
+-	refcount_t	rr_anon_rcount;
+-	refcount_t	rr_linked_rcount;
+	zfs_refcount_t	rr_anon_rcount;
+	zfs_refcount_t	rr_linked_rcount;
+ 	boolean_t	rr_writer_wanted;
+ 	boolean_t	rr_track_all;
+ } rrwlock_t;
+diff --git a/include/sys/sa_impl.h b/include/sys/sa_impl.h
+index b68b7610..7eddd875 100644
+--- a/include/sys/sa_impl.h
+++ b/include/sys/sa_impl.h
+@@ -110,7 +110,7 @@ typedef struct sa_idx_tab {
+ 	list_node_t	sa_next;
+ 	sa_lot_t	*sa_layout;
+ 	uint16_t	*sa_variable_lengths;
+-	refcount_t	sa_refcount;
+	zfs_refcount_t	sa_refcount;
+ 	uint32_t	*sa_idx_tab;	/* array of offsets */
+ } sa_idx_tab_t;
+ 
+diff --git a/include/sys/spa_impl.h b/include/sys/spa_impl.h
+index fa7490ac..62ac8f67 100644
+--- a/include/sys/spa_impl.h
+++ b/include/sys/spa_impl.h
+@@ -78,7 +78,7 @@ typedef struct spa_config_lock {
+ 	kthread_t	*scl_writer;
+ 	int		scl_write_wanted;
+ 	kcondvar_t	scl_cv;
+-	refcount_t	scl_count;
+	zfs_refcount_t	scl_count;
+ } spa_config_lock_t;
+ 
+ typedef struct spa_config_dirent {
+@@ -281,12 +281,12 @@ struct spa {
+ 
+ 	/*
+ 	 * spa_refcount & spa_config_lock must be the last elements
+-	 * because refcount_t changes size based on compilation options.
+	 * because zfs_refcount_t changes size based on compilation options.
+ 	 * In order for the MDB module to function correctly, the other
+ 	 * fields must remain in the same location.
+ 	 */
+ 	spa_config_lock_t spa_config_lock[SCL_LOCKS]; /* config changes */
+-	refcount_t	spa_refcount;		/* number of opens */
+	zfs_refcount_t	spa_refcount;		/* number of opens */
+ 
+ 	taskq_t		*spa_upgrade_taskq;	/* taskq for upgrade jobs */
+ };
+diff --git a/include/sys/zap.h b/include/sys/zap.h
+index 43b7fbd2..7acc3bec 100644
+--- a/include/sys/zap.h
+++ b/include/sys/zap.h
+@@ -226,7 +226,7 @@ int zap_lookup_norm_by_dnode(dnode_t *dn, const char *name,
+     boolean_t *ncp);
+ 
+ int zap_count_write_by_dnode(dnode_t *dn, const char *name,
+-    int add, refcount_t *towrite, refcount_t *tooverwrite);
+    int add, zfs_refcount_t *towrite, zfs_refcount_t *tooverwrite);
+ 
+ /*
+  * Create an attribute with the given name and value.
+diff --git a/include/sys/zfs_znode.h b/include/sys/zfs_znode.h
+index 26d1eb37..33bc20d1 100644
+--- a/include/sys/zfs_znode.h
+++ b/include/sys/zfs_znode.h
+@@ -209,7 +209,7 @@ typedef struct znode_hold {
+ 	uint64_t	zh_obj;		/* object id */
+ 	kmutex_t	zh_lock;	/* lock serializing object access */
+ 	avl_node_t	zh_node;	/* avl tree linkage */
+-	refcount_t	zh_refcount;	/* active consumer reference count */
+	zfs_refcount_t	zh_refcount;	/* active consumer reference count */
+ } znode_hold_t;
+ 
+ /*
+diff --git a/module/zfs/arc.c b/module/zfs/arc.c
+index bcf74dd6..7518d5c8 100644
+--- a/module/zfs/arc.c
+++ b/module/zfs/arc.c
+@@ -1966,7 +1966,7 @@ add_reference(arc_buf_hdr_t *hdr, void *tag)
+ 
+ 	state = hdr->b_l1hdr.b_state;
+ 
+-	if ((refcount_add(&hdr->b_l1hdr.b_refcnt, tag) == 1) &&
+	if ((zfs_refcount_add(&hdr->b_l1hdr.b_refcnt, tag) == 1) &&
+ 	    (state != arc_anon)) {
+ 		/* We don't use the L2-only state list. */
+ 		if (state != arc_l2c_only) {
+@@ -2505,7 +2505,7 @@ arc_return_buf(arc_buf_t *buf, void *tag)
+ 
+ 	ASSERT3P(buf->b_data, !=, NULL);
+ 	ASSERT(HDR_HAS_L1HDR(hdr));
+-	(void) refcount_add(&hdr->b_l1hdr.b_refcnt, tag);
+	(void) zfs_refcount_add(&hdr->b_l1hdr.b_refcnt, tag);
+ 	(void) refcount_remove(&hdr->b_l1hdr.b_refcnt, arc_onloan_tag);
+ 
+ 	arc_loaned_bytes_update(-arc_buf_size(buf));
+@@ -2519,7 +2519,7 @@ arc_loan_inuse_buf(arc_buf_t *buf, void *tag)
+ 
+ 	ASSERT3P(buf->b_data, !=, NULL);
+ 	ASSERT(HDR_HAS_L1HDR(hdr));
+-	(void) refcount_add(&hdr->b_l1hdr.b_refcnt, arc_onloan_tag);
+	(void) zfs_refcount_add(&hdr->b_l1hdr.b_refcnt, arc_onloan_tag);
+ 	(void) refcount_remove(&hdr->b_l1hdr.b_refcnt, tag);
+ 
+ 	arc_loaned_bytes_update(arc_buf_size(buf));
+@@ -3533,7 +3533,7 @@ arc_prune_async(int64_t adjust)
+ 		if (refcount_count(&ap->p_refcnt) >= 2)
+ 			continue;
+ 
+-		refcount_add(&ap->p_refcnt, ap->p_pfunc);
+		zfs_refcount_add(&ap->p_refcnt, ap->p_pfunc);
+ 		ap->p_adjust = adjust;
+ 		if (taskq_dispatch(arc_prune_taskq, arc_prune_task,
+ 		    ap, TQ_SLEEP) == TASKQID_INVALID) {
+@@ -5549,7 +5549,7 @@ arc_add_prune_callback(arc_prune_func_t *func, void *private)
+ 	refcount_create(&p->p_refcnt);
+ 
+ 	mutex_enter(&arc_prune_mtx);
+-	refcount_add(&p->p_refcnt, &arc_prune_list);
+	zfs_refcount_add(&p->p_refcnt, &arc_prune_list);
+ 	list_insert_head(&arc_prune_list, p);
+ 	mutex_exit(&arc_prune_mtx);
+ 
+@@ -5815,7 +5815,7 @@ arc_release(arc_buf_t *buf, void *tag)
+ 		nhdr->b_l1hdr.b_mfu_hits = 0;
+ 		nhdr->b_l1hdr.b_mfu_ghost_hits = 0;
+ 		nhdr->b_l1hdr.b_l2_hits = 0;
+-		(void) refcount_add(&nhdr->b_l1hdr.b_refcnt, tag);
+		(void) zfs_refcount_add(&nhdr->b_l1hdr.b_refcnt, tag);
+ 		buf->b_hdr = nhdr;
+ 
+ 		mutex_exit(&buf->b_evict_lock);
+diff --git a/module/zfs/dbuf.c b/module/zfs/dbuf.c
+index 6edb39d6..5101c848 100644
+--- a/module/zfs/dbuf.c
+++ b/module/zfs/dbuf.c
+@@ -104,7 +104,7 @@ static boolean_t dbuf_evict_thread_exit;
+  * become eligible for arc eviction.
+  */
+ static multilist_t *dbuf_cache;
+-static refcount_t dbuf_cache_size;
+static zfs_refcount_t dbuf_cache_size;
+ unsigned long  dbuf_cache_max_bytes = 100 * 1024 * 1024;
+ 
+ /* Cap the size of the dbuf cache to log2 fraction of arc size. */
+@@ -2384,7 +2384,7 @@ dbuf_create(dnode_t *dn, uint8_t level, uint64_t blkid,
+ 
+ 	ASSERT(dn->dn_object == DMU_META_DNODE_OBJECT ||
+ 	    refcount_count(&dn->dn_holds) > 0);
+-	(void) refcount_add(&dn->dn_holds, db);
+	(void) zfs_refcount_add(&dn->dn_holds, db);
+ 	atomic_inc_32(&dn->dn_dbufs_count);
+ 
+ 	dprintf_dbuf(db, "db=%p\n", db);
+@@ -2749,7 +2749,7 @@ __dbuf_hold_impl(struct dbuf_hold_impl_data *dh)
+ 		(void) refcount_remove_many(&dbuf_cache_size,
+ 		    dh->dh_db->db.db_size, dh->dh_db);
+ 	}
+-	(void) refcount_add(&dh->dh_db->db_holds, dh->dh_tag);
+	(void) zfs_refcount_add(&dh->dh_db->db_holds, dh->dh_tag);
+ 	DBUF_VERIFY(dh->dh_db);
+ 	mutex_exit(&dh->dh_db->db_mtx);
+ 
+@@ -2873,7 +2873,7 @@ dbuf_rm_spill(dnode_t *dn, dmu_tx_t *tx)
+ void
+ dbuf_add_ref(dmu_buf_impl_t *db, void *tag)
+ {
+-	int64_t holds = refcount_add(&db->db_holds, tag);
+	int64_t holds = zfs_refcount_add(&db->db_holds, tag);
+ 	VERIFY3S(holds, >, 1);
+ }
+ 
+@@ -2893,7 +2893,7 @@ dbuf_try_add_ref(dmu_buf_t *db_fake, objset_t *os, uint64_t obj, uint64_t blkid,
+ 
+ 	if (found_db != NULL) {
+ 		if (db == found_db && dbuf_refcount(db) > db->db_dirtycnt) {
+-			(void) refcount_add(&db->db_holds, tag);
+			(void) zfs_refcount_add(&db->db_holds, tag);
+ 			result = B_TRUE;
+ 		}
+ 		mutex_exit(&found_db->db_mtx);
+diff --git a/module/zfs/dmu.c b/module/zfs/dmu.c
+index a09ac4f9..a76cdd9f 100644
+--- a/module/zfs/dmu.c
+++ b/module/zfs/dmu.c
+@@ -342,7 +342,7 @@ dmu_bonus_hold(objset_t *os, uint64_t object, void *tag, dmu_buf_t **dbp)
+ 	db = dn->dn_bonus;
+ 
+ 	/* as long as the bonus buf is held, the dnode will be held */
+-	if (refcount_add(&db->db_holds, tag) == 1) {
+	if (zfs_refcount_add(&db->db_holds, tag) == 1) {
+ 		VERIFY(dnode_add_ref(dn, db));
+ 		atomic_inc_32(&dn->dn_dbufs_count);
+ 	}
+diff --git a/module/zfs/dmu_tx.c b/module/zfs/dmu_tx.c
+index 6ebff267..b1508ffa 100644
+--- a/module/zfs/dmu_tx.c
+++ b/module/zfs/dmu_tx.c
+@@ -114,7 +114,7 @@ dmu_tx_hold_dnode_impl(dmu_tx_t *tx, dnode_t *dn, enum dmu_tx_hold_type type,
+ 	dmu_tx_hold_t *txh;
+ 
+ 	if (dn != NULL) {
+-		(void) refcount_add(&dn->dn_holds, tx);
+		(void) zfs_refcount_add(&dn->dn_holds, tx);
+ 		if (tx->tx_txg != 0) {
+ 			mutex_enter(&dn->dn_mtx);
+ 			/*
+@@ -124,7 +124,7 @@ dmu_tx_hold_dnode_impl(dmu_tx_t *tx, dnode_t *dn, enum dmu_tx_hold_type type,
+ 			 */
+ 			ASSERT(dn->dn_assigned_txg == 0);
+ 			dn->dn_assigned_txg = tx->tx_txg;
+-			(void) refcount_add(&dn->dn_tx_holds, tx);
+			(void) zfs_refcount_add(&dn->dn_tx_holds, tx);
+ 			mutex_exit(&dn->dn_mtx);
+ 		}
+ 	}
+@@ -916,7 +916,7 @@ dmu_tx_try_assign(dmu_tx_t *tx, uint64_t txg_how)
+ 			if (dn->dn_assigned_txg == 0)
+ 				dn->dn_assigned_txg = tx->tx_txg;
+ 			ASSERT3U(dn->dn_assigned_txg, ==, tx->tx_txg);
+-			(void) refcount_add(&dn->dn_tx_holds, tx);
+			(void) zfs_refcount_add(&dn->dn_tx_holds, tx);
+ 			mutex_exit(&dn->dn_mtx);
+ 		}
+ 		towrite += refcount_count(&txh->txh_space_towrite);
+diff --git a/module/zfs/dnode.c b/module/zfs/dnode.c
+index 4a169c49..77d38c36 100644
+--- a/module/zfs/dnode.c
+++ b/module/zfs/dnode.c
+@@ -1267,7 +1267,7 @@ dnode_hold_impl(objset_t *os, uint64_t object, int flag, int slots,
+ 		if ((flag & DNODE_MUST_BE_FREE) && type != DMU_OT_NONE)
+ 			return (SET_ERROR(EEXIST));
+ 		DNODE_VERIFY(dn);
+-		(void) refcount_add(&dn->dn_holds, tag);
+		(void) zfs_refcount_add(&dn->dn_holds, tag);
+ 		*dnp = dn;
+ 		return (0);
+ 	}
+@@ -1484,7 +1484,7 @@ dnode_hold_impl(objset_t *os, uint64_t object, int flag, int slots,
+ 		return (type == DMU_OT_NONE ? ENOENT : EEXIST);
+ 	}
+ 
+-	if (refcount_add(&dn->dn_holds, tag) == 1)
+	if (zfs_refcount_add(&dn->dn_holds, tag) == 1)
+ 		dbuf_add_ref(db, dnh);
+ 
+ 	mutex_exit(&dn->dn_mtx);
+@@ -1524,7 +1524,7 @@ dnode_add_ref(dnode_t *dn, void *tag)
+ 		mutex_exit(&dn->dn_mtx);
+ 		return (FALSE);
+ 	}
+-	VERIFY(1 < refcount_add(&dn->dn_holds, tag));
+	VERIFY(1 < zfs_refcount_add(&dn->dn_holds, tag));
+ 	mutex_exit(&dn->dn_mtx);
+ 	return (TRUE);
+ }
+diff --git a/module/zfs/dsl_dataset.c b/module/zfs/dsl_dataset.c
+index bd03b486..b7562bcd 100644
+--- a/module/zfs/dsl_dataset.c
+++ b/module/zfs/dsl_dataset.c
+@@ -645,7 +645,7 @@ void
+ dsl_dataset_long_hold(dsl_dataset_t *ds, void *tag)
+ {
+ 	ASSERT(dsl_pool_config_held(ds->ds_dir->dd_pool));
+-	(void) refcount_add(&ds->ds_longholds, tag);
+	(void) zfs_refcount_add(&ds->ds_longholds, tag);
+ }
+ 
+ void
+diff --git a/module/zfs/metaslab.c b/module/zfs/metaslab.c
+index ee24850d..40658d51 100644
+--- a/module/zfs/metaslab.c
+++ b/module/zfs/metaslab.c
+@@ -2663,7 +2663,7 @@ metaslab_group_alloc_increment(spa_t *spa, uint64_t vdev, void *tag, int flags)
+ 	if (!mg->mg_class->mc_alloc_throttle_enabled)
+ 		return;
+ 
+-	(void) refcount_add(&mg->mg_alloc_queue_depth, tag);
+	(void) zfs_refcount_add(&mg->mg_alloc_queue_depth, tag);
+ }
+ 
+ void
+@@ -3360,7 +3360,7 @@ metaslab_class_throttle_reserve(metaslab_class_t *mc, int slots, zio_t *zio,
+ 		 * them individually when an I/O completes.
+ 		 */
+ 		for (d = 0; d < slots; d++) {
+-			reserved_slots = refcount_add(&mc->mc_alloc_slots, zio);
+			reserved_slots = zfs_refcount_add(&mc->mc_alloc_slots, zio);
+ 		}
+ 		zio->io_flags |= ZIO_FLAG_IO_ALLOCATING;
+ 		slot_reserved = B_TRUE;
+diff --git a/module/zfs/refcount.c b/module/zfs/refcount.c
+index a151acea..13f9bb6b 100644
+--- a/module/zfs/refcount.c
+++ b/module/zfs/refcount.c
+@@ -55,7 +55,7 @@ refcount_fini(void)
+ }
+ 
+ void
+-refcount_create(refcount_t *rc)
+refcount_create(zfs_refcount_t *rc)
+ {
+ 	mutex_init(&rc->rc_mtx, NULL, MUTEX_DEFAULT, NULL);
+ 	list_create(&rc->rc_list, sizeof (reference_t),
+@@ -68,21 +68,21 @@ refcount_create(refcount_t *rc)
+ }
+ 
+ void
+-refcount_create_tracked(refcount_t *rc)
+refcount_create_tracked(zfs_refcount_t *rc)
+ {
+ 	refcount_create(rc);
+ 	rc->rc_tracked = B_TRUE;
+ }
+ 
+ void
+-refcount_create_untracked(refcount_t *rc)
+refcount_create_untracked(zfs_refcount_t *rc)
+ {
+ 	refcount_create(rc);
+ 	rc->rc_tracked = B_FALSE;
+ }
+ 
+ void
+-refcount_destroy_many(refcount_t *rc, uint64_t number)
+refcount_destroy_many(zfs_refcount_t *rc, uint64_t number)
+ {
+ 	reference_t *ref;
+ 
+@@ -103,25 +103,25 @@ refcount_destroy_many(refcount_t *rc, uint64_t number)
+ }
+ 
+ void
+-refcount_destroy(refcount_t *rc)
+refcount_destroy(zfs_refcount_t *rc)
+ {
+ 	refcount_destroy_many(rc, 0);
+ }
+ 
+ int
+-refcount_is_zero(refcount_t *rc)
+refcount_is_zero(zfs_refcount_t *rc)
+ {
+ 	return (rc->rc_count == 0);
+ }
+ 
+ int64_t
+-refcount_count(refcount_t *rc)
+refcount_count(zfs_refcount_t *rc)
+ {
+ 	return (rc->rc_count);
+ }
+ 
+ int64_t
+-refcount_add_many(refcount_t *rc, uint64_t number, void *holder)
+refcount_add_many(zfs_refcount_t *rc, uint64_t number, void *holder)
+ {
+ 	reference_t *ref = NULL;
+ 	int64_t count;
+@@ -143,13 +143,13 @@ refcount_add_many(refcount_t *rc, uint64_t number, void *holder)
+ }
+ 
+ int64_t
+-zfs_refcount_add(refcount_t *rc, void *holder)
+zfs_refcount_add(zfs_refcount_t *rc, void *holder)
+ {
+ 	return (refcount_add_many(rc, 1, holder));
+ }
+ 
+ int64_t
+-refcount_remove_many(refcount_t *rc, uint64_t number, void *holder)
+refcount_remove_many(zfs_refcount_t *rc, uint64_t number, void *holder)
+ {
+ 	reference_t *ref;
+ 	int64_t count;
+@@ -197,13 +197,13 @@ refcount_remove_many(refcount_t *rc, uint64_t number, void *holder)
+ }
+ 
+ int64_t
+-refcount_remove(refcount_t *rc, void *holder)
+refcount_remove(zfs_refcount_t *rc, void *holder)
+ {
+ 	return (refcount_remove_many(rc, 1, holder));
+ }
+ 
+ void
+-refcount_transfer(refcount_t *dst, refcount_t *src)
+refcount_transfer(zfs_refcount_t *dst, zfs_refcount_t *src)
+ {
+ 	int64_t count, removed_count;
+ 	list_t list, removed;
+@@ -234,7 +234,7 @@ refcount_transfer(refcount_t *dst, refcount_t *src)
+ }
+ 
+ void
+-refcount_transfer_ownership(refcount_t *rc, void *current_holder,
+refcount_transfer_ownership(zfs_refcount_t *rc, void *current_holder,
+     void *new_holder)
+ {
+ 	reference_t *ref;
+@@ -264,7 +264,7 @@ refcount_transfer_ownership(refcount_t *rc, void *current_holder,
+  * might be held.
+  */
+ boolean_t
+-refcount_held(refcount_t *rc, void *holder)
+refcount_held(zfs_refcount_t *rc, void *holder)
+ {
+ 	reference_t *ref;
+ 
+@@ -292,7 +292,7 @@ refcount_held(refcount_t *rc, void *holder)
+  * since the reference might not be held.
+  */
+ boolean_t
+-refcount_not_held(refcount_t *rc, void *holder)
+refcount_not_held(zfs_refcount_t *rc, void *holder)
+ {
+ 	reference_t *ref;
+ 
+diff --git a/module/zfs/rrwlock.c b/module/zfs/rrwlock.c
+index 704f7606..effff330 100644
+--- a/module/zfs/rrwlock.c
+++ b/module/zfs/rrwlock.c
+@@ -183,9 +183,9 @@ rrw_enter_read_impl(rrwlock_t *rrl, boolean_t prio, void *tag)
+ 	if (rrl->rr_writer_wanted || rrl->rr_track_all) {
+ 		/* may or may not be a re-entrant enter */
+ 		rrn_add(rrl, tag);
+-		(void) refcount_add(&rrl->rr_linked_rcount, tag);
+		(void) zfs_refcount_add(&rrl->rr_linked_rcount, tag);
+ 	} else {
+-		(void) refcount_add(&rrl->rr_anon_rcount, tag);
+		(void) zfs_refcount_add(&rrl->rr_anon_rcount, tag);
+ 	}
+ 	ASSERT(rrl->rr_writer == NULL);
+ 	mutex_exit(&rrl->rr_lock);
+diff --git a/module/zfs/sa.c b/module/zfs/sa.c
+index 1fb1a8b5..df4f6fd8 100644
+--- a/module/zfs/sa.c
+++ b/module/zfs/sa.c
+@@ -1337,7 +1337,7 @@ sa_idx_tab_hold(objset_t *os, sa_idx_tab_t *idx_tab)
+ 	ASSERTV(sa_os_t *sa = os->os_sa);
+ 
+ 	ASSERT(MUTEX_HELD(&sa->sa_lock));
+-	(void) refcount_add(&idx_tab->sa_refcount, NULL);
+	(void) zfs_refcount_add(&idx_tab->sa_refcount, NULL);
+ }
+ 
+ void
+diff --git a/module/zfs/spa_misc.c b/module/zfs/spa_misc.c
+index cc1c641d..f6c9b40b 100644
+--- a/module/zfs/spa_misc.c
+++ b/module/zfs/spa_misc.c
+@@ -80,7 +80,7 @@
+  *	definition they must have an existing reference, and will never need
+  *	to lookup a spa_t by name.
+  *
+- * spa_refcount (per-spa refcount_t protected by mutex)
+ * spa_refcount (per-spa zfs_refcount_t protected by mutex)
+  *
+  *	This reference count keep track of any active users of the spa_t.  The
+  *	spa_t cannot be destroyed or freed while this is non-zero.  Internally,
+@@ -414,7 +414,7 @@ spa_config_tryenter(spa_t *spa, int locks, void *tag, krw_t rw)
+ 			}
+ 			scl->scl_writer = curthread;
+ 		}
+-		(void) refcount_add(&scl->scl_count, tag);
+		(void) zfs_refcount_add(&scl->scl_count, tag);
+ 		mutex_exit(&scl->scl_lock);
+ 	}
+ 	return (1);
+@@ -448,7 +448,7 @@ spa_config_enter(spa_t *spa, int locks, void *tag, krw_t rw)
+ 			}
+ 			scl->scl_writer = curthread;
+ 		}
+-		(void) refcount_add(&scl->scl_count, tag);
+		(void) zfs_refcount_add(&scl->scl_count, tag);
+ 		mutex_exit(&scl->scl_lock);
+ 	}
+ 	ASSERT(wlocks_held <= locks);
+@@ -768,7 +768,7 @@ spa_open_ref(spa_t *spa, void *tag)
+ {
+ 	ASSERT(refcount_count(&spa->spa_refcount) >= spa->spa_minref ||
+ 	    MUTEX_HELD(&spa_namespace_lock));
+-	(void) refcount_add(&spa->spa_refcount, tag);
+	(void) zfs_refcount_add(&spa->spa_refcount, tag);
+ }
+ 
+ /*
+diff --git a/module/zfs/zfs_ctldir.c b/module/zfs/zfs_ctldir.c
+index 0ab5b4f0..de3c5a41 100644
+--- a/module/zfs/zfs_ctldir.c
+++ b/module/zfs/zfs_ctldir.c
+@@ -120,7 +120,7 @@ typedef struct {
+ 	taskqid_t	se_taskqid;	/* scheduled unmount taskqid */
+ 	avl_node_t	se_node_name;	/* zfs_snapshots_by_name link */
+ 	avl_node_t	se_node_objsetid; /* zfs_snapshots_by_objsetid link */
+-	refcount_t	se_refcount;	/* reference count */
+	zfs_refcount_t	se_refcount;	/* reference count */
+ } zfs_snapentry_t;
+ 
+ static void zfsctl_snapshot_unmount_delay_impl(zfs_snapentry_t *se, int delay);
+@@ -169,7 +169,7 @@ zfsctl_snapshot_free(zfs_snapentry_t *se)
+ static void
+ zfsctl_snapshot_hold(zfs_snapentry_t *se)
+ {
+-	refcount_add(&se->se_refcount, NULL);
+	zfs_refcount_add(&se->se_refcount, NULL);
+ }
+ 
+ /*
+@@ -192,7 +192,7 @@ static void
+ zfsctl_snapshot_add(zfs_snapentry_t *se)
+ {
+ 	ASSERT(RW_WRITE_HELD(&zfs_snapshot_lock));
+-	refcount_add(&se->se_refcount, NULL);
+	zfs_refcount_add(&se->se_refcount, NULL);
+ 	avl_add(&zfs_snapshots_by_name, se);
+ 	avl_add(&zfs_snapshots_by_objsetid, se);
+ }
+@@ -269,7 +269,7 @@ zfsctl_snapshot_find_by_name(char *snapname)
+ 	search.se_name = snapname;
+ 	se = avl_find(&zfs_snapshots_by_name, &search, NULL);
+ 	if (se)
+-		refcount_add(&se->se_refcount, NULL);
+		zfs_refcount_add(&se->se_refcount, NULL);
+ 
+ 	return (se);
+ }
+@@ -290,7 +290,7 @@ zfsctl_snapshot_find_by_objsetid(spa_t *spa, uint64_t objsetid)
+ 	search.se_objsetid = objsetid;
+ 	se = avl_find(&zfs_snapshots_by_objsetid, &search, NULL);
+ 	if (se)
+-		refcount_add(&se->se_refcount, NULL);
+		zfs_refcount_add(&se->se_refcount, NULL);
+ 
+ 	return (se);
+ }
+diff --git a/module/zfs/zfs_znode.c b/module/zfs/zfs_znode.c
+index e222c791..0ca10f82 100644
+--- a/module/zfs/zfs_znode.c
+++ b/module/zfs/zfs_znode.c
+@@ -272,7 +272,7 @@ zfs_znode_hold_enter(zfsvfs_t *zfsvfs, uint64_t obj)
+ 		ASSERT3U(zh->zh_obj, ==, obj);
+ 		found = B_TRUE;
+ 	}
+-	refcount_add(&zh->zh_refcount, NULL);
+	zfs_refcount_add(&zh->zh_refcount, NULL);
+ 	mutex_exit(&zfsvfs->z_hold_locks[i]);
+ 
+ 	if (found == B_TRUE)
@@ -0,0 +1,29 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Brian Behlendorf <behlendorf1@llnl.gov>
+Date: Mon, 8 Oct 2018 14:59:34 -0700
+Subject: [PATCH] Fix arc_release() refcount
+
+Update arc_release to use arc_buf_size().  This hunk was accidentally
+dropped when porting compressed send/recv, 2aa34383b.
+
+Reviewed-by: Matthew Ahrens <mahrens@delphix.com>
+Signed-off-by: Tom Caputi <tcaputi@datto.com>
+Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
+Closes #8000
+---
+ module/zfs/arc.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/module/zfs/arc.c b/module/zfs/arc.c
+index 32ac0837..a7fb2429 100644
+--- a/module/zfs/arc.c
+++ b/module/zfs/arc.c
+@@ -5831,7 +5831,7 @@ arc_release(arc_buf_t *buf, void *tag)
+ 
+ 		mutex_exit(&buf->b_evict_lock);
+ 		(void) zfs_refcount_add_many(&arc_anon->arcs_size,
+-		    HDR_GET_LSIZE(nhdr), buf);
+		    arc_buf_size(buf), buf);
+ 	} else {
+ 		mutex_exit(&buf->b_evict_lock);
+ 		ASSERT(zfs_refcount_count(&hdr->b_l1hdr.b_refcnt) == 1);
@@ -0,0 +1,59 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: George Melikov <mail@gmelikov.ru>
+Date: Wed, 24 Oct 2018 06:06:40 +0300
+Subject: [PATCH] Allow use of pool GUID as root pool
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+It's helpful if there are pools with same names,
+but you need to use only one of them.
+
+Main case is twin servers, meanwhile some software
+requires the same name of pools (e.g. Proxmox).
+
+Reviewed-by: Kash Pande <kash@tripleback.net>
+Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
+Signed-off-by: George Melikov <mail@gmelikov.ru>
+Signed-off-by: Igor ‘guardian’ Lidin of Moscow, Russia
+Closes #8052
+---
+ contrib/initramfs/scripts/zfs | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/contrib/initramfs/scripts/zfs b/contrib/initramfs/scripts/zfs
+index 86329e76..dacd71d2 100644
+--- a/contrib/initramfs/scripts/zfs
+++ b/contrib/initramfs/scripts/zfs
+@@ -193,7 +193,7 @@ import_pool()
+ 
+ 	# Verify that the pool isn't already imported
+ 	# Make as sure as we can to not require '-f' to import.
+-	"${ZPOOL}" status "$pool" > /dev/null 2>&1 && return 0
+	"${ZPOOL}" get name,guid -o value -H 2>/dev/null | grep -Fxq "$pool" && return 0
+ 
+ 	# For backwards compatibility, make sure that ZPOOL_IMPORT_PATH is set
+ 	# to something we can use later with the real import(s). We want to
+@@ -772,6 +772,7 @@ mountroot()
+ 	#	root=zfs:<pool>/<dataset>	(uses this for rpool - first part, without 'zfs:')
+ 	#
+ 	# Option <dataset> could also be <snapshot>
+	# Option <pool> could also be <guid>
+ 
+ 	# ------------
+ 	# Support force option
+@@ -889,6 +890,14 @@ mountroot()
+ 		/bin/sh
+ 	fi
+ 
+	# In case the pool was specified as guid, resolve guid to name
+	pool="$("${ZPOOL}" get name,guid -o name,value -H | \
+	    awk -v pool="${ZFS_RPOOL}" '$2 == pool { print $1 }')"
+	if [ -n "$pool" ]; then
+		ZFS_BOOTFS="${pool}/${ZFS_BOOTFS#*/}"
+		ZFS_RPOOL="${pool}"
+	fi
+
+ 	# Set elevator=noop on the root pool's vdevs' disks.  ZFS already
+ 	# does this for wholedisk vdevs (for all pools), so this is only
+ 	# important for partitions.
@@ -0,0 +1,67 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Brian Behlendorf <behlendorf1@llnl.gov>
+Date: Mon, 14 May 2018 20:36:30 -0700
+Subject: [PATCH] ZTS: Update O_TMPFILE support check
+
+In CentOS 7.5 the kernel provided a compatibility wrapper to support
+O_TMPFILE.  This results in the test setup script correctly detecting
+kernel support.  But the ZFS module was built without O_TMPFILE
+support due to the non-standard CentOS kernel interface.
+
+Handle this case by updating the setup check to fail either when
+the kernel or the ZFS module fail to provide support.  The reason
+will be clearly logged in the test results.
+
+Reviewed-by: Chunwei Chen <tuxoko@gmail.com>
+Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
+Closes #7528
+---
+ tests/zfs-tests/tests/functional/tmpfile/setup.ksh      | 11 +++++++----
+ tests/zfs-tests/tests/functional/tmpfile/tmpfile_test.c | 11 ++++++-----
+ 2 files changed, 13 insertions(+), 9 deletions(-)
+
+diff --git a/tests/zfs-tests/tests/functional/tmpfile/setup.ksh b/tests/zfs-tests/tests/functional/tmpfile/setup.ksh
+index 243a5b77..bc00a2a2 100755
+--- a/tests/zfs-tests/tests/functional/tmpfile/setup.ksh
+++ b/tests/zfs-tests/tests/functional/tmpfile/setup.ksh
+@@ -31,9 +31,12 @@
+ 
+ . $STF_SUITE/include/libtest.shlib
+ 
+-if ! $STF_SUITE/tests/functional/tmpfile/tmpfile_test /tmp; then
+-	log_unsupported "The kernel doesn't support O_TMPFILE."
+DISK=${DISKS%% *}
+default_setup_noexit $DISK
+
+if ! $STF_SUITE/tests/functional/tmpfile/tmpfile_test $TESTDIR; then
+	default_cleanup_noexit
+	log_unsupported "The kernel/filesystem doesn't support O_TMPFILE"
+ fi
+ 
+-DISK=${DISKS%% *}
+-default_setup $DISK
+log_pass
+diff --git a/tests/zfs-tests/tests/functional/tmpfile/tmpfile_test.c b/tests/zfs-tests/tests/functional/tmpfile/tmpfile_test.c
+index 5fb67b47..91527ac5 100644
+--- a/tests/zfs-tests/tests/functional/tmpfile/tmpfile_test.c
+++ b/tests/zfs-tests/tests/functional/tmpfile/tmpfile_test.c
+@@ -36,13 +36,14 @@ main(int argc, char *argv[])
+ 
+ 	fd = open(argv[1], O_TMPFILE | O_WRONLY, 0666);
+ 	if (fd < 0) {
+-		/*
+-		 * Only fail on EISDIR. If we get EOPNOTSUPP, that means
+-		 * kernel support O_TMPFILE, but the path at argv[1] doesn't.
+-		 */
+ 		if (errno == EISDIR) {
+-			fprintf(stderr, "kernel doesn't support O_TMPFILE\n");
+			fprintf(stderr,
+			    "The kernel doesn't support O_TMPFILE\n");
+ 			return (1);
+		} else if (errno == EOPNOTSUPP) {
+			fprintf(stderr,
+			    "The filesystem doesn't support O_TMPFILE\n");
+			return (2);
+ 		}
+ 		perror("open");
+ 	} else {
@@ -0,0 +1,35 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Brian Behlendorf <behlendorf1@llnl.gov>
+Date: Wed, 24 Oct 2018 23:26:08 -0700
+Subject: [PATCH] Fix flake8 "invalid escape sequence 'x'" warning
+
+From, https://lintlyci.github.io/Flake8Rules/rules/W605.html
+
+As of Python 3.6, a backslash-character pair that is not a valid
+escape sequence now generates a DeprecationWarning. Although this
+will eventually become a SyntaxError, that will not be for several
+Python releases.
+
+Note 'float_pobj' was simply removed from arcstat.py since it
+was entirely unused.
+
+Reviewed-by: John Kennedy <john.kennedy@delphix.com>
+Reviewed-by: Richard Elling <Richard.Elling@RichardElling.com>
+Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
+Closes #8056
+---
+ cmd/arcstat/arcstat.py | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/cmd/arcstat/arcstat.py b/cmd/arcstat/arcstat.py
+index b52a8c29..d7d3e9b7 100755
+--- a/cmd/arcstat/arcstat.py
+++ b/cmd/arcstat/arcstat.py
+@@ -112,7 +112,6 @@ cur = {}
+ d = {}
+ out = None
+ kstat = None
+-float_pobj = re.compile("^[0-9]+(\.[0-9]+)?$")
+ 
+ 
+ def detailed_usage():
@@ -0,0 +1,51 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Tony Hutter <hutter2@llnl.gov>
+Date: Wed, 7 Nov 2018 15:48:24 -0800
+Subject: [PATCH] Add BuildRequires gcc, make, elfutils-libelf-devel
+
+This adds a BuildRequires for gcc, make, and elfutils-libelf-devel
+into our spec files.  gcc has been a packaging requirement for
+awhile now:
+
+https://fedoraproject.org/wiki/Packaging:C_and_C%2B%2B
+
+These additional BuildRequires allow us to mock build in
+Fedora 29.
+
+Reviewed-by: Neal Gompa <ngompa@datto.com>
+Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
+Signed-off-by:  Tony Hutter <hutter2@llnl.gov>
+Closes #8095
+Closes #8102
+---
+ rpm/generic/zfs-kmod.spec.in | 4 ++++
+ rpm/generic/zfs.spec.in      | 1 +
+ 2 files changed, 5 insertions(+)
+
+diff --git a/rpm/generic/zfs-kmod.spec.in b/rpm/generic/zfs-kmod.spec.in
+index d4746f5b..ecf14ece 100644
+--- a/rpm/generic/zfs-kmod.spec.in
+++ b/rpm/generic/zfs-kmod.spec.in
+@@ -52,6 +52,10 @@ URL:            http://zfsonlinux.org/
+ Source0:        %{module}-%{version}.tar.gz
+ Source10:       kmodtool
+ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id} -u -n)
+%if 0%{?rhel}%{?fedora}
+BuildRequires:  gcc, make
+BuildRequires:  elfutils-libelf-devel
+%endif
+ 
+ # The developments headers will conflict with the dkms packages.
+ Conflicts:      %{module}-dkms
+diff --git a/rpm/generic/zfs.spec.in b/rpm/generic/zfs.spec.in
+index fa6f1571..c1b8f2c8 100644
+--- a/rpm/generic/zfs.spec.in
+++ b/rpm/generic/zfs.spec.in
+@@ -91,6 +91,7 @@ Provides:       %{name}-kmod-common = %{version}
+ Conflicts:      zfs-fuse
+ 
+ %if 0%{?rhel}%{?fedora}%{?suse_version}
+BuildRequires:  gcc, make
+ BuildRequires:  zlib-devel
+ BuildRequires:  libuuid-devel
+ BuildRequires:  libblkid-devel
@@ -0,0 +1,55 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Tony Hutter <hutter2@llnl.gov>
+Date: Thu, 8 Nov 2018 14:38:37 -0800
+Subject: [PATCH] Tag zfs-0.7.12
+
+META file and changelog updated.
+
+Signed-off-by: Tony Hutter <hutter2@llnl.gov>
+---
+ META                         | 2 +-
+ rpm/generic/zfs-kmod.spec.in | 3 +++
+ rpm/generic/zfs.spec.in      | 3 +++
+ 3 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/META b/META
+index 4b0cdb9c..8631f885 100644
+--- a/META
+++ b/META
+@@ -1,7 +1,7 @@
+ Meta:         1
+ Name:         zfs
+ Branch:       1.0
+-Version:      0.7.11
+Version:      0.7.12
+ Release:      1
+ Release-Tags: relext
+ License:      CDDL
+diff --git a/rpm/generic/zfs-kmod.spec.in b/rpm/generic/zfs-kmod.spec.in
+index ecf14ece..3b97e91d 100644
+--- a/rpm/generic/zfs-kmod.spec.in
+++ b/rpm/generic/zfs-kmod.spec.in
+@@ -195,6 +195,9 @@ chmod u+x ${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/*/extra/*/*/*
+ rm -rf $RPM_BUILD_ROOT
+ 
+ %changelog
+* Thu Nov 08 2018 Tony Hutter <hutter2@llnl.gov> - 0.7.12-1
+- Released 0.7.12-1, detailed release notes are available at:
+- https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.7.12
+ * Thu Sep 13 2018 Tony Hutter <hutter2@llnl.gov> - 0.7.11-1
+ - Released 0.7.11-1, detailed release notes are available at:
+ - https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.7.11
+diff --git a/rpm/generic/zfs.spec.in b/rpm/generic/zfs.spec.in
+index c1b8f2c8..f28793a8 100644
+--- a/rpm/generic/zfs.spec.in
+++ b/rpm/generic/zfs.spec.in
+@@ -372,6 +372,9 @@ systemctl --system daemon-reload >/dev/null || true
+ %endif
+ 
+ %changelog
+* Thu Nov 08 2018 Tony Hutter <hutter2@llnl.gov> - 0.7.12-1
+- Released 0.7.12-1, detailed release notes are available at:
+- https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.7.12
+ * Thu Sep 13 2018 Tony Hutter <hutter2@llnl.gov> - 0.7.11-1
+ - Released 0.7.11-1, detailed release notes are available at:
+ - https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.7.11
@@ -1,6 +1,20 @@
-0001-Undo-python-changes-until-PVE-5.0-release.patch
-0002-remove-DKMS-modules-and-dracut-build.patch
-0003-add-zfsutils.preinst-postinst-for-wheezy-upgrade-pat.patch
-0004-ensure-upgrade-path-from-existing-PVE-ZFS-packages.patch
-0005-import-with-d-dev-disk-by-id-in-scan-service.patch
-0006-fix-rm-path-in-zfs-share.service.patch
+0001-remove-DKMS-modules-and-dracut-build.patch
+0002-import-with-d-dev-disk-by-id-in-scan-service.patch
+0003-always-load-ZFS-module-on-boot.patch
+0004-Add-Breaks-Replaces-to-zfs-initramfs.patch
+0005-Revert-Install-init-scripts-to-support-non-systemd-s.patch
+0006-Fix-deadlock-between-zfs-umount-snapentry_expire.patch
+0007-deadlock-between-mm_sem-and-tx-assign-in-zfs_write-a.patch
+0008-Fix-race-in-dnode_check_slots_free.patch
+0009-Reduce-taskq-and-context-switch-cost-of-zio-pipe.patch
+0010-Skip-import-activity-test-in-more-zdb-code-paths.patch
+0011-Fix-statfs-2-for-32-bit-user-space.patch
+0012-Zpool-iostat-remove-latency-queue-scaling.patch
+0013-Linux-4.19-rc3-compat-Remove-refcount_t-compat.patch
+0014-Prefix-all-refcount-functions-with-zfs_.patch
+0015-Fix-arc_release-refcount.patch
+0016-Allow-use-of-pool-GUID-as-root-pool.patch
+0017-ZTS-Update-O_TMPFILE-support-check.patch
+0018-Fix-flake8-invalid-escape-sequence-x-warning.patch
+0019-Add-BuildRequires-gcc-make-elfutils-libelf-devel.patch
+0020-Tag-zfs-0.7.12.patch
Author	SHA1	Message	Date
Stoiko Ivanov	65a9766fa0	bump version to 0.7.12-pve1~bpo1 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>	2018-11-14 18:27:04 +01:00
Stoiko Ivanov	04a710dd91	update/rebase to zfs-0.7.12 with patches from ZOL Reorder patches, so that the upstream changeset comes last Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>	2018-11-14 18:27:04 +01:00
Stoiko Ivanov	2e5067b011	update/rebase to spl-0.7.12 with patches from ZOL Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>	2018-11-14 18:27:04 +01:00
Thomas Lamprecht	851f368539	add patch to revert upstream shipping of init.d scripts else update-rc.d/insserv complains if sysv-rc is installed, which may be on a from Jessie upgraded system. Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2018-10-31 15:52:47 +01:00
Stoiko Ivanov	1c36de4a98	bump version to 0.7.11-pve2~bpo1 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>	2018-10-30 14:24:20 +01:00
Stoiko Ivanov	b6c5bd4c51	fix missing Breaks/Replaces for zfs-initramfs Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>	2018-10-30 14:24:20 +01:00
Stoiko Ivanov	1bb9f57dcf	Backport deadlock fix for issue ZOL#7939 A deadlock issue got fixed upstream and merged into master [0]. This patch backports the fix by splitting it into the parts for SPL and ZFS. [0] https://github.com/zfsonlinux/zfs/pull/7939 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>	2018-10-30 14:24:19 +01:00
Stoiko Ivanov	ff03aa2dfd	cherry-pick 2 patches planned for zfs-0.7.12 both patches have been backported and approved upstream, and will end up in 0.7.12. Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>	2018-10-30 14:24:19 +01:00
Stoiko Ivanov	f587002c09	rebase ZFS on top of debian/0.7.11-3 drop already applied patches Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>	2018-10-30 14:24:19 +01:00
Stoiko Ivanov	ad41a6994b	rebase SPL on top of debian/0.7.11 drop already applied patches Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>	2018-10-30 14:24:19 +01:00
Thomas Lamprecht	0b063f2c20	bump version to 0.7.11-pve1~bpo1 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2018-09-17 11:41:40 +02:00
Thomas Lamprecht	ea3522b2f7	update/rebase to spl-0.7.11 with patches from ZOL Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2018-09-17 11:39:40 +02:00
Thomas Lamprecht	aa7ac7c184	update/rebase to zfs-0.7.11 with patches from ZOL Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2018-09-17 11:39:40 +02:00
Stoiko Ivanov	a010b40938	update/rebase to zfs-0.7.10 with patches from ZOL Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>	2018-09-13 08:54:51 +02:00
Stoiko Ivanov	f0371a1b16	update/rebase to spl-0.7.10 with patches from ZOL Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>	2018-09-13 08:54:51 +02:00
Stoiko Ivanov	933b31ffad	bump ZFS version to 0.7.9-pve3~bpo9 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>	2018-08-09 10:12:10 +02:00
Stoiko Ivanov	76a4c29ab5	Cherry-pick fix for deadlock umount/snapentry_expire Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>	2018-08-09 10:12:06 +02:00
Stoiko Ivanov	afa7541760	bump ZFS version to 0.7.9-pve2~bpo9 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>	2018-07-16 12:00:12 +02:00
Stoiko Ivanov	f3341ff73f	Cherry-pick fix for zpl_mount deadlock Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>	2018-07-16 12:00:12 +02:00
Stoiko Ivanov	50ad4ffe78	update ZFS submodule to debian/0.7.9-3 drop already applied patch fixing zfs-test Conflicts and Breaks Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>	2018-07-16 12:00:11 +02:00
Stoiko Ivanov	cabb465d41	bump version to 0.7.9-pve1~bpo9 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>	2018-05-22 10:03:05 +02:00
Stoiko Ivanov	cd09cd8030	Add patch for fixing zfs-test/zfsutils file move Exported from https://salsa.debian.org/zfsonlinux-team/zfs/merge_requests/2 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>	2018-05-22 10:03:05 +02:00
Stoiko Ivanov	fccda2b9e6	rebase SPL on top of debian/0.7.9-2 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>	2018-05-22 10:03:05 +02:00
Stoiko Ivanov	5a3a6c060f	update SPL submodule to debian/0.7.9-2 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>	2018-05-22 10:03:05 +02:00
Stoiko Ivanov	170bd23f1a	rebase ZFS on top of debian/0.7.9-2 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>	2018-05-22 10:03:05 +02:00
Stoiko Ivanov	7abe13017f	update ZFS submodule to debian/0.7.9-2 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>	2018-05-22 10:03:04 +02:00
Wolfgang Bumiller	47ae0e2662	buildsys: -j safety Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>	2018-05-04 12:05:16 +02:00
Fabian Grünbichler	849c46778d	bump version to 0.7.8-pve1	2018-04-30 13:48:06 +02:00
Fabian Grünbichler	fd313b306e	no-change update to 0.7.8 to reduce version number confusion	2018-04-30 13:46:29 +02:00
Fabian Grünbichler	c0f28922e8	bump ZFS version to 0.7.7-pve2~bpo9 (note: this change only affects the kernel modules and headers)	2018-04-09 09:56:49 +02:00
Fabian Grünbichler	7fdf8cc174	revert potentially buggy zap_add change until investigation of upstream issue[1] is completed. 1: https://github.com/zfsonlinux/zfs/issues/7401	2018-04-09 09:47:38 +02:00
Fabian Grünbichler	42e934e271	bump version to 0.7.7-pve1~bpo9	2018-04-03 14:49:54 +02:00
Fabian Grünbichler	026bc5c9b2	don't install enum-extract.pl it's only needed for building the modules	2018-04-03 14:49:54 +02:00
Fabian Grünbichler	edf5051c71	update SPL to 0.7.7 by importing the upstream release as patches.	2018-04-03 14:27:05 +02:00
Fabian Grünbichler	75b07eca3e	update ZFS to 0.7.7 by importing the upstream release as patches. replace user namespace patch with version which has been applied usptream.	2018-04-03 14:25:21 +02:00
Fabian Grünbichler	8324054718	rebase SPL on top of debian/0.7.6-1	2018-04-03 14:16:16 +02:00
Fabian Grünbichler	1fa7e3ca4d	rebase ZFS on top of debian/0.7.6-1	2018-04-03 14:10:51 +02:00
Fabian Grünbichler	8a088a9e2a	buildsys: upload to pmg as well	2018-02-21 11:12:13 +01:00
Fabian Grünbichler	871e750385	bump version to zfs/spl-0.7.6-pve1	2018-02-21 09:52:55 +01:00
Fabian Grünbichler	c43065ced4	add remaining spl-0.7.6 changes as patches since Debian unstable has not been updated yet	2018-02-21 09:52:54 +01:00
Fabian Grünbichler	b199710aee	drop Debian patch applied upstream	2018-02-21 09:52:44 +01:00
Fabian Grünbichler	6beaed3f99	add remaining zfs-0.7.6 changes as patches since Debian unstable has not been updated yet.	2018-02-21 09:52:27 +01:00
Fabian Grünbichler	6efadbff82	rebase spl patches	2018-02-21 09:52:05 +01:00
Fabian Grünbichler	ed50d895d0	rebase zfs patches	2018-02-21 09:51:42 +01:00
Fabian Grünbichler	66609d7572	update spl/zfs submodules to 0.7.5-1	2018-02-21 09:28:27 +01:00
Fabian Grünbichler	fdd7076d71	bump ZFS version to 0.7.4-pve2	2018-01-19 12:25:22 +01:00
Fabian Grünbichler	7b1cd3b8c0	always load ZFS modules on boot	2018-01-19 12:25:22 +01:00
Fabian Grünbichler	dda3b9248b	cherry-pick ARC hit rate fix from 0.7.6	2018-01-19 12:25:22 +01:00
Fabian Grünbichler	4e883a4ec5	build: reformat patches drop metadata to reduce patch churn on updates / rebasing	2018-01-19 11:30:07 +01:00
Fabian Grünbichler	2e2e28836c	bump version to 0.7.4-pve1	2017-12-19 12:53:38 +01:00
Fabian Grünbichler	f7fae412d9	cherry-pick zfs-import.target fix	2017-12-19 12:52:00 +01:00
Fabian Grünbichler	4495daacdc	refresh SPL patches	2017-12-19 12:48:44 +01:00
Fabian Grünbichler	b9d59150d1	rebase ZFS patches	2017-12-19 12:47:27 +01:00
Fabian Grünbichler	e5fa0aa21d	update SPL submodule to 0.7.4-1	2017-12-19 12:47:01 +01:00
Fabian Grünbichler	7130c30d2b	update ZFS submodule to 0.7.4-1	2017-12-19 12:46:24 +01:00
Fabian Grünbichler	b03175e961	bump version to 0.7.3-pve1	2017-11-06 09:15:19 +01:00
Fabian Grünbichler	cc88cf22d1	update SPL submodule to 0.7.3-1	2017-11-06 09:12:42 +01:00
Fabian Grünbichler	f07031b9ab	add workaround for NS issue tracked upstream in #6800, full fix/user NS compatibility not yet available. https://github.com/zfsonlinux/zfs/issues/6800	2017-11-06 09:04:37 +01:00
Fabian Grünbichler	af05210837	refresh and drop patches most have been applied upstream	2017-11-06 09:03:30 +01:00
Fabian Grünbichler	c542769d74	update ZFS submodule to 0.7.3-1	2017-11-06 08:56:51 +01:00
Fabian Grünbichler	2ce263d24d	bump version to 0.7.2-pve1 and add new zfs-test deb	2017-10-13 11:32:02 +02:00
Fabian Grünbichler	38b6b3a10d	build: whitespace cleanup	2017-10-13 11:32:02 +02:00
Fabian Grünbichler	65fc6d785f	zfs: add PR 6616 - compatibility with 0.6.5	2017-10-13 11:32:02 +02:00
Fabian Grünbichler	f2be26ec96	zfs: add PR 6695 don't accidently skip over objects which should be freed	2017-10-13 11:32:02 +02:00
Fabian Grünbichler	e2f4edc81e	zfs: add various small fixes	2017-10-13 11:32:02 +02:00
Fabian Grünbichler	3c99d2a035	zfs: split test suite into zfs-test package	2017-10-13 11:32:02 +02:00
Fabian Grünbichler	3264cfc5e7	zfs: drop patch applied upstream	2017-10-12 13:23:57 +02:00
Fabian Grünbichler	bdc71736c4	spl: add man page cleanup patches	2017-10-12 13:19:24 +02:00
Fabian Grünbichler	11fac95726	update SPL and ZFS sources to 0.7.2	2017-10-12 13:18:47 +02:00
Fabian Grünbichler	012341487f	bump ZFS version to 0.6.5.11-pve18	2017-10-02 09:31:03 +02:00
Fabian Grünbichler	ea927859d2	fix #1509 : arc_summary error with L2ARC	2017-10-02 09:30:14 +02:00
Fabian Grünbichler	e6fdafd565	build: remove old source tar balls and download target they are not used anymore	2017-08-25 09:28:12 +02:00
Fabian Grünbichler	4c3d639686	bump version to 0.6.5.17-pve16/0.6.5.11-pve10	2017-08-07 15:28:34 +02:00
Fabian Grünbichler	8a19f2ad5d	buildsys: switch to submodules	2017-08-07 15:28:34 +02:00
Fabian Grünbichler	56d9662c48	buildsys: add zfs-debian and spl-debian submodules	2017-08-07 15:28:34 +02:00
Fabian Grünbichler	a59077893a	drop patches applied upstream	2017-07-27 13:14:15 +02:00
Fabian Grünbichler	4156449701	update sources to 0.6.5.11-1	2017-07-27 13:10:29 +02:00
Fabian Grünbichler	8dbff718a0	update dkms removal patches to reflect that we don't need DKMS for building.	2017-07-27 12:29:31 +02:00
Fabian Grünbichler	58a974f8f0	buildsys: add deb target	2017-07-27 12:09:16 +02:00
Fabian Grünbichler	1e88a70802	buildsys: clean up *.buildinfo	2017-03-10 10:50:09 +01:00
Fabian Grünbichler	59653d92a8	bump versions to -pve16~bpo90/pve-9~bpo90	2017-03-10 09:50:37 +01:00
Fabian Grünbichler	a5dfd38639	buildsys: no longer build transitional packages	2017-03-10 09:50:37 +01:00
Fabian Grünbichler	100fba2dff	drop patches no longer needed for stretch	2017-03-10 09:50:37 +01:00
Fabian Grünbichler	eee857a82b	buildsys: update make upload target for stretch	2017-03-10 09:37:21 +01:00