bump version to 0.7.7-pve1~bpo9

don't install enum-extract.pl
it's only needed for building the modules
2018-04-03 14:49:54 +02:00 · 2018-04-03 14:49:54 +02:00 · 2018-04-03 14:27:05 +02:00 · 2018-04-03 14:25:21 +02:00 · 2018-04-03 14:16:16 +02:00 · 2018-04-03 14:10:51 +02:00
132 changed files with 19269 additions and 3750 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,67 +1,74 @@
-RELEASE=3.3
+RELEASE=5.1
 # source form https://github.com/zfsonlinux/
-ZFSVER=0.6.3-1.2
+ZFSVER=0.7.7
-ZFSPKGREL=2~wheezy
+ZFSPKGREL=pve1~bpo9
-SPLPKGREL=1~wheezy
+SPLPKGREL=pve1~bpo9
-ZFSPKGVER=0.6.3-${ZFSPKGREL}
+ZFSPKGVER=${ZFSVER}-${ZFSPKGREL}
-SPLPKGVER=0.6.3-${SPLPKGREL}
+SPLPKGVER=${ZFSVER}-${SPLPKGREL}
-SPLDIR=spl-spl-${ZFSVER}
+SPLDIR=spl-build
-SPLSRC=spl-${ZFSVER}.tar.gz
+SPLSRC=spl-debian
-ZFSDIR=zfs-zfs-${ZFSVER}
+ZFSDIR=zfs-build
-ZFSSRC=zfs-${ZFSVER}.tar.gz
+ZFSSRC=zfs-debian
-SPL_DEBS= 			\
+SPL_DEBS= 					\
 spl_${SPLPKGVER}_amd64.deb
-ZFS_DEBS= 				\
+ZFS_DEBS= 					\
-libnvpair1_${ZFSPKGVER}_amd64.deb 		\
+libnvpair1linux_${ZFSPKGVER}_amd64.deb		\
-libuutil1_${ZFSPKGVER}_amd64.deb		\
+libuutil1linux_${ZFSPKGVER}_amd64.deb		\
-libzfs2_${ZFSPKGVER}_amd64.deb		\
+libzfs2linux_${ZFSPKGVER}_amd64.deb		\
-libzfs-dev_${ZFSPKGVER}_amd64.deb		\
+libzfslinux-dev_${ZFSPKGVER}_amd64.deb		\
-libzpool2_${ZFSPKGVER}_amd64.deb		\
+libzpool2linux_${ZFSPKGVER}_amd64.deb		\
-zfs-doc_${ZFSPKGVER}_amd64.deb		\
+zfs-dbg_${ZFSPKGVER}_amd64.deb			\
-zfs-initramfs_${ZFSPKGVER}_amd64.deb	\
+zfs-zed_${ZFSPKGVER}_amd64.deb			\
-zfsutils_${ZFSPKGVER}_amd64.deb
+zfs-initramfs_${ZFSPKGVER}_all.deb		\
 zfs-test_${ZFSPKGVER}_amd64.deb		\
 zfsutils-linux_${ZFSPKGVER}_amd64.deb
-DEBS=${SPL_DEBS} ${ZFS_DEBS} 
+DEBS=${SPL_DEBS} ${ZFS_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}
 	rm -rf ${SPLDIR}
-	tar xf ${SPLSRC}
+	mkdir ${SPLDIR}
-	cp -a spl-debian-pve ${SPLDIR}/debian
+	cp -a ${SPLSRC}/* ${SPLDIR}/
-	cd ${SPLDIR}; dpkg-buildpackage -b -uc -us 
+	mv ${SPLDIR}/debian/changelog ${SPLDIR}/debian/changelog.org
 	cat spl-changelog.Debian ${SPLDIR}/debian/changelog.org > ${SPLDIR}/debian/changelog
 	cd ${SPLDIR}; ln -s ../spl-patches patches
 	cd ${SPLDIR}; quilt push -a
 	cd ${SPLDIR}; rm -rf .pc ./patches
 	cd ${SPLDIR}; dpkg-buildpackage -b -uc -us
 .PHONY: zfs
-zfs ${ZFS_DEBS}: ${ZFSSRC}
+zfs ${ZFS_DEBS} ${ZFS_TRANS_DEBS}: ${ZFSSRC}
 	rm -rf ${ZFSDIR}
-	tar xf ${ZFSSRC}
+	mkdir ${ZFSDIR}
-	cp -a zfs-debian-pve ${ZFSDIR}/debian
+	cp -a ${ZFSSRC}/* ${ZFSDIR}/
-	cd ${ZFSDIR}; dpkg-buildpackage -b -uc -us 
+	mv ${ZFSDIR}/debian/changelog ${ZFSDIR}/debian/changelog.org
-
+	cat zfs-changelog.Debian ${ZFSDIR}/debian/changelog.org > ${ZFSDIR}/debian/changelog
-.PHONY: download
+	cd ${ZFSDIR}; ln -s ../zfs-patches patches
-download:
+	cd ${ZFSDIR}; quilt push -a
-	#git clone https://github.com/zfsonlinux/pkg-spl.git
+	cd ${ZFSDIR}; rm -rf .pc ./patches
-	#git clone https://github.com/zfsonlinux/pkg-zfs.git
+	cd ${ZFSDIR}; dpkg-buildpackage -b -uc -us
 	##git checkout master/ubuntu/precise
 	##git checkout master/debian/wheezy
 	rm spl-*.tar.gz
 	rm zfs-*.tar.gz
 	wget https://github.com/zfsonlinux/spl/archive/${SPLSRC}
 	wget https://github.com/zfsonlinux/zfs/archive/${ZFSSRC}
 .PHONY: clean
 clean: 	
-	rm -rf *~ *.deb *.changes ${ZFSDIR} ${SPLDIR}
+	rm -rf *~ *.deb *.changes *.buildinfo ${ZFSDIR} ${SPLDIR}
 .PHONY: distclean
 distclean: clean
@@ -69,27 +76,4 @@ distclean: clean
 .PHONY: upload
 upload: ${DEBS}
-	umount /pve/${RELEASE}; mount /pve/${RELEASE} -o rw 
+	tar -cf - ${DEBS} | ssh repoman@repo.proxmox.com -- upload --product pve,pmg --dist stretch --arch amd64
 	mkdir -p /pve/${RELEASE}/extra
 	rm -f /pve/${RELEASE}/extra/spl_*.deb
 	rm -f /pve/${RELEASE}/extra/spl-dkms_*.deb
 	rm -f /pve/${RELEASE}/extra/libnvpair1_*.deb
 	rm -f /pve/${RELEASE}/extra/libnvpair1-dbg_*.deb
 	rm -f /pve/${RELEASE}/extra/libuutil1_*.deb
 	rm -f /pve/${RELEASE}/extra/libuutil1-dbg_*.deb
 	rm -f /pve/${RELEASE}/extra/libzfs2_*.deb
 	rm -f /pve/${RELEASE}/extra/libzfs2-dbg_*.deb
 	rm -f /pve/${RELEASE}/extra/libzfs-dev_*.deb
 	rm -f /pve/${RELEASE}/extra/libzpool2_*.deb
 	rm -f /pve/${RELEASE}/extra/libzpool2-dbg_*.deb
 	rm -f /pve/${RELEASE}/extra/zfs_*.deb
 	rm -f /pve/${RELEASE}/extra/zfs-dkms_*.deb
 	rm -f /pve/${RELEASE}/extra/zfs-doc_*.deb
 	rm -f /pve/${RELEASE}/extra/zfs-initramfs_*.deb
 	rm -f /pve/${RELEASE}/extra/zfsutils_*.deb
 	rm -f /pve/${RELEASE}/extra/zfsutils-dbg_*.deb
 	rm -f /pve/${RELEASE}/extra/Packages*
 	cp ${DEBS} /pve/${RELEASE}/extra
 	cd /pve/${RELEASE}/extra; dpkg-scanpackages . /dev/null > Packages; gzip -9c Packages > Packages.gz
 	umount /pve/${RELEASE}; mount /pve/${RELEASE} -o ro
@@ -1,13 +1,13 @@
 Proxmox VE packaging for ZFS on Linux
-This is based of code from:
+This is based on code from:
 https://github.com/zfsonlinux/pkg-spl.git
 https://github.com/zfsonlinux/pkg-zfs.git
-We merged updates from the precice branch into the older wheezy 
+We removed the dkms/modules related code, because we ship the
-branch.
+modules with the kernel.
 For licensing questions, see:
-http://open-zfs.org/wiki/Talk:FAQ
+http://open-zfs.org/wiki/Talk:FAQ
@@ -0,0 +1,126 @@
 spl-linux (0.7.7-pve1~bpo9) unstable; urgency=medium
  * update SPL to 0.7.7
 -- Proxmox Support Team <support@proxmox.com>  Tue, 3 Apr 2018 14:28:35 +0200
 spl-linux (0.7.6-pve1~bpo9) unstable; urgency=medium
  * update SPL to 0.7.6
 -- Proxmox Support Team <support@proxmox.com>  Wed, 21 Feb 2018 09:47:54 +0100
 spl-linux (0.7.4-pve1~bpo9) unstable; urgency=medium
  * update SPL to 0.7.4
 -- Proxmox Support Team <support@proxmox.com>  Tue, 19 Dec 2017 12:52:42 +0100
 spl-linux (0.7.3-pve1~bpo9) unstable; urgency=medium
  * update spl to 0.7.3
 -- Proxmox Support Team <support@proxmox.com>  Mon, 6 Nov 2017 09:14:19 +0100
 spl-linux (0.7.2-pve1~bpo90) unstable; urgency=medium
  * update spl to 0.7.2
  * clean up man pages
 -- Proxmox Support Team <support@proxmox.com>  Thu, 12 Oct 2017 13:33:04 +0200
 spl-linux (0.6.5.11-pve10~bpo90) unstable; urgency=medium
  * update spl to debian/0.6.5.11-1
 -- Proxmox Support Team <support@proxmox.com>  Thu, 27 Jul 2017 13:11:45 +0200
 spl-linux (0.6.5.9-pve9~bpo90) unstable; urgency=medium
  * rebuild for PVE 5.0 / Debian Stretch
 -- Proxmox Support Team <support@proxmox.com>  Fri, 10 Mar 2017 09:45:52 +0100
 spl-linux (0.6.5.9-pve8~bpo80) unstable; urgency=medium
  * update spl to debian/0.6.5.9-1
 -- Proxmox Support Team <support@proxmox.com>  Mon, 6 Feb 2017 12:39:35 +0100
 spl-linux (0.6.5.8-pve7~bpo80) unstable; urgency=medium
  * update spl to debian/0.6.5.8-2
  * switch package upstream sources to Debian (Jessie)
 -- Proxmox Support Team <support@proxmox.com>  Wed, 12 Oct 2016 11:16:02 +0200
 spl-linux (0.6.5.7-pve6~bpo80) unstable; urgency=medium
  * update pkg-spl to jessie/0.6.5.7-5
  * change package versioning to allow upgrades from PVE3/wheezy
 -- Proxmox Support Team <support@proxmox.com>  Tue, 28 Jun 2016 09:50:00 +0200
 spl-linux (0.6.5-pve5~jessie) unstable; urgency=medium
  * Update pkg-spl to jessie/0.6.5.6-3
 -- Proxmox Support Team <support@proxmox.com>  Fri, 15 Apr 2016 11:11:59 +0200
 spl-linux (0.6.5-pve4~jessie) unstable; urgency=medium
  * update to 0.6.5.6
 -- Proxmox Support Team <support@proxmox.com>  Wed, 30 Mar 2016 10:49:49 +0200
 spl-linux (0.6.5-pve3~jessie) unstable; urgency=medium
  * update to 0.6.5.4
 -- Proxmox Support Team <support@proxmox.com>  Thu, 14 Jan 2016 11:00:40 +0100
 spl-linux (0.6.5-pve2~jessie) unstable; urgency=medium
  * update to 0.6.5.3
 -- Proxmox Support Team <support@proxmox.com>  Wed, 04 Nov 2015 17:40:58 +0100
 spl-linux (0.6.5-pve1~jessie) unstable; urgency=medium
  * update to master/debian/jessie/0.6.5-1
 -- Proxmox Support Team <support@proxmox.com>  Mon, 21 Sep 2015 10:04:23 +0200
 spl-linux (0.6.4-pve3~jessie) unstable; urgency=medium
  * update to snapshot/debian/jessie/0.6.4-8-8ac6ff
 -- Proxmox Support Team <support@proxmox.com>  Mon, 24 Aug 2015 06:14:12 +0200
 spl-linux (0.6.4-pve2~jessie) unstable; urgency=medium
  * update to 0.6.4.2 (snapshot/debian/jessie/0.6.4-6-37d7cd)
 -- Proxmox Support Team <support@proxmox.com>  Tue, 21 Jul 2015 11:02:31 +0200
 spl-linux (0.6.4-pve1~jessie) unstable; urgency=medium
  * update to 0.6.4 (use upstream zol package definitions)
 -- Proxmox Support Team <support@proxmox.com>  Tue, 14 Apr 2015 10:17:26 +0200
 spl-linux (0.6.3-pve1~jessie) unstable; urgency=medium
  * recompile for jessie
 -- Proxmox Support Team <support@proxmox.com>  Sat, 28 Feb 2015 16:03:01 +0100
 spl-linux (0.6.3-pve1~wheezy) unstable; urgency=low
  * first version for Proxmox VE
 -- Proxmox Support Team <support@proxmox.com>  Sat, 10 Jan 2015 14:06:34 +0100
@@ -1,6 +0,0 @@
 spl-linux (0.6.3-1~wheezy) unstable; urgency=low
  * first version for Proxmox VE
 -- Proxmox Support Team <support@proxmox.com>  Sat, 10 Jan 2015 14:06:34 +0100
@@ -1 +0,0 @@
 7
@@ -1,34 +0,0 @@
 Source: spl-linux
 Section: kernel
 Priority: extra
 Maintainer: Proxmox Support Team <support@proxmox.com>
 Build-Depends: autotools-dev,
 autoconf,
 autogen,
 automake,
 debhelper (>= 8),
 dh-autoreconf,
 dkms (>= 2.2.0.2),
 libtool,
 Standards-Version: 3.9.5
 Homepage: http://www.zfsonlinux.org/
 Package: spl-dkms
 Architecture: all
 Depends: ${misc:Depends}, dkms (>= 2.2.0.2), file, lsb-release
 Recommends: spl
 Description: Solaris Porting Layer kernel modules for Linux
 The Solaris Porting Layer (SPL) is a Linux kernel module which provides many of
 the Solaris kernel APIs. This shim layer makes it possible to run Solaris
 kernel code in the Linux kernel with relatively minimal modification.
 .
 The Solaris Porting LAyer Tests (SPLAT) is a Linux kernel module which provides
 a testing harness for the SPL module.
 Package: spl
 Architecture: any
 Conflicts: spl-dev
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Solaris Porting Layer utilities for Linux
 This package provides the userspace utilities for the SPL and SPLAT Linux
 kernel modules.
@@ -1,147 +0,0 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Solaris Porting Layer for Linux
 Upstream-Contact: Brian Behlendorf <behlendorf1@llnl.gov>
 Source: https://github.com/zfsonlinux/zfs/
 Disclaimer:
 This work was produced at the Lawrence Livermore National Laboratory
 (LLNL) under Contract No. DE-AC52-07NA27344 (Contract 44) between
 the U.S. Department of Energy (DOE) and Lawrence Livermore National
 Security, LLC (LLNS) for the operation of LLNL.
 .
 This work was prepared as an account of work sponsored by an agency of
 the United States Government.  Neither the United States Government nor
 Lawrence Livermore National Security, LLC nor any of their employees,
 makes any warranty, express or implied, or assumes any liability or
 responsibility for the accuracy, completeness, or usefulness of any
 information, apparatus, product, or process disclosed, or represents
 that its use would not infringe privately-owned rights.
 .
 Reference herein to any specific commercial products, process, or
 services by trade name, trademark, manufacturer or otherwise does
 not necessarily constitute or imply its endorsement, recommendation,
 or favoring by the United States Government or Lawrence Livermore
 National Security, LLC.  The views and opinions of authors expressed
 herein do not necessarily state or reflect those of the Untied States
 Government or Lawrence Livermore National Security, LLC, and shall
 not be used for advertising or product endorsement purposes.
 Files: *
 Copyright: Lawrence Livermore National Security, LLC.
 The Regents of the University of California
 License: GPL-2+
 Files: config/config.guess
 Copyright: Free Software Foundation, Inc.
 License: GPL-2+
 Files: config/config.sub
 Copyright: Free Software Foundation, Inc.
 License: GPL-2+
 Files: config/deb.am
 Copyright: Lawrence Livermore National Security, LLC.
 License: GPL-2+
 Files: config/depcomp
 Copyright: Free Software Foundation, Inc.
 License: GPL-2+
 Files: config/install-sh
 Copyright: 1994 X Consortium
 License:
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
 deal in the Software without restriction, including without limitation the
 rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
 sell copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 .
 The above copyright notice and this permission notice shall be included in
 all copies or substantial portions of the Software.
 .
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
 X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
 AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
 TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 .
 Except as contained in this notice, the name of the X Consortium shall not
 be used in advertising or otherwise to promote the sale, use or other deal-
 ings in this Software without prior written authorization from the X Consor-
 tium.
 Files: config/ltmain.sh
 Copyright: Free Software Foundation, Inc.
 License: GPL-2+
 Files: config/missing
 Copyright: Free Software Foundation, Inc.
 License: GPL-2+
 Files: config/tgz.am
 Copyright: Lawrence Livermore National Security, LLC.
 License: GPL-2+
 Files: debian/*
 Copyright: Darik Horn <dajhorn@vanadac.com>
 Source: https://github.com/dajhorn/pkg-spl/
 License: GPL-2+
 Files: include/linux/zlib_compat.h
 Copyright: Lawrence Livermore National Security, LLC.
 License: GPL-2+
 Files: include/rpc/xdr.h
 Copyright: Sun Microsystems, Inc.
 License: GPL-2+
 Files: include/sys/extdirent.h
 Copyright: Lawrence Livermore National Security, LLC.
 License: GPL-2+
 Files: include/sys/fcntl.h
 Copyright: Lawrence Livermore National Security, LLC.
 License: GPL-2+
 Files: include/sys/idmap.h
 Copyright: Lawrence Livermore National Security, LLC.
 License: GPL-2+
 Files: include/sys/tsd.h
 Copyright: Lawrence Livermore National Security, LLC.
 License: GPL-2+
 Files: include/sys/zmod.h
 Copyright: Jean-loup Gailly
 Mark Adler
 License:
 This software is provided 'as-is', without any express or implied
 warranty.  In no event will the authors be held liable for any damages
 arising from the use of this software.
 .
 Permission is granted to anyone to use this software for any purpose,
 including commercial applications, and to alter it and redistribute it
 freely, subject to the following restrictions:
 .
 1. The origin of this software must not be misrepresented; you must not
 claim that you wrote the original software. If you use this software
 in a product, an acknowledgment in the product documentation would be
 appreciated but is not required.
 .
 2. Altered source versions must be plainly marked as such, and must not be
 misrepresented as being the original software.
 .
 3. This notice may not be removed or altered from any source distribution.
 Files: module/spl/spl-tsd.c
 Copyright: Lawrence Livermore National Security, LLC.
 License: GPL-2+
 Files: module/spl/spl-xdr.c
 Copyright: Sun Microsystems, Inc.
 License: GPL-2+
 Files: module/splat/splat-linux.c
 Copyright: Lawrence Livermore National Security, LLC.
 License: GPL-2+
@@ -1,35 +0,0 @@
 AUTOINSTALL="yes"
 PACKAGE_NAME="spl"
 PACKAGE_VERSION="#MODULE_VERSION#"
 PRE_BUILD="configure
  --prefix=/usr
  --with-config=kernel
  --with-linux=$(case `lsb_release -is` in
                   (Debian)
                     if [ -e ${kernel_source_dir/%build/source} ]
                     then
                       echo ${kernel_source_dir/%build/source}
                     else
                       # This is a kpkg exception for Proxmox 2.0
 		       echo ${kernel_source_dir}
                     fi
                     ;;
                   (*)
                     echo ${kernel_source_dir}
                     ;;
                 esac)
  --with-linux-obj=${kernel_source_dir}
 "
 POST_INSTALL="cp
  ${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/spl_config.h
  ${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/module/Module.symvers
  ${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/${kernelver}/${arch}/
 "
 REMAKE_INITRD="no"
 MAKE[0]="make"
 BUILT_MODULE_NAME[0]="spl"
 BUILT_MODULE_LOCATION[0]="module/spl/"
 DEST_MODULE_LOCATION[0]="/extra/spl/spl"
 BUILT_MODULE_NAME[1]="splat"
 BUILT_MODULE_LOCATION[1]="module/splat/"
 DEST_MODULE_LOCATION[1]="/extra/splat/splat"
@@ -1,28 +0,0 @@
 From 7559daf38acc293474d3d2a13ecf746bc7507a11 Mon Sep 17 00:00:00 2001
 From: Darik Horn <dajhorn@vanadac.com>
 Date: Tue, 11 Oct 2011 18:32:58 -0500
 Subject: [PATCH 1/2] Revert "Remove /etc/hostid missing warning"
 This reverts commit 6b3b569df30d13ed7bbbff877cffc71290a52f12.
 ---
 module/spl/spl-generic.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
 Index: b/module/spl/spl-generic.c
 ===================================================================
 --- a/module/spl/spl-generic.c
 +++ b/module/spl/spl-generic.c
@@ -471,8 +471,12 @@
 	file = kobj_open_file(spl_hostid_path);
 -	if (file == (struct _buf *)-1)
 +	if (file == (struct _buf *)-1) {
 +		printk(KERN_WARNING
 +		       "SPL: The %s file is not found.\n",
 +		       spl_hostid_path);
 		return -1;
 +	}
 	result = kobj_get_filesize(file, &size);
@@ -1 +0,0 @@
 0001-Revert-Remove-etc-hostid-missing-warning.patch
@@ -1,63 +0,0 @@
 #!/usr/bin/make -f
 NAME := $(shell awk '$$1 == "Name:" { print $$2; }' META)
 VERSION := $(shell dpkg-parsechangelog \
  | awk '$$1 == "Version:" { print $$2; }' | cut -d- -f1)
 REVISION := $(shell dpkg-parsechangelog \
  | awk '$$1 == "Version:" { print $$2; }' | cut -d- -f2-)
 %:
 	dh $@ --with autoreconf
 override_dh_auto_configure:
 	@# Embed the downstream version in the module.
 	@sed \
 	  -e 's/^Version:.*/Version:      $(VERSION)/' \
 	  -e 's/^Release:.*/Release:      $(REVISION)/' \
 	  -i.orig META
 	@# Create the makefiles and configure script.
 	./autogen.sh
 	@# Build the userland, but don't build the kernel modules.
 	dh_auto_configure -- --with-config=user
 override_dh_auto_test:
 	# scripts/check.sh tries insmod and rmmod, so it cannot
 	# run in an unprivileged build environment.
 override_dh_auto_install:
 	@# Install the utilities.
 	make install DESTDIR='$(CURDIR)/debian/tmp'
 	@# Create a dummy hostid file for the zfs-initramfs package.
 	@# NB: Commentary in the spl.postinst script.
 	mkdir -p '$(CURDIR)/debian/tmp/etc/'
 	/usr/bin/printf '\xFF\xFF\xFF\xFF' >'$(CURDIR)/debian/tmp/etc/hostid'
 	@# Get a bare copy of the source code.
 	@# This creates the $(CURDIR)/$(NAME)-$(VERSION)/ tree.
 	make distdir
 	@# Delete boilerplate to satisfy the lintian extra-license-file check.
 	rm '$(CURDIR)/$(NAME)-$(VERSION)/COPYING'
 	@# This shunt allows DKMS to install the Module.symvers and spl_config.h
 	@# files to the ${dkms_tree} area through the POST_INSTALL directive.
 	echo '#!/bin/sh'  >'$(CURDIR)/$(NAME)-$(VERSION)/cp'
 	echo 'cp "$$@"'  >>'$(CURDIR)/$(NAME)-$(VERSION)/cp'
 	chmod 755 '$(CURDIR)/$(NAME)-$(VERSION)/cp'
 	# Install the DKMS source.
 	mkdir -p '$(CURDIR)/debian/tmp/usr/src/'
 	mv '$(CURDIR)/$(NAME)-$(VERSION)' '$(CURDIR)/debian/tmp/usr/src/'
 	# Install the dkms.conf file.
 	dh_dkms -V $(VERSION)
 override_dh_auto_clean:
 	dh_auto_clean
 	@if test -e META.orig; then mv META.orig META; fi
 %:
 	dh $@
@@ -1,3 +0,0 @@
 usr/src/spl-*/AUTHORS	usr/share/doc/spl-dkms/
 usr/src/spl-*/DISCLAIMER	usr/share/doc/spl-dkms/
 usr/src
@@ -1,3 +0,0 @@
 #!/bin/sh -e
 #DEBHELPER#
@@ -1,3 +0,0 @@
 #!/bin/sh -e
 #DEBHELPER#
@@ -1,3 +0,0 @@
 etc/hostid
 usr/sbin
 usr/share/man
@@ -1,59 +0,0 @@
 #!/bin/sh -e
 # The hostname and hostid of the last system to access a ZFS pool are stored in
 # the ZFS pool itself.  A pool is foreign if, during `zpool import`, the
 # current hostname and hostid are different than the stored values thereof.
 #
 # The hostname and hostid on Solaris are intrinsic, but they are not on Linux,
 # so the spl kernel module invokes /bin/hostname and /usr/bin/hostid from the
 # userland in its initialization routine.
 #
 # However, these two indentifiers are usually undefined in the Linux initramfs
 # environment, so the /etc/hostname and /etc/hostid files must be added to the
 # initrd.  Things like a DHCP lease change can affect the hostid too.
 #
 # ZFS requires stable values for hostname and hostid, but basic Linux systems
 # do not.  The hostid is therefore stabilized by creating the /etc/hostid file
 # in the regular environment if it does not already exist.  An undefined
 # hostname is usuallly stable.
 #
 # Neither /etc/hostname nor /etc/hostid are controlled configuration files in
 # Debian distributions, but the spl package nevertheless installs a dummy
 # /etc/hostid file that contains the HW_INVALID_HOSTID sentinal value so that
 # the package manager will track it.
 # This result is always an eight-character hexadecimal number sans the 0x
 # prefix.  Remember that /usr/bin/hostid generates a value if the /etc/hostid
 # file doesn't exist or is malformed.
 HOSTID=$(hostid)
 if [ -f /etc/hostid -a "0x$HOSTID" != "0xffffffff" ]
 then
 	# This system already has a stable hostid.
 	exit 0
 fi
 # Truncate the dummy file and generate the actual system hostid.
 : >/etc/hostid
 HOSTID=$(hostid)
 # @TODO: Check whether this method is appropriate for gethostid(2) on big
 # endian systems. (Update: It isn't.)
 #
 # The /etc/hostname file on i386 and amd64 systems must be a little endian
 # integer of exacly four bytes.  Regardless, a consistent hostid is more
 # important than a correct byte order here.
 # Conveniences like a ${HOSTID:$ii:2} substring range or a `sed` one-liner
 # are prohibited here because this file must be dash-compatible by policy.
 AA=$(echo $HOSTID | cut -b 1,2)
 BB=$(echo $HOSTID | cut -b 3,4)
 CC=$(echo $HOSTID | cut -b 5,6)
 DD=$(echo $HOSTID | cut -b 7,8)
 # Invoke the external printf because the dash builtin lacks the byte format.
 "$(which printf)" "\x$DD\x$CC\x$BB\x$AA" >"/etc/hostid"
 # @ASSERT: [ "$HOSTID" = "$(hostid)" ]
 #DEBHELPER#
@@ -0,0 +1,170 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
 Date: Wed, 12 Oct 2016 10:57:39 +0200
 Subject: [PATCH] remove DKMS and module build
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 ---
 debian/control.in | 30 ------------------------
 debian/control    |  1 -
 debian/rules      | 70 ++-----------------------------------------------------
 3 files changed, 2 insertions(+), 99 deletions(-)
 diff --git a/debian/control.in b/debian/control.in
 index 02d3182..5fd81aa 100644
 --- a/debian/control.in
 +++ b/debian/control.in
@@ -8,46 +8,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: git@salsa.debian.org:zfsonlinux-team/spl.git
 Vcs-Browser: https://salsa.debian.org/zfsonlinux-team/spl
 -Package: spl-dkms
 -Architecture: all
 -Depends: dkms (>> 2.2.1.0),
 -         file,
 -         libc-dev,
 -         libelf-dev,
 -         lsb-release,
 -         ${misc:Depends}
 -Recommends: spl (>= ${source:Upstream-Version}),
 -         @LINUX_COMPAT@
 -Provides: spl-modules
 -Description: Solaris Porting Layer kernel modules for Linux
 - The Solaris Porting Layer (SPL) is a Linux kernel module which provides
 - many of the Solaris kernel APIs. This shim layer makes it possible to
 - run Solaris kernel code in the Linux kernel with relatively minimal
 - modification. The Solaris Porting LAyer Tests (SPLAT) is a Linux kernel
 - module which provides a testing harness for the SPL module.
 - .
 - SPL can be particularly useful when you want to track upstream Illumos
 - (or any other OpenSolaris fork) development closely and don't want the
 - overhead of maintaining a large patch which converts Solaris primitives
 - to Linux primitives.
 - .
 - This package contains the source code for the SPL and SPLAT Linux kernel
 - modules, which can be used with DKMS, so that local kernel modules are
 - automatically built and installed every time the kernel packages are
 - upgraded.
 -
 Package: spl
 Architecture: linux-any
 Conflicts: spl-dev, splat
 Depends: ${misc:Depends}, ${shlibs:Depends}
 -Recommends: spl-modules | spl-dkms
 Description: Solaris Porting Layer user-space utilities for Linux
  The Solaris Porting Layer (SPL) is a Linux kernel module which provides
  many of the Solaris kernel APIs. This shim layer makes it possible to
 diff --git a/debian/control b/debian/control
 index c3abf8d..455c34d 100644
 --- a/debian/control
 +++ b/debian/control
@@ -8,7 +8,6 @@ Build-Depends: autogen,
                autotools-dev,
                debhelper (>= 9),
                dh-autoreconf,
 -               dkms (>> 2.2.0.2-1~),
                libtool
 Standards-Version: 4.1.2
 Homepage: http://www.zfsonlinux.org/
 diff --git a/debian/rules b/debian/rules
 index c7f2608..bca58f7 100755
 --- a/debian/rules
 +++ b/debian/rules
@@ -14,12 +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)
 -
 %:
 -	dh $@ --with dkms,autoreconf --parallel
 +	dh $@ --with autoreconf --parallel
 override_dh_auto_configure:
 	sed "s/@LINUX_COMPAT@/linux-libc-dev \(< $(shell debian/get_next.sh)\)/" debian/control.in > debian/control
@@ -45,69 +41,7 @@ override_dh_auto_install:
 	@# This creates the $(CURDIR)/$(NAME)-$(VERSION)/ tree.
 	$(MAKE) distdir
 -	@# This shunt allows DKMS to install the Module.symvers and spl_config.h
 -	@# files to the ${dkms_tree} area through the POST_INSTALL directive.
 -	echo '#!/bin/sh'  >'$(CURDIR)/$(NAME)-$(VERSION)/cp'
 -	echo 'cp "$$@"'  >>'$(CURDIR)/$(NAME)-$(VERSION)/cp'
 -	chmod 755 '$(CURDIR)/$(NAME)-$(VERSION)/cp'
 -
 -	# Install the DKMS source.
 -	mkdir -p '$(CURDIR)/debian/tmp/usr/src/'
 -	mv '$(CURDIR)/$(NAME)-$(VERSION)' '$(CURDIR)/debian/tmp/usr/src/'
 -
 -override_dh_dkms:
 -	dh_dkms -V $(VERSION)
 -
 override_dh_auto_clean:
 	dh_auto_clean
 	@if test -e META.orig; then mv META.orig META; fi
 -	sed "s/@LINUX_COMPAT@/linux-libc-dev \(< $(shell debian/get_next.sh)\)/" debian/control.in > debian/control
 -
 -# ------------
 -
 -override_dh_prep-deb-files:
 -	for templ in $(wildcard $(CURDIR)/debian/*_KVERS_*.in); do \
 -		sed -e 's/##KVERS##/$(KVERS)/g ; s/#KVERS#/$(KVERS)/g ; s/_KVERS_/$(KVERS)/g ; s/##KDREV##/$(KDREV)/g ; s/#KDREV#/$(KDREV)/g ; s/_KDREV_/$(KDREV)/g ;  s/_ARCH_/$(DEB_HOST_ARCH)/g' \
 -		< $$templ > `echo $$templ | sed -e 's/_KVERS_/$(KVERS)/g ; s/_ARCH_/$(DEB_HOST_ARCH)/g ; s/\.in$$//'` ; \
 -	done
 -	sed -e 's/##KVERS##/$(KVERS)/g ; s/#KVERS#/$(KVERS)/g ; s/_KVERS_/$(KVERS)/g ; s/##KDREV##/$(KDREV)/g ; s/#KDREV#/$(KDREV)/g ; s/_KDREV_/$(KDREV)/g ; s/_ARCH_/$(DEB_HOST_ARCH)/g' \
 -	< debian/control.modules.in > debian/control
 -
 -override_dh_configure_modules: override_dh_configure_modules_stamp
 -override_dh_configure_modules_stamp:
 -	./configure --with-config=kernel --with-linux=$(KSRC) \
 -		--with-linux-obj=$(KOBJ) \
 -		--disable-debug-kmem
 -	touch override_dh_configure_modules_stamp
 -
 -override_dh_binary-modules-udeb: override_dh_prep-deb-files override_dh_configure_modules
 -	dh_testdir
 -	dh_testroot
 -	dh_prep
 -
 -	$(MAKE) -C $(CURDIR)/module modules
 -
 -	dh_installdirs -p${pmodules}-di
 -	dh_install -p${pmodules}-di
 -	dh_gencontrol -p${pmodules}-di
 -
 -	dh_builddeb -p${pmodules}-di
 -
 -override_dh_binary-modules: override_dh_prep-deb-files override_dh_configure_modules
 -	dh_testdir
 -	dh_testroot
 -	dh_prep
 -
 -	$(MAKE) -C $(CURDIR)/module modules
 -
 -	dh_installdocs -p${pmodules}
 -	dh_install -p${pmodules}
 -	dh_installchangelogs -p${pmodules}
 -	dh_compress -p${pmodules}
 -	dh_strip -p${pmodules}
 -	dh_fixperms -p${pmodules}
 -	dh_installdeb -p${pmodules}
 -	dh_gencontrol -p${pmodules}
 -	dh_md5sums -p${pmodules}
 -
 -	dh_builddeb -p${pmodules}
 +	cp debian/control.in debian/control
 -- 
 2.14.2
@@ -0,0 +1,70 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: gaurkuma <gaurkuma@users.noreply.github.com>
 Date: Fri, 11 Aug 2017 08:53:35 -0700
 Subject: [PATCH] Allow longer SPA names in stats
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Reviewed-by: Giuseppe Di Natale <dinatale2@llnl.gov>
 Signed-off-by: gaurkuma <gauravk.18@gmail.com>
 Closes #641
 (cherry picked from commit cbf0dff3d8a13c2b4e547321ff2005055521e5ee)
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 ---
 include/sys/kstat.h    |  2 +-
 module/spl/spl-kstat.c | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)
 diff --git a/include/sys/kstat.h b/include/sys/kstat.h
 index faf6b81..7862ab0 100644
 --- a/include/sys/kstat.h
 +++ b/include/sys/kstat.h
@@ -32,7 +32,7 @@
 #include <sys/kmem.h>
 #include <sys/mutex.h>
 -#define KSTAT_STRLEN            31
 +#define KSTAT_STRLEN            255
 #define KSTAT_RAW_MAX		(128*1024)
 /* For reference valid classes are:
 diff --git a/module/spl/spl-kstat.c b/module/spl/spl-kstat.c
 index e306915..ed52653 100644
 --- a/module/spl/spl-kstat.c
 +++ b/module/spl/spl-kstat.c
@@ -614,21 +614,26 @@ kstat_detect_collision(kstat_t *ksp)
 {
 	kstat_module_t *module;
 	kstat_t *tmp;
 -	char parent[KSTAT_STRLEN+1];
 +	char *parent;
 	char *cp;
 -	(void) strlcpy(parent, ksp->ks_module, sizeof(parent));
 +	parent = kmem_asprintf("%s", ksp->ks_module);
 -	if ((cp = strrchr(parent, '/')) == NULL)
 +	if ((cp = strrchr(parent, '/')) == NULL) {
 +		strfree(parent);
 		return (0);
 +	}
 	cp[0] = '\0';
 	if ((module = kstat_find_module(parent)) != NULL) {
 		list_for_each_entry(tmp, &module->ksm_kstat_list, ks_list)
 -			if (strncmp(tmp->ks_name, cp+1, KSTAT_STRLEN) == 0)
 +			if (strncmp(tmp->ks_name, cp+1, KSTAT_STRLEN) == 0) {
 +				strfree(parent);
 				return (EEXIST);
 +			}
 	}
 +	strfree(parent);
 	return (0);
 }
 -- 
 2.14.2
@@ -0,0 +1,527 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Brian Behlendorf <behlendorf1@llnl.gov>
 Date: Fri, 27 Oct 2017 15:49:14 -0700
 Subject: [PATCH] Remove vn_rename and vn_remove
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 Both vn_rename and vn_remove have been historically problematic
 to implement reliably.  Rather than fixing them yet again they
 are being removed.
 Reviewed-by: Arkadiusz Bubala <arkadiusz.bubala@open-e.com>
 Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Closes #648
 Closes #661
 (cherry picked from commit 1cb26f06524bdddef24352a3d9ac90a402294f2b)
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 ---
 include/sys/vnode.h        |   2 -
 module/spl/spl-vnode.c     | 217 ---------------------------------------------
 module/splat/splat-vnode.c |  96 --------------------
 config/spl-build.m4        | 101 ---------------------
 4 files changed, 416 deletions(-)
 diff --git a/include/sys/vnode.h b/include/sys/vnode.h
 index 0b857d3..ad7f8f4 100644
 --- a/include/sys/vnode.h
 +++ b/include/sys/vnode.h
@@ -177,8 +177,6 @@ extern int vn_rdwr(uio_rw_t uio, vnode_t *vp, void *addr, ssize_t len,
 extern int vn_close(vnode_t *vp, int flags, int x1, int x2, void *x3, void *x4);
 extern int vn_seek(vnode_t *vp, offset_t o, offset_t *op, void *ct);
 -extern int vn_remove(const char *path, uio_seg_t seg, int flags);
 -extern int vn_rename(const char *path1, const char *path2, int x1);
 extern int vn_getattr(vnode_t *vp, vattr_t *vap, int flags, void *x3, void *x4);
 extern int vn_fsync(vnode_t *vp, int flags, void *x3, void *x4);
 extern int vn_space(vnode_t *vp, int cmd, struct flock *bfp, int flag,
 diff --git a/module/spl/spl-vnode.c b/module/spl/spl-vnode.c
 index ca19d73..77bfb45 100644
 --- a/module/spl/spl-vnode.c
 +++ b/module/spl/spl-vnode.c
@@ -269,223 +269,6 @@ vn_seek(vnode_t *vp, offset_t ooff, offset_t *noffp, void *ct)
 }
 EXPORT_SYMBOL(vn_seek);
 -/*
 - * spl_basename() takes a NULL-terminated string s as input containing a path.
 - * It returns a char pointer to a string and a length that describe the
 - * basename of the path. If the basename is not "." or "/", it will be an index
 - * into the string. While the string should be NULL terminated, the section
 - * referring to the basename is not. spl_basename is dual-licensed GPLv2+ and
 - * CC0. Anyone wishing to reuse it in another codebase may pick either license.
 - */
 -static void
 -spl_basename(const char *s, const char **str, int *len)
 -{
 -	size_t i, end;
 -
 -	ASSERT(str);
 -	ASSERT(len);
 -
 -	if (!s || !*s) {
 -		*str = ".";
 -		*len = 1;
 -		return;
 -	}
 -
 -	i = strlen(s) - 1;
 -
 -	while (i && s[i--] == '/');
 -
 -	if (i == 0) {
 -		*str = "/";
 -		*len = 1;
 -		return;
 -	}
 -
 -	end = i;
 -
 -	for (end = i; i; i--) {
 -		if (s[i] == '/') {
 -			*str = &s[i+1];
 -			*len = end - i + 1;
 -			return;
 -		}
 -	}
 -
 -	*str = s;
 -	*len = end + 1;
 -}
 -
 -static struct dentry *
 -spl_kern_path_locked(const char *name, struct path *path)
 -{
 -	struct path parent;
 -	struct dentry *dentry;
 -	const char *basename;
 -	int len;
 -	int rc;
 -
 -	ASSERT(name);
 -	ASSERT(path);
 -
 -	spl_basename(name, &basename, &len);
 -
 -	/* We do not accept "." or ".." */
 -	if (len <= 2 && basename[0] == '.')
 -		if (len == 1 || basename[1] == '.')
 -			return (ERR_PTR(-EACCES));
 -
 -	rc = kern_path(name, LOOKUP_PARENT, &parent);
 -	if (rc)
 -		return (ERR_PTR(rc));
 -
 -	/* use I_MUTEX_PARENT because vfs_unlink needs it */
 -	spl_inode_lock_nested(parent.dentry->d_inode, I_MUTEX_PARENT);
 -
 -	dentry = lookup_one_len(basename, parent.dentry, len);
 -	if (IS_ERR(dentry)) {
 -		spl_inode_unlock(parent.dentry->d_inode);
 -		path_put(&parent);
 -	} else {
 -		*path = parent;
 -	}
 -
 -	return (dentry);
 -}
 -
 -/* Based on do_unlinkat() from linux/fs/namei.c */
 -int
 -vn_remove(const char *path, uio_seg_t seg, int flags)
 -{
 -	struct dentry *dentry;
 -	struct path parent;
 -	struct inode *inode = NULL;
 -	int rc = 0;
 -
 -	ASSERT(seg == UIO_SYSSPACE);
 -	ASSERT(flags == RMFILE);
 -
 -	dentry = spl_kern_path_locked(path, &parent);
 -	rc = PTR_ERR(dentry);
 -	if (!IS_ERR(dentry)) {
 -		if (parent.dentry->d_name.name[parent.dentry->d_name.len]) {
 -			rc = 0;
 -			goto slashes;
 -		}
 -
 -		inode = dentry->d_inode;
 -		if (inode) {
 -			atomic_inc(&inode->i_count);
 -		} else {
 -			rc = 0;
 -			goto slashes;
 -		}
 -
 -#ifdef HAVE_2ARGS_VFS_UNLINK
 -		rc = vfs_unlink(parent.dentry->d_inode, dentry);
 -#else
 -		rc = vfs_unlink(parent.dentry->d_inode, dentry, NULL);
 -#endif /* HAVE_2ARGS_VFS_UNLINK */
 -exit1:
 -		dput(dentry);
 -	} else {
 -		return (-rc);
 -	}
 -
 -	spl_inode_unlock(parent.dentry->d_inode);
 -	if (inode)
 -		iput(inode);    /* truncate the inode here */
 -
 -	path_put(&parent);
 -	return (-rc);
 -
 -slashes:
 -	rc = !dentry->d_inode ? -ENOENT :
 -	    S_ISDIR(dentry->d_inode->i_mode) ? -EISDIR : -ENOTDIR;
 -	goto exit1;
 -} /* vn_remove() */
 -EXPORT_SYMBOL(vn_remove);
 -
 -/* Based on do_rename() from linux/fs/namei.c */
 -int
 -vn_rename(const char *oldname, const char *newname, int x1)
 -{
 -	struct dentry *old_dir, *new_dir;
 -	struct dentry *old_dentry, *new_dentry;
 -	struct dentry *trap;
 -	struct path old_parent, new_parent;
 -	int rc = 0;
 -
 -	old_dentry = spl_kern_path_locked(oldname, &old_parent);
 -	if (IS_ERR(old_dentry)) {
 -		rc = PTR_ERR(old_dentry);
 -		goto exit;
 -	}
 -
 -	spl_inode_unlock(old_parent.dentry->d_inode);
 -
 -	new_dentry = spl_kern_path_locked(newname, &new_parent);
 -	if (IS_ERR(new_dentry)) {
 -		rc = PTR_ERR(new_dentry);
 -		goto exit2;
 -	}
 -
 -	spl_inode_unlock(new_parent.dentry->d_inode);
 -
 -	rc = -EXDEV;
 -	if (old_parent.mnt != new_parent.mnt)
 -		goto exit3;
 -
 -	old_dir = old_parent.dentry;
 -	new_dir = new_parent.dentry;
 -	trap = lock_rename(new_dir, old_dir);
 -
 -	/* source should not be ancestor of target */
 -	rc = -EINVAL;
 -	if (old_dentry == trap)
 -		goto exit4;
 -
 -	/* target should not be an ancestor of source */
 -	rc = -ENOTEMPTY;
 -	if (new_dentry == trap)
 -		goto exit4;
 -
 -	/* source must exist */
 -	rc = -ENOENT;
 -	if (!old_dentry->d_inode)
 -		goto exit4;
 -
 -	/* unless the source is a directory trailing slashes give -ENOTDIR */
 -	if (!S_ISDIR(old_dentry->d_inode->i_mode)) {
 -		rc = -ENOTDIR;
 -		if (old_dentry->d_name.name[old_dentry->d_name.len])
 -			goto exit4;
 -		if (new_dentry->d_name.name[new_dentry->d_name.len])
 -			goto exit4;
 -	}
 -
 -#if defined(HAVE_4ARGS_VFS_RENAME)
 -	rc = vfs_rename(old_dir->d_inode, old_dentry,
 -	    new_dir->d_inode, new_dentry);
 -#elif defined(HAVE_5ARGS_VFS_RENAME)
 -	rc = vfs_rename(old_dir->d_inode, old_dentry,
 -	    new_dir->d_inode, new_dentry, NULL);
 -#else
 -	rc = vfs_rename(old_dir->d_inode, old_dentry,
 -	    new_dir->d_inode, new_dentry, NULL, 0);
 -#endif
 -exit4:
 -	unlock_rename(new_dir, old_dir);
 -exit3:
 -	dput(new_dentry);
 -	path_put(&new_parent);
 -exit2:
 -	dput(old_dentry);
 -	path_put(&old_parent);
 -exit:
 -	return (-rc);
 -}
 -EXPORT_SYMBOL(vn_rename);
 -
 int
 vn_getattr(vnode_t *vp, vattr_t *vap, int flags, void *x3, void *x4)
 {
 diff --git a/module/splat/splat-vnode.c b/module/splat/splat-vnode.c
 index ad69cf6..9160003 100644
 --- a/module/splat/splat-vnode.c
 +++ b/module/splat/splat-vnode.c
@@ -42,10 +42,6 @@
 #define SPLAT_VNODE_TEST3_NAME		"vn_rdwr"
 #define SPLAT_VNODE_TEST3_DESC		"Vn_rdwrt Test"
 -#define SPLAT_VNODE_TEST4_ID		0x0904
 -#define SPLAT_VNODE_TEST4_NAME		"vn_rename"
 -#define SPLAT_VNODE_TEST4_DESC		"Vn_rename Test"
 -
 #define SPLAT_VNODE_TEST5_ID		0x0905
 #define SPLAT_VNODE_TEST5_NAME		"vn_getattr"
 #define SPLAT_VNODE_TEST5_DESC		"Vn_getattr Test"
@@ -218,94 +214,10 @@ splat_vnode_test3(struct file *file, void *arg)
 out:
         VOP_CLOSE(vp, 0, 0, 0, 0, 0);
 -	vn_remove(SPLAT_VNODE_TEST_FILE_RW, UIO_SYSSPACE, RMFILE);
         return -rc;
 } /* splat_vnode_test3() */
 -#if LINUX_VERSION_CODE <= KERNEL_VERSION(4,1,0)
 -static int
 -splat_vnode_test4(struct file *file, void *arg)
 -{
 -	vnode_t *vp;
 -	char buf1[32] = "SPL VNode Interface Test File\n";
 -	char buf2[32] = "";
 -	int rc;
 -
 -	if ((rc = splat_vnode_unlink_all(file, arg, SPLAT_VNODE_TEST4_NAME)))
 -		return rc;
 -
 -	if ((rc = vn_open(SPLAT_VNODE_TEST_FILE_RW1, UIO_SYSSPACE,
 -			  FWRITE | FREAD | FCREAT | FEXCL, 0644, &vp, 0, 0))) {
 -		splat_vprint(file, SPLAT_VNODE_TEST4_NAME,
 -			     "Failed to vn_open test file: %s (%d)\n",
 -			     SPLAT_VNODE_TEST_FILE_RW1, rc);
 -		goto out;
 -	}
 -
 -        rc = vn_rdwr(UIO_WRITE, vp, buf1, strlen(buf1), 0,
 -                     UIO_SYSSPACE, 0, RLIM64_INFINITY, 0, NULL);
 -	if (rc) {
 -		splat_vprint(file, SPLAT_VNODE_TEST4_NAME,
 -			     "Failed vn_rdwr write of test file: %s (%d)\n",
 -			     SPLAT_VNODE_TEST_FILE_RW1, rc);
 -		goto out2;
 -	}
 -
 -        VOP_CLOSE(vp, 0, 0, 0, 0, 0);
 -
 -	rc = vn_rename(SPLAT_VNODE_TEST_FILE_RW1,SPLAT_VNODE_TEST_FILE_RW2,0);
 -	if (rc) {
 -		splat_vprint(file, SPLAT_VNODE_TEST4_NAME, "Failed vn_rename "
 -			     "%s -> %s (%d)\n",
 -			     SPLAT_VNODE_TEST_FILE_RW1,
 -			     SPLAT_VNODE_TEST_FILE_RW2, rc);
 -		goto out;
 -	}
 -
 -	if ((rc = vn_open(SPLAT_VNODE_TEST_FILE_RW2, UIO_SYSSPACE,
 -			  FREAD | FEXCL, 0644, &vp, 0, 0))) {
 -		splat_vprint(file, SPLAT_VNODE_TEST4_NAME,
 -			     "Failed to vn_open test file: %s (%d)\n",
 -			     SPLAT_VNODE_TEST_FILE_RW2, rc);
 -		goto out;
 -	}
 -
 -        rc = vn_rdwr(UIO_READ, vp, buf2, strlen(buf1), 0,
 -                     UIO_SYSSPACE, 0, RLIM64_INFINITY, 0, NULL);
 -	if (rc) {
 -		splat_vprint(file, SPLAT_VNODE_TEST4_NAME,
 -			     "Failed vn_rdwr read of test file: %s (%d)\n",
 -			     SPLAT_VNODE_TEST_FILE_RW2, rc);
 -		goto out2;
 -	}
 -
 -	if (strncmp(buf1, buf2, strlen(buf1))) {
 -		rc = EINVAL;
 -		splat_vprint(file, SPLAT_VNODE_TEST4_NAME,
 -			     "Failed strncmp data written does not match "
 -			     "data read\nWrote: %sRead:  %s\n", buf1, buf2);
 -		goto out2;
 -	}
 -
 -	rc = 0;
 -	splat_vprint(file, SPLAT_VNODE_TEST4_NAME, "Wrote to %s:  %s",
 -		     SPLAT_VNODE_TEST_FILE_RW1, buf1);
 -	splat_vprint(file, SPLAT_VNODE_TEST4_NAME, "Read from %s: %s",
 -		     SPLAT_VNODE_TEST_FILE_RW2, buf2);
 -	splat_vprint(file, SPLAT_VNODE_TEST4_NAME, "Successfully renamed "
 -		     "test file %s -> %s and verified data pattern\n",
 -		     SPLAT_VNODE_TEST_FILE_RW1, SPLAT_VNODE_TEST_FILE_RW2);
 -out2:
 -        VOP_CLOSE(vp, 0, 0, 0, 0, 0);
 -out:
 -	vn_remove(SPLAT_VNODE_TEST_FILE_RW1, UIO_SYSSPACE, RMFILE);
 -	vn_remove(SPLAT_VNODE_TEST_FILE_RW2, UIO_SYSSPACE, RMFILE);
 -
 -        return -rc;
 -} /* splat_vnode_test4() */
 -#endif
 -
 static int
 splat_vnode_test5(struct file *file, void *arg)
 {
@@ -387,7 +299,6 @@ splat_vnode_test6(struct file *file, void *arg)
 		     "fsync'ed test file %s\n", SPLAT_VNODE_TEST_FILE_RW);
 out:
         VOP_CLOSE(vp, 0, 0, 0, 0, 0);
 -	vn_remove(SPLAT_VNODE_TEST_FILE_RW, UIO_SYSSPACE, RMFILE);
         return -rc;
 } /* splat_vnode_test6() */
@@ -415,10 +326,6 @@ splat_vnode_init(void)
 	                SPLAT_VNODE_TEST2_ID, splat_vnode_test2);
         splat_test_init(sub, SPLAT_VNODE_TEST3_NAME, SPLAT_VNODE_TEST3_DESC,
 	                SPLAT_VNODE_TEST3_ID, splat_vnode_test3);
 -#if LINUX_VERSION_CODE <= KERNEL_VERSION(4,1,0)
 -        splat_test_init(sub, SPLAT_VNODE_TEST4_NAME, SPLAT_VNODE_TEST4_DESC,
 -	                SPLAT_VNODE_TEST4_ID, splat_vnode_test4);
 -#endif
         splat_test_init(sub, SPLAT_VNODE_TEST5_NAME, SPLAT_VNODE_TEST5_DESC,
 	                SPLAT_VNODE_TEST5_ID, splat_vnode_test5);
         splat_test_init(sub, SPLAT_VNODE_TEST6_NAME, SPLAT_VNODE_TEST6_DESC,
@@ -434,9 +341,6 @@ splat_vnode_fini(splat_subsystem_t *sub)
         splat_test_fini(sub, SPLAT_VNODE_TEST6_ID);
         splat_test_fini(sub, SPLAT_VNODE_TEST5_ID);
 -#if LINUX_VERSION_CODE <= KERNEL_VERSION(4,1,0)
 -        splat_test_fini(sub, SPLAT_VNODE_TEST4_ID);
 -#endif
         splat_test_fini(sub, SPLAT_VNODE_TEST3_ID);
         splat_test_fini(sub, SPLAT_VNODE_TEST2_ID);
         splat_test_fini(sub, SPLAT_VNODE_TEST1_ID);
 diff --git a/config/spl-build.m4 b/config/spl-build.m4
 index 25013b5..926abd5 100644
 --- a/config/spl-build.m4
 +++ b/config/spl-build.m4
@@ -27,8 +27,6 @@ AC_DEFUN([SPL_AC_CONFIG_KERNEL], [
 	SPL_AC_CONFIG_TRIM_UNUSED_KSYMS
 	SPL_AC_PDE_DATA
 	SPL_AC_SET_FS_PWD_WITH_CONST
 -	SPL_AC_2ARGS_VFS_UNLINK
 -	SPL_AC_4ARGS_VFS_RENAME
 	SPL_AC_2ARGS_VFS_FSYNC
 	SPL_AC_INODE_TRUNCATE_RANGE
 	SPL_AC_FS_STRUCT_SPINLOCK
@@ -936,105 +934,6 @@ AC_DEFUN([SPL_AC_SET_FS_PWD_WITH_CONST],
 	EXTRA_KCFLAGS="$tmp_flags"
 ])
 -dnl #
 -dnl # 3.13 API change
 -dnl # vfs_unlink() updated to take a third delegated_inode argument.
 -dnl #
 -AC_DEFUN([SPL_AC_2ARGS_VFS_UNLINK],
 -	[AC_MSG_CHECKING([whether vfs_unlink() wants 2 args])
 -	SPL_LINUX_TRY_COMPILE([
 -		#include <linux/fs.h>
 -	],[
 -		vfs_unlink((struct inode *) NULL, (struct dentry *) NULL);
 -	],[
 -		AC_MSG_RESULT(yes)
 -		AC_DEFINE(HAVE_2ARGS_VFS_UNLINK, 1,
 -		          [vfs_unlink() wants 2 args])
 -	],[
 -		AC_MSG_RESULT(no)
 -		dnl #
 -		dnl # Linux 3.13 API change
 -		dnl # Added delegated inode
 -		dnl #
 -		AC_MSG_CHECKING([whether vfs_unlink() wants 3 args])
 -		SPL_LINUX_TRY_COMPILE([
 -			#include <linux/fs.h>
 -		],[
 -			vfs_unlink((struct inode *) NULL,
 -				(struct dentry *) NULL,
 -				(struct inode **) NULL);
 -		],[
 -			AC_MSG_RESULT(yes)
 -			AC_DEFINE(HAVE_3ARGS_VFS_UNLINK, 1,
 -				  [vfs_unlink() wants 3 args])
 -		],[
 -			AC_MSG_ERROR(no)
 -		])
 -
 -	])
 -])
 -
 -dnl #
 -dnl # 3.13 and 3.15 API changes
 -dnl # Added delegated inode and flags argument.
 -dnl #
 -AC_DEFUN([SPL_AC_4ARGS_VFS_RENAME],
 -	[AC_MSG_CHECKING([whether vfs_rename() wants 4 args])
 -	SPL_LINUX_TRY_COMPILE([
 -		#include <linux/fs.h>
 -	],[
 -		vfs_rename((struct inode *) NULL, (struct dentry *) NULL,
 -			(struct inode *) NULL, (struct dentry *) NULL);
 -	],[
 -		AC_MSG_RESULT(yes)
 -		AC_DEFINE(HAVE_4ARGS_VFS_RENAME, 1,
 -		          [vfs_rename() wants 4 args])
 -	],[
 -		AC_MSG_RESULT(no)
 -		dnl #
 -		dnl # Linux 3.13 API change
 -		dnl # Added delegated inode
 -		dnl #
 -		AC_MSG_CHECKING([whether vfs_rename() wants 5 args])
 -		SPL_LINUX_TRY_COMPILE([
 -			#include <linux/fs.h>
 -		],[
 -			vfs_rename((struct inode *) NULL,
 -				(struct dentry *) NULL,
 -				(struct inode *) NULL,
 -				(struct dentry *) NULL,
 -				(struct inode **) NULL);
 -		],[
 -			AC_MSG_RESULT(yes)
 -			AC_DEFINE(HAVE_5ARGS_VFS_RENAME, 1,
 -				  [vfs_rename() wants 5 args])
 -		],[
 -			AC_MSG_RESULT(no)
 -			dnl #
 -			dnl # Linux 3.15 API change
 -			dnl # Added flags
 -			dnl #
 -			AC_MSG_CHECKING([whether vfs_rename() wants 6 args])
 -			SPL_LINUX_TRY_COMPILE([
 -				#include <linux/fs.h>
 -			],[
 -				vfs_rename((struct inode *) NULL,
 -					(struct dentry *) NULL,
 -					(struct inode *) NULL,
 -					(struct dentry *) NULL,
 -					(struct inode **) NULL,
 -					(unsigned int) 0);
 -			],[
 -				AC_MSG_RESULT(yes)
 -				AC_DEFINE(HAVE_6ARGS_VFS_RENAME, 1,
 -					  [vfs_rename() wants 6 args])
 -			],[
 -				AC_MSG_ERROR(no)
 -			])
 -		])
 -	])
 -])
 -
 dnl #
 dnl # 2.6.36 API change,
 dnl # The 'struct fs_struct->lock' was changed from a rwlock_t to
 -- 
 2.14.2
@@ -0,0 +1,169 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: James Cowgill <jcowgill@users.noreply.github.com>
 Date: Mon, 30 Oct 2017 18:16:56 +0000
 Subject: [PATCH] Remove all spin_is_locked calls
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 On systems with CONFIG_SMP turned off, spin_is_locked always returns
 false causing these assertions to fail. Remove them as suggested in
 zfsonlinux/zfs#6558.
 Reviewed-by: George Melikov <mail@gmelikov.ru>
 Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Signed-off-by: James Cowgill <james.cowgill@mips.com>
 Closes #665
 (cherry picked from commit 9e573b7f9a5cf3e1cb6bb1b66bc35d5bb93cfaa9)
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 ---
 module/spl/spl-kmem-cache.c |  4 ----
 module/spl/spl-taskq.c      | 13 -------------
 module/spl/spl-tsd.c        |  1 -
 module/spl/spl-vnode.c      |  2 --
 4 files changed, 20 deletions(-)
 diff --git a/module/spl/spl-kmem-cache.c b/module/spl/spl-kmem-cache.c
 index 45576b9..3668669 100644
 --- a/module/spl/spl-kmem-cache.c
 +++ b/module/spl/spl-kmem-cache.c
@@ -382,7 +382,6 @@ spl_slab_free(spl_kmem_slab_t *sks,
 	skc = sks->sks_cache;
 	ASSERT(skc->skc_magic == SKC_MAGIC);
 -	ASSERT(spin_is_locked(&skc->skc_lock));
 	/*
 	 * Update slab/objects counters in the cache, then remove the
@@ -583,7 +582,6 @@ __spl_cache_flush(spl_kmem_cache_t *skc, spl_kmem_magazine_t *skm, int flush)
 	ASSERT(skc->skc_magic == SKC_MAGIC);
 	ASSERT(skm->skm_magic == SKM_MAGIC);
 -	ASSERT(spin_is_locked(&skc->skc_lock));
 	for (i = 0; i < count; i++)
 		spl_cache_shrink(skc, skm->skm_objs[i]);
@@ -1125,7 +1123,6 @@ spl_cache_obj(spl_kmem_cache_t *skc, spl_kmem_slab_t *sks)
 	ASSERT(skc->skc_magic == SKC_MAGIC);
 	ASSERT(sks->sks_magic == SKS_MAGIC);
 -	ASSERT(spin_is_locked(&skc->skc_lock));
 	sko = list_entry(sks->sks_free_list.next, spl_kmem_obj_t, sko_list);
 	ASSERT(sko->sko_magic == SKO_MAGIC);
@@ -1396,7 +1393,6 @@ spl_cache_shrink(spl_kmem_cache_t *skc, void *obj)
 	spl_kmem_obj_t *sko = NULL;
 	ASSERT(skc->skc_magic == SKC_MAGIC);
 -	ASSERT(spin_is_locked(&skc->skc_lock));
 	sko = spl_sko_from_obj(skc, obj);
 	ASSERT(sko->sko_magic == SKO_MAGIC);
 diff --git a/module/spl/spl-taskq.c b/module/spl/spl-taskq.c
 index 89c53a5..ae26bdb 100644
 --- a/module/spl/spl-taskq.c
 +++ b/module/spl/spl-taskq.c
@@ -103,7 +103,6 @@ task_alloc(taskq_t *tq, uint_t flags, unsigned long *irqflags)
 	int count = 0;
 	ASSERT(tq);
 -	ASSERT(spin_is_locked(&tq->tq_lock));
 retry:
 	/* Acquire taskq_ent_t's from free list if available */
 	if (!list_empty(&tq->tq_free_list) && !(flags & TQ_NEW)) {
@@ -168,7 +167,6 @@ task_free(taskq_t *tq, taskq_ent_t *t)
 {
 	ASSERT(tq);
 	ASSERT(t);
 -	ASSERT(spin_is_locked(&tq->tq_lock));
 	ASSERT(list_empty(&t->tqent_list));
 	ASSERT(!timer_pending(&t->tqent_timer));
@@ -185,7 +183,6 @@ task_done(taskq_t *tq, taskq_ent_t *t)
 {
 	ASSERT(tq);
 	ASSERT(t);
 -	ASSERT(spin_is_locked(&tq->tq_lock));
 	/* Wake tasks blocked in taskq_wait_id() */
 	wake_up_all(&t->tqent_waitq);
@@ -274,7 +271,6 @@ taskq_lowest_id(taskq_t *tq)
 	taskq_thread_t *tqt;
 	ASSERT(tq);
 -	ASSERT(spin_is_locked(&tq->tq_lock));
 	if (!list_empty(&tq->tq_pend_list)) {
 		t = list_entry(tq->tq_pend_list.next, taskq_ent_t, tqent_list);
@@ -312,7 +308,6 @@ taskq_insert_in_order(taskq_t *tq, taskq_thread_t *tqt)
 	ASSERT(tq);
 	ASSERT(tqt);
 -	ASSERT(spin_is_locked(&tq->tq_lock));
 	list_for_each_prev(l, &tq->tq_active_list) {
 		w = list_entry(l, taskq_thread_t, tqt_active_list);
@@ -335,8 +330,6 @@ taskq_find_list(taskq_t *tq, struct list_head *lh, taskqid_t id)
 	struct list_head *l;
 	taskq_ent_t *t;
 -	ASSERT(spin_is_locked(&tq->tq_lock));
 -
 	list_for_each(l, lh) {
 		t = list_entry(l, taskq_ent_t, tqent_list);
@@ -363,8 +356,6 @@ taskq_find(taskq_t *tq, taskqid_t id)
 	struct list_head *l;
 	taskq_ent_t *t;
 -	ASSERT(spin_is_locked(&tq->tq_lock));
 -
 	t = taskq_find_list(tq, &tq->tq_delay_list, id);
 	if (t)
 		return (t);
@@ -774,8 +765,6 @@ taskq_next_ent(taskq_t *tq)
 {
 	struct list_head *list;
 -	ASSERT(spin_is_locked(&tq->tq_lock));
 -
 	if (!list_empty(&tq->tq_prio_list))
 		list = &tq->tq_prio_list;
 	else if (!list_empty(&tq->tq_pend_list))
@@ -840,8 +829,6 @@ taskq_thread_spawn(taskq_t *tq)
 static int
 taskq_thread_should_stop(taskq_t *tq, taskq_thread_t *tqt)
 {
 -	ASSERT(spin_is_locked(&tq->tq_lock));
 -
 	if (!(tq->tq_flags & TASKQ_DYNAMIC))
 		return (0);
 diff --git a/module/spl/spl-tsd.c b/module/spl/spl-tsd.c
 index bf82350..4c80029 100644
 --- a/module/spl/spl-tsd.c
 +++ b/module/spl/spl-tsd.c
@@ -315,7 +315,6 @@ tsd_hash_add_pid(tsd_hash_table_t *table, pid_t pid)
 static void
 tsd_hash_del(tsd_hash_table_t *table, tsd_hash_entry_t *entry)
 {
 -	ASSERT(spin_is_locked(&table->ht_lock));
 	hlist_del(&entry->he_list);
 	list_del_init(&entry->he_key_list);
 	list_del_init(&entry->he_pid_list);
 diff --git a/module/spl/spl-vnode.c b/module/spl/spl-vnode.c
 index 77bfb45..a804e10 100644
 --- a/module/spl/spl-vnode.c
 +++ b/module/spl/spl-vnode.c
@@ -414,8 +414,6 @@ file_find(int fd, struct task_struct *task)
 {
         file_t *fp;
 -	ASSERT(spin_is_locked(&vn_file_lock));
 -
         list_for_each_entry(fp, &vn_file_list,  f_list) {
 		if (fd == fp->f_fd && fp->f_task == task) {
 			ASSERT(atomic_read(&fp->f_ref) != 0);
 -- 
 2.14.2
@@ -0,0 +1,189 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Brian Behlendorf <behlendorf1@llnl.gov>
 Date: Wed, 24 Jan 2018 11:33:47 -0800
 Subject: [PATCH] Add cv_timedwait_io()
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 Add missing helper function cv_timedwait_io(), it should be used
 when waiting on IO with a specified timeout.
 Reviewed-by: Tim Chase <tim@chase2k.com>
 Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Closes #674
 (cherry picked from commit ba003d46e3269ead9128b537f8f31c44bc3a974f)
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 ---
 include/sys/condvar.h    |  2 ++
 module/spl/spl-condvar.c | 58 +++++++++++++++++++++++++++++++++++++++++-------
 config/spl-build.m4      | 21 ++++++++++++++++++
 3 files changed, 73 insertions(+), 8 deletions(-)
 diff --git a/include/sys/condvar.h b/include/sys/condvar.h
 index 5479e75..5fcc906 100644
 --- a/include/sys/condvar.h
 +++ b/include/sys/condvar.h
@@ -56,6 +56,7 @@ extern void __cv_wait(kcondvar_t *, kmutex_t *);
 extern void __cv_wait_io(kcondvar_t *, kmutex_t *);
 extern void __cv_wait_sig(kcondvar_t *, kmutex_t *);
 extern clock_t __cv_timedwait(kcondvar_t *, kmutex_t *, clock_t);
 +extern clock_t __cv_timedwait_io(kcondvar_t *, kmutex_t *, clock_t);
 extern clock_t __cv_timedwait_sig(kcondvar_t *, kmutex_t *, clock_t);
 extern clock_t cv_timedwait_hires(kcondvar_t *, kmutex_t *, hrtime_t,
     hrtime_t res, int flag);
@@ -71,6 +72,7 @@ extern void __cv_broadcast(kcondvar_t *c);
 #define	cv_wait_sig(cvp, mp)			__cv_wait_sig(cvp, mp)
 #define	cv_wait_interruptible(cvp, mp)		cv_wait_sig(cvp, mp)
 #define	cv_timedwait(cvp, mp, t)		__cv_timedwait(cvp, mp, t)
 +#define	cv_timedwait_io(cvp, mp, t)		__cv_timedwait_io(cvp, mp, t)
 #define	cv_timedwait_sig(cvp, mp, t)		__cv_timedwait_sig(cvp, mp, t)
 #define	cv_timedwait_interruptible(cvp, mp, t)	cv_timedwait_sig(cvp, mp, t)
 #define	cv_signal(cvp)				__cv_signal(cvp)
 diff --git a/module/spl/spl-condvar.c b/module/spl/spl-condvar.c
 index 80c2ef0..4778fb2 100644
 --- a/module/spl/spl-condvar.c
 +++ b/module/spl/spl-condvar.c
@@ -136,6 +136,13 @@ __cv_wait(kcondvar_t *cvp, kmutex_t *mp)
 }
 EXPORT_SYMBOL(__cv_wait);
 +void
 +__cv_wait_io(kcondvar_t *cvp, kmutex_t *mp)
 +{
 +	cv_wait_common(cvp, mp, TASK_UNINTERRUPTIBLE, 1);
 +}
 +EXPORT_SYMBOL(__cv_wait_io);
 +
 void
 __cv_wait_sig(kcondvar_t *cvp, kmutex_t *mp)
 {
@@ -143,12 +150,34 @@ __cv_wait_sig(kcondvar_t *cvp, kmutex_t *mp)
 }
 EXPORT_SYMBOL(__cv_wait_sig);
 -void
 -__cv_wait_io(kcondvar_t *cvp, kmutex_t *mp)
 +#if defined(HAVE_IO_SCHEDULE_TIMEOUT)
 +#define	spl_io_schedule_timeout(t)	io_schedule_timeout(t)
 +#else
 +static void
 +__cv_wakeup(unsigned long data)
 {
 -	cv_wait_common(cvp, mp, TASK_UNINTERRUPTIBLE, 1);
 +	wake_up_process((struct task_struct *)data);
 }
 -EXPORT_SYMBOL(__cv_wait_io);
 +
 +static long
 +spl_io_schedule_timeout(long time_left)
 +{
 +	long expire_time = jiffies + time_left;
 +	struct timer_list timer;
 +
 +	init_timer(&timer);
 +	setup_timer(&timer, __cv_wakeup, (unsigned long)current);
 +	timer.expires = expire_time;
 +	add_timer(&timer);
 +
 +	io_schedule();
 +
 +	del_timer_sync(&timer);
 +	time_left = expire_time - jiffies;
 +
 +	return (time_left < 0 ? 0 : time_left);
 +}
 +#endif
 /*
  * 'expire_time' argument is an absolute wall clock time in jiffies.
@@ -156,7 +185,7 @@ EXPORT_SYMBOL(__cv_wait_io);
  */
 static clock_t
 __cv_timedwait_common(kcondvar_t *cvp, kmutex_t *mp, clock_t expire_time,
 -    int state)
 +    int state, int io)
 {
 	DEFINE_WAIT(wait);
 	kmutex_t *m;
@@ -188,7 +217,10 @@ __cv_timedwait_common(kcondvar_t *cvp, kmutex_t *mp, clock_t expire_time,
 	 * race where 'cvp->cv_waiters > 0' but the list is empty.
 	 */
 	mutex_exit(mp);
 -	time_left = schedule_timeout(time_left);
 +	if (io)
 +		time_left = spl_io_schedule_timeout(time_left);
 +	else
 +		time_left = schedule_timeout(time_left);
 	/* No more waiters a different mutex could be used */
 	if (atomic_dec_and_test(&cvp->cv_waiters)) {
@@ -214,14 +246,24 @@ __cv_timedwait_common(kcondvar_t *cvp, kmutex_t *mp, clock_t expire_time,
 clock_t
 __cv_timedwait(kcondvar_t *cvp, kmutex_t *mp, clock_t exp_time)
 {
 -	return (__cv_timedwait_common(cvp, mp, exp_time, TASK_UNINTERRUPTIBLE));
 +	return (__cv_timedwait_common(cvp, mp, exp_time,
 +	    TASK_UNINTERRUPTIBLE, 0));
 }
 EXPORT_SYMBOL(__cv_timedwait);
 +clock_t
 +__cv_timedwait_io(kcondvar_t *cvp, kmutex_t *mp, clock_t exp_time)
 +{
 +	return (__cv_timedwait_common(cvp, mp, exp_time,
 +	    TASK_UNINTERRUPTIBLE, 1));
 +}
 +EXPORT_SYMBOL(__cv_timedwait_io);
 +
 clock_t
 __cv_timedwait_sig(kcondvar_t *cvp, kmutex_t *mp, clock_t exp_time)
 {
 -	return (__cv_timedwait_common(cvp, mp, exp_time, TASK_INTERRUPTIBLE));
 +	return (__cv_timedwait_common(cvp, mp, exp_time,
 +	    TASK_INTERRUPTIBLE, 0));
 }
 EXPORT_SYMBOL(__cv_timedwait_sig);
 diff --git a/config/spl-build.m4 b/config/spl-build.m4
 index 926abd5..afc8de6 100644
 --- a/config/spl-build.m4
 +++ b/config/spl-build.m4
@@ -52,6 +52,7 @@ AC_DEFUN([SPL_AC_CONFIG_KERNEL], [
 	SPL_AC_KMEM_CACHE_CREATE_USERCOPY
 	SPL_AC_WAIT_QUEUE_ENTRY_T
 	SPL_AC_WAIT_QUEUE_HEAD_ENTRY
 +	SPL_AC_IO_SCHEDULE_TIMEOUT
 	SPL_AC_KERNEL_WRITE
 	SPL_AC_KERNEL_READ
 	SPL_AC_KERNEL_TIMER_FUNCTION_TIMER_LIST
@@ -1598,6 +1599,26 @@ AC_DEFUN([SPL_AC_WAIT_QUEUE_HEAD_ENTRY], [
 	])
 ])
 +dnl #
 +dnl # 3.19 API change
 +dnl # The io_schedule_timeout() function is present in all 2.6.32 kernels
 +dnl # but it was not exported until Linux 3.19.  The RHEL 7.x kernels which
 +dnl # are based on a 3.10 kernel do export this symbol.
 +dnl #
 +AC_DEFUN([SPL_AC_IO_SCHEDULE_TIMEOUT], [
 +	AC_MSG_CHECKING([whether io_schedule_timeout() is available])
 +	SPL_LINUX_TRY_COMPILE_SYMBOL([
 +		#include <linux/sched.h>
 +	], [
 +		(void) io_schedule_timeout(1);
 +	], [io_schedule_timeout], [], [
 +		AC_MSG_RESULT(yes)
 +		AC_DEFINE(HAVE_IO_SCHEDULE_TIMEOUT, 1, [yes])
 +	],[
 +		AC_MSG_RESULT(no)
 +	])
 +])
 +
 dnl #
 dnl # 4.14 API change
 dnl # kernel_write() which was introduced in 3.9 was updated to take
 -- 
 2.14.2
@@ -0,0 +1,48 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: DeHackEd <DeHackEd@users.noreply.github.com>
 Date: Wed, 21 Feb 2018 17:54:26 -0500
 Subject: [PATCH] Fix multiple evaluations of VERIFY() and ASSERT() on failures
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 Reviewed-by: loli10K <ezomori.nozomu@gmail.com>
 Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Signed-off-by: DHE <git@dehacked.net>
 Closes #684
 Closes #685
 (cherry picked from commit 610988f2dbf0e1c5811e6115d7ff8948b90a660e)
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 ---
 include/sys/debug.h | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)
 diff --git a/include/sys/debug.h b/include/sys/debug.h
 index 6d683c2..b523ea1 100644
 --- a/include/sys/debug.h
 +++ b/include/sys/debug.h
@@ -63,12 +63,15 @@ void spl_dumpstack(void);
 	    spl_panic(__FILE__, __FUNCTION__, __LINE__,			\
 	    "%s", "VERIFY(" #cond ") failed\n"))
 -#define	VERIFY3_IMPL(LEFT, OP, RIGHT, TYPE, FMT, CAST)			\
 -	(void) ((!((TYPE)(LEFT) OP (TYPE)(RIGHT))) &&			\
 -	    spl_panic(__FILE__, __FUNCTION__, __LINE__,			\
 -	    "VERIFY3(" #LEFT " " #OP " " #RIGHT ") "			\
 -	    "failed (" FMT " " #OP " " FMT ")\n",			\
 -	    CAST (LEFT), CAST (RIGHT)))
 +#define	VERIFY3_IMPL(LEFT, OP, RIGHT, TYPE, FMT, CAST)	do {		\
 +		TYPE _verify3_left = (TYPE)(LEFT);				\
 +		TYPE _verify3_right = (TYPE)(RIGHT);				\
 +		if (!(_verify3_left OP _verify3_right))			\
 +		    spl_panic(__FILE__, __FUNCTION__, __LINE__,		\
 +		    "VERIFY3(" #LEFT " " #OP " " #RIGHT ") "		\
 +		    "failed (" FMT " " #OP " " FMT ")\n",		\
 +		    CAST (_verify3_left), CAST (_verify3_right));	\
 +	} while (0)
 #define	VERIFY3B(x,y,z)	VERIFY3_IMPL(x, y, z, boolean_t, "%d", (boolean_t))
 #define	VERIFY3S(x,y,z)	VERIFY3_IMPL(x, y, z, int64_t, "%lld", (long long))
 -- 
 2.14.2
@@ -0,0 +1,36 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tomohiro Kusumi <kusumi.tomohiro@osnexus.com>
 Date: Mon, 19 Feb 2018 19:23:53 +0900
 Subject: [PATCH] Staticize kstat_default_update()
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 This is only used via ->ks_update of `kstat_t *`.
 This isn't exported nor do headers have its prototype.
 Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Signed-off-by: Tomohiro Kusumi <kusumi.tomohiro@osnexus.com>
 Closes #686
 (cherry picked from commit 76ede57c7d927f34fcb5df30c3e7f2b2254ff5ed)
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 ---
 module/spl/spl-kstat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/module/spl/spl-kstat.c b/module/spl/spl-kstat.c
 index d2baa49..e769510 100644
 --- a/module/spl/spl-kstat.c
 +++ b/module/spl/spl-kstat.c
@@ -327,7 +327,7 @@ restart:
 	return (-rc);
 }
 -int
 +static int
 kstat_default_update(kstat_t *ksp, int rw)
 {
 	ASSERT(ksp != NULL);
 -- 
 2.14.2
@@ -0,0 +1,50 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tomohiro Kusumi <kusumi.tomohiro@osnexus.com>
 Date: Mon, 19 Feb 2018 20:40:38 +0900
 Subject: [PATCH] Fix function name typos
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 vn_init() and vn_fini() had been renamed by 12ff95ff in 2011.
 Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Signed-off-by: Tomohiro Kusumi <kusumi.tomohiro@osnexus.com>
 Closes #686
 (cherry picked from commit cfbcc0d4d74ea3ad279706b63e7a13290d3e130a)
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 ---
 module/spl/spl-vnode.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 diff --git a/module/spl/spl-vnode.c b/module/spl/spl-vnode.c
 index 75d8936..23008af 100644
 --- a/module/spl/spl-vnode.c
 +++ b/module/spl/spl-vnode.c
@@ -658,7 +658,7 @@ vn_file_cache_constructor(void *buf, void *cdrarg, int kmflags)
 	INIT_LIST_HEAD(&fp->f_list);
 	return (0);
 -} /* file_cache_constructor() */
 +} /* vn_file_cache_constructor() */
 static void
 vn_file_cache_destructor(void *buf, void *cdrarg)
@@ -680,7 +680,7 @@ spl_vn_init(void)
 	    vn_file_cache_destructor, NULL, NULL, NULL, 0);
 	return (0);
 -} /* vn_init() */
 +} /* spl_vn_init() */
 void
 spl_vn_fini(void)
@@ -703,4 +703,4 @@ spl_vn_fini(void)
 	kmem_cache_destroy(vn_file_cache);
 	kmem_cache_destroy(vn_cache);
 -} /* vn_fini() */
 +} /* spl_vn_fini() */
 -- 
 2.14.2
@@ -0,0 +1,391 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Brian Behlendorf <behlendorf1@llnl.gov>
 Date: Sat, 24 Feb 2018 10:05:37 -0800
 Subject: [PATCH] Fix more cstyle warnings
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 This patch contains no functional changes.  It is solely intended
 to resolve cstyle warnings in order to facilitate moving the spl
 source code in to the zfs repository.
 Reviewed-by: Giuseppe Di Natale <dinatale2@llnl.gov>
 Reviewed by: George Melikov <mail@gmelikov.ru>
 Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Closes #687
 (cherry picked from commit 37a93c61226f3fd76f6f1e67291128a5d2d6d7c1)
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 ---
 module/spl/spl-err.c        |  5 ++++-
 module/spl/spl-generic.c    | 11 ++++++++---
 module/spl/spl-kmem-cache.c |  5 ++++-
 module/spl/spl-kmem.c       |  5 ++++-
 module/spl/spl-kstat.c      | 17 ++++++++++-------
 module/spl/spl-proc.c       | 18 ++++++++++--------
 module/spl/spl-thread.c     |  3 +--
 module/spl/spl-vnode.c      | 11 +++++------
 module/spl/spl-xdr.c        | 10 +++++-----
 9 files changed, 51 insertions(+), 34 deletions(-)
 diff --git a/module/spl/spl-err.c b/module/spl/spl-err.c
 index e089de2..adfa555 100644
 --- a/module/spl/spl-err.c
 +++ b/module/spl/spl-err.c
@@ -34,9 +34,11 @@
  * analysis and other such goodies.
  * But we would still default to the current default of not to do that.
  */
 +/* BEGIN CSTYLED */
 unsigned int spl_panic_halt;
 module_param(spl_panic_halt, uint, 0644);
 MODULE_PARM_DESC(spl_panic_halt, "Cause kernel panic on assertion failures");
 +/* END CSTYLED */
 /*
  * Limit the number of stack traces dumped to not more than 5 every
@@ -55,7 +57,8 @@ spl_dumpstack(void)
 EXPORT_SYMBOL(spl_dumpstack);
 int
 -spl_panic(const char *file, const char *func, int line, const char *fmt, ...) {
 +spl_panic(const char *file, const char *func, int line, const char *fmt, ...)
 +{
 	const char *newfile;
 	char msg[MAXMSGLEN];
 	va_list ap;
 diff --git a/module/spl/spl-generic.c b/module/spl/spl-generic.c
 index 80fc54c..1098d9a 100644
 --- a/module/spl/spl-generic.c
 +++ b/module/spl/spl-generic.c
@@ -50,10 +50,12 @@
 char spl_version[32] = "SPL v" SPL_META_VERSION "-" SPL_META_RELEASE;
 EXPORT_SYMBOL(spl_version);
 +/* BEGIN CSTYLED */
 unsigned long spl_hostid = 0;
 EXPORT_SYMBOL(spl_hostid);
 module_param(spl_hostid, ulong, 0644);
 MODULE_PARM_DESC(spl_hostid, "The system hostid.");
 +/* END CSTYLED */
 proc_t p0;
 EXPORT_SYMBOL(p0);
@@ -98,7 +100,8 @@ static DEFINE_PER_CPU(uint64_t[2], spl_pseudo_entropy);
  */
 static inline uint64_t
 -spl_rand_next(uint64_t *s) {
 +spl_rand_next(uint64_t *s)
 +{
 	uint64_t s1 = s[0];
 	const uint64_t s0 = s[1];
 	s[0] = s0;
@@ -108,7 +111,8 @@ spl_rand_next(uint64_t *s) {
 }
 static inline void
 -spl_rand_jump(uint64_t *s) {
 +spl_rand_jump(uint64_t *s)
 +{
 	static const uint64_t JUMP[] =
 	    { 0x8a5cd789635d2dff, 0x121fd2155c472f96 };
@@ -184,7 +188,8 @@ EXPORT_SYMBOL(random_get_pseudo_bytes);
  * Calculate number of leading of zeros for a 64-bit value.
  */
 static int
 -nlz64(uint64_t x) {
 +nlz64(uint64_t x)
 +{
 	register int n = 0;
 	if (x == 0)
 diff --git a/module/spl/spl-kmem-cache.c b/module/spl/spl-kmem-cache.c
 index e4bcdd8..c73a2fd 100644
 --- a/module/spl/spl-kmem-cache.c
 +++ b/module/spl/spl-kmem-cache.c
@@ -66,6 +66,7 @@
  * because it has been shown to improve responsiveness on low memory systems.
  * This policy may be changed by setting KMC_EXPIRE_AGE or KMC_EXPIRE_MEM.
  */
 +/* BEGIN CSTYLED */
 unsigned int spl_kmem_cache_expire = KMC_EXPIRE_MEM;
 EXPORT_SYMBOL(spl_kmem_cache_expire);
 module_param(spl_kmem_cache_expire, uint, 0644);
@@ -148,6 +149,7 @@ unsigned int spl_kmem_cache_kmem_threads = 4;
 module_param(spl_kmem_cache_kmem_threads, uint, 0444);
 MODULE_PARM_DESC(spl_kmem_cache_kmem_threads,
 	"Number of spl_kmem_cache threads");
 +/* END CSTYLED */
 /*
  * Slab allocation interfaces
@@ -356,8 +358,9 @@ out:
 	if (rc) {
 		if (skc->skc_flags & KMC_OFFSLAB)
 			list_for_each_entry_safe(sko,
 -			    n, &sks->sks_free_list, sko_list)
 +			    n, &sks->sks_free_list, sko_list) {
 				kv_free(skc, sko->sko_addr, offslab_size);
 +			}
 		kv_free(skc, base, skc->skc_slab_size);
 		sks = NULL;
 diff --git a/module/spl/spl-kmem.c b/module/spl/spl-kmem.c
 index bf9c6b1..e0d5510 100755
 --- a/module/spl/spl-kmem.c
 +++ b/module/spl/spl-kmem.c
@@ -44,6 +44,7 @@
  * allocations are quickly caught.  These warnings may be disabled by setting
  * the threshold to zero.
  */
 +/* BEGIN CSTYLED */
 unsigned int spl_kmem_alloc_warn = MIN(16 * PAGE_SIZE, 64 * 1024);
 module_param(spl_kmem_alloc_warn, uint, 0644);
 MODULE_PARM_DESC(spl_kmem_alloc_warn,
@@ -64,6 +65,7 @@ module_param(spl_kmem_alloc_max, uint, 0644);
 MODULE_PARM_DESC(spl_kmem_alloc_max,
 	"Maximum size in bytes for a kmem_alloc()");
 EXPORT_SYMBOL(spl_kmem_alloc_max);
 +/* END CSTYLED */
 int
 kmem_debugging(void)
@@ -520,10 +522,11 @@ spl_kmem_fini_tracking(struct list_head *list, spinlock_t *lock)
 		printk(KERN_WARNING "%-16s %-5s %-16s %s:%s\n", "address",
 		    "size", "data", "func", "line");
 -	list_for_each_entry(kd, list, kd_list)
 +	list_for_each_entry(kd, list, kd_list) {
 		printk(KERN_WARNING "%p %-5d %-16s %s:%d\n", kd->kd_addr,
 		    (int)kd->kd_size, spl_sprintf_addr(kd, str, 17, 8),
 		    kd->kd_func, kd->kd_line);
 +	}
 	spin_unlock_irqrestore(lock, flags);
 }
 diff --git a/module/spl/spl-kstat.c b/module/spl/spl-kstat.c
 index e769510..6970fcc 100644
 --- a/module/spl/spl-kstat.c
 +++ b/module/spl/spl-kstat.c
@@ -305,7 +305,7 @@ restart:
 			} else {
 				ASSERT(ksp->ks_ndata == 1);
 				rc = kstat_seq_show_raw(f, ksp->ks_data,
 -							ksp->ks_data_size);
 +				    ksp->ks_data_size);
 			}
 			break;
 		case KSTAT_TYPE_NAMED:
@@ -434,9 +434,10 @@ kstat_find_module(char *name)
 {
 	kstat_module_t *module;
 -	list_for_each_entry(module, &kstat_module_list, ksm_module_list)
 +	list_for_each_entry(module, &kstat_module_list, ksm_module_list) {
 		if (strncmp(name, module->ksm_name, KSTAT_STRLEN) == 0)
 			return (module);
 +	}
 	return (NULL);
 }
@@ -517,9 +518,9 @@ static struct file_operations proc_kstat_operations = {
 void
 __kstat_set_raw_ops(kstat_t *ksp,
 -		    int (*headers)(char *buf, size_t size),
 -		    int (*data)(char *buf, size_t size, void *data),
 -		    void *(*addr)(kstat_t *ksp, loff_t index))
 +    int (*headers)(char *buf, size_t size),
 +    int (*data)(char *buf, size_t size, void *data),
 +    void *(*addr)(kstat_t *ksp, loff_t index))
 {
 	ksp->ks_raw_ops.headers = headers;
 	ksp->ks_raw_ops.data    = data;
@@ -628,11 +629,12 @@ kstat_detect_collision(kstat_t *ksp)
 	cp[0] = '\0';
 	if ((module = kstat_find_module(parent)) != NULL) {
 -		list_for_each_entry(tmp, &module->ksm_kstat_list, ks_list)
 +		list_for_each_entry(tmp, &module->ksm_kstat_list, ks_list) {
 			if (strncmp(tmp->ks_name, cp+1, KSTAT_STRLEN) == 0) {
 				strfree(parent);
 				return (EEXIST);
 			}
 +		}
 	}
 	strfree(parent);
@@ -665,9 +667,10 @@ __kstat_install(kstat_t *ksp)
 	 * Only one entry by this name per-module, on failure the module
 	 * shouldn't be deleted because we know it has at least one entry.
 	 */
 -	list_for_each_entry(tmp, &module->ksm_kstat_list, ks_list)
 +	list_for_each_entry(tmp, &module->ksm_kstat_list, ks_list) {
 		if (strncmp(tmp->ks_name, ksp->ks_name, KSTAT_STRLEN) == 0)
 			goto out;
 +	}
 	list_add_tail(&ksp->ks_list, &module->ksm_kstat_list);
 diff --git a/module/spl/spl-proc.c b/module/spl/spl-proc.c
 index 60d6bbb..8ce5bbe 100644
 --- a/module/spl/spl-proc.c
 +++ b/module/spl/spl-proc.c
@@ -85,8 +85,8 @@ proc_copyin_string(char *kbuffer, int kbuffer_size, const char *ubuffer,
 }
 static int
 -proc_copyout_string(char *ubuffer, int ubuffer_size,
 -		    const char *kbuffer, char *append)
 +proc_copyout_string(char *ubuffer, int ubuffer_size, const char *kbuffer,
 +    char *append)
 {
 	/*
 	 * NB if 'append' != NULL, it's a single character to append to the
@@ -239,9 +239,11 @@ taskq_seq_show_headers(struct seq_file *f)
 #define	LHEAD_ACTIVE	4
 #define	LHEAD_SIZE	5
 +/* BEGIN CSTYLED */
 static unsigned int spl_max_show_tasks = 512;
 module_param(spl_max_show_tasks, uint, 0644);
 MODULE_PARM_DESC(spl_max_show_tasks, "Max number of tasks shown in taskq proc");
 +/* END CSTYLED */
 static int
 taskq_seq_show_impl(struct seq_file *f, void *p, boolean_t allflag)
@@ -719,15 +721,15 @@ spl_proc_init(void)
 		goto out;
 	}
 -	proc_spl_taskq_all = proc_create_data("taskq-all", 0444,
 -		proc_spl, &proc_taskq_all_operations, NULL);
 +	proc_spl_taskq_all = proc_create_data("taskq-all", 0444, proc_spl,
 +	    &proc_taskq_all_operations, NULL);
 	if (proc_spl_taskq_all == NULL) {
 		rc = -EUNATCH;
 		goto out;
 	}
 -	proc_spl_taskq = proc_create_data("taskq", 0444,
 -		proc_spl, &proc_taskq_operations, NULL);
 +	proc_spl_taskq = proc_create_data("taskq", 0444, proc_spl,
 +	    &proc_taskq_operations, NULL);
 	if (proc_spl_taskq == NULL) {
 		rc = -EUNATCH;
 		goto out;
@@ -739,8 +741,8 @@ spl_proc_init(void)
 		goto out;
 	}
 -	proc_spl_kmem_slab = proc_create_data("slab", 0444,
 -		proc_spl_kmem, &proc_slab_operations, NULL);
 +	proc_spl_kmem_slab = proc_create_data("slab", 0444, proc_spl_kmem,
 +	    &proc_slab_operations, NULL);
 	if (proc_spl_kmem_slab == NULL) {
 		rc = -EUNATCH;
 		goto out;
 diff --git a/module/spl/spl-thread.c b/module/spl/spl-thread.c
 index 357d0ca..6f640fd 100644
 --- a/module/spl/spl-thread.c
 +++ b/module/spl/spl-thread.c
@@ -79,8 +79,7 @@ EXPORT_SYMBOL(__thread_exit);
  */
 kthread_t *
 __thread_create(caddr_t stk, size_t  stksize, thread_func_t func,
 -		const char *name, void *args, size_t len, proc_t *pp,
 -		int state, pri_t pri)
 +    const char *name, void *args, size_t len, proc_t *pp, int state, pri_t pri)
 {
 	thread_priv_t *tp;
 	struct task_struct *tsk;
 diff --git a/module/spl/spl-vnode.c b/module/spl/spl-vnode.c
 index 23008af..74ae8fe 100644
 --- a/module/spl/spl-vnode.c
 +++ b/module/spl/spl-vnode.c
@@ -118,8 +118,8 @@ vn_free(vnode_t *vp)
 EXPORT_SYMBOL(vn_free);
 int
 -vn_open(const char *path, uio_seg_t seg, int flags, int mode,
 -	vnode_t **vpp, int x1, void *x2)
 +vn_open(const char *path, uio_seg_t seg, int flags, int mode, vnode_t **vpp,
 +    int x1, void *x2)
 {
 	struct file *fp;
 	struct kstat stat;
@@ -210,7 +210,7 @@ EXPORT_SYMBOL(vn_openat);
 int
 vn_rdwr(uio_rw_t uio, vnode_t *vp, void *addr, ssize_t len, offset_t off,
 -	uio_seg_t seg, int ioflag, rlim64_t x2, void *x3, ssize_t *residp)
 +    uio_seg_t seg, int ioflag, rlim64_t x2, void *x3, ssize_t *residp)
 {
 	struct file *fp = vp->v_file;
 	loff_t offset = off;
@@ -401,9 +401,8 @@ int vn_space(vnode_t *vp, int cmd, struct flock *bfp, int flag,
 		--end;
 		vp->v_file->f_dentry->d_inode->i_op->truncate_range(
 -			vp->v_file->f_dentry->d_inode,
 -			bfp->l_start, end
 -		);
 +		    vp->v_file->f_dentry->d_inode, bfp->l_start, end);
 +
 		return (0);
 	}
 #endif
 diff --git a/module/spl/spl-xdr.c b/module/spl/spl-xdr.c
 index 7c166e9..456887e 100644
 --- a/module/spl/spl-xdr.c
 +++ b/module/spl/spl-xdr.c
@@ -160,7 +160,7 @@ EXPORT_SYMBOL(xdrmem_create);
 static bool_t
 xdrmem_control(XDR *xdrs, int req, void *info)
 {
 -	struct xdr_bytesrec *rec = (struct xdr_bytesrec *) info;
 +	struct xdr_bytesrec *rec = (struct xdr_bytesrec *)info;
 	if (req != XDR_GET_BYTES_AVAIL)
 		return (FALSE);
@@ -236,7 +236,7 @@ xdrmem_enc_uint32(XDR *xdrs, uint32_t val)
 	if (xdrs->x_addr + sizeof (uint32_t) > xdrs->x_addr_end)
 		return (FALSE);
 -	*((uint32_t *) xdrs->x_addr) = cpu_to_be32(val);
 +	*((uint32_t *)xdrs->x_addr) = cpu_to_be32(val);
 	xdrs->x_addr += sizeof (uint32_t);
@@ -249,7 +249,7 @@ xdrmem_dec_uint32(XDR *xdrs, uint32_t *val)
 	if (xdrs->x_addr + sizeof (uint32_t) > xdrs->x_addr_end)
 		return (FALSE);
 -	*val = be32_to_cpu(*((uint32_t *) xdrs->x_addr));
 +	*val = be32_to_cpu(*((uint32_t *)xdrs->x_addr));
 	xdrs->x_addr += sizeof (uint32_t);
@@ -333,7 +333,7 @@ xdrmem_dec_uint(XDR *xdrs, unsigned *up)
 {
 	BUILD_BUG_ON(sizeof (unsigned) != 4);
 -	return (xdrmem_dec_uint32(xdrs, (uint32_t *) up));
 +	return (xdrmem_dec_uint32(xdrs, (uint32_t *)up));
 }
 static bool_t
@@ -359,7 +359,7 @@ xdrmem_dec_ulonglong(XDR *xdrs, u_longlong_t *ullp)
 	if (!xdrmem_dec_uint32(xdrs, &low))
 		return (FALSE);
 -	*ullp = ((u_longlong_t) high << 32) | low;
 +	*ullp = ((u_longlong_t)high << 32) | low;
 	return (TRUE);
 }
 -- 
 2.14.2
@@ -0,0 +1,38 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: LOLi <loli10K@users.noreply.github.com>
 Date: Fri, 9 Mar 2018 22:51:31 +0100
 Subject: [PATCH] Fix spl-kmod builds when using rpm >= 4.14
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 With rpm-software-management/rpm@5e94633 a package version containing
 invalid characters (most commonly a double '-') causes the kmod package
 generation to terminate with an error.  This change takes advantage of
 the newly introduced rpm macro "_wrong_version_format_terminate_build"
 to allow kmod packages to be built.
 Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Signed-off-by:  loli10K <ezomori.nozomu@gmail.com>
 Closes #691
 (cherry picked from commit 7d17023a33bb6f064e013dd99862e62b719f1e26)
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 ---
 config/spl-build.m4 | 1 +
 1 file changed, 1 insertion(+)
 diff --git a/config/spl-build.m4 b/config/spl-build.m4
 index 553b5d5..9c97e64 100644
 --- a/config/spl-build.m4
 +++ b/config/spl-build.m4
@@ -231,6 +231,7 @@ AC_DEFUN([SPL_AC_RPM], [
 	RPM_DEFINE_COMMON='--define "$(DEBUG_SPL) 1" --define "$(DEBUG_KMEM) 1" --define "$(DEBUG_KMEM_TRACKING) 1"'
 	RPM_DEFINE_UTIL=
 	RPM_DEFINE_KMOD='--define "kernels $(LINUX_VERSION)"'
 +	RPM_DEFINE_KMOD+=' --define "_wrong_version_format_terminate_build 0"'
 	RPM_DEFINE_DKMS=
 	SRPM_DEFINE_COMMON='--define "build_src_rpm 1"'
 -- 
 2.14.2
@@ -0,0 +1,63 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tony Hutter <hutter2@llnl.gov>
 Date: Wed, 14 Mar 2018 16:16:00 -0700
 Subject: [PATCH] Tag spl-0.7.7
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 META file and changelog updated.
 Signed-off-by: Tony Hutter <hutter2@llnl.gov>
 (cherry picked from commit 2f52bf4a84b1a3520cccd5cee1415ce85b91d04f)
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 ---
 rpm/generic/spl-kmod.spec.in | 3 +++
 rpm/generic/spl.spec.in      | 3 +++
 META                         | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)
 diff --git a/rpm/generic/spl-kmod.spec.in b/rpm/generic/spl-kmod.spec.in
 index eb38c21..6af292d 100644
 --- a/rpm/generic/spl-kmod.spec.in
 +++ b/rpm/generic/spl-kmod.spec.in
@@ -167,6 +167,9 @@ chmod u+x ${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/*/extra/*/*/*
 rm -rf $RPM_BUILD_ROOT
 %changelog
 +* Wed Mar 14 2018 Tony Hutter <hutter2@llnl.gov> - 0.7.7-1
 +- Released 0.7.7-1, detailed release notes are available at:
 +- https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.7.7
 * Thu Feb 01 2018 Tony Hutter <hutter2@llnl.gov> - 0.7.6-1
 - Released 0.7.6-1, detailed release notes are available at:
 - https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.7.6
 diff --git a/rpm/generic/spl.spec.in b/rpm/generic/spl.spec.in
 index 0338a47..b693bdc 100644
 --- a/rpm/generic/spl.spec.in
 +++ b/rpm/generic/spl.spec.in
@@ -34,6 +34,9 @@ make install DESTDIR=%{?buildroot}
 %{_mandir}/man5/*
 %changelog
 +* Wed Mar 14 2018 Tony Hutter <hutter2@llnl.gov> - 0.7.7-1
 +- Released 0.7.7-1, detailed release notes are available at:
 +- https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.7.7
 * Thu Feb 01 2018 Tony Hutter <hutter2@llnl.gov> - 0.7.6-1
 - Released 0.7.6-1, detailed release notes are available at:
 - https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.7.6
 diff --git a/META b/META
 index 4b0c0bb..64a07f1 100644
 --- a/META
 +++ b/META
@@ -1,7 +1,7 @@
 Meta:         1
 Name:         spl
 Branch:       1.0
 -Version:      0.7.6
 +Version:      0.7.7
 Release:      1
 Release-Tags: relext
 License:      GPL
 -- 
 2.14.2
@@ -0,0 +1,13 @@
 0001-remove-DKMS-and-module-build.patch
 0002-Allow-longer-SPA-names-in-stats.patch
 0003-Remove-vn_rename-and-vn_remove.patch
 0004-Remove-all-spin_is_locked-calls.patch
 0005-Add-cv_timedwait_io.patch
 0006-Fix-cstyle-warnings.patch
 0007-Split-spl-build.m4.patch
 0008-Fix-multiple-evaluations-of-VERIFY-and-ASSERT-on-fai.patch
 0009-Staticize-kstat_default_update.patch
 0010-Fix-function-name-typos.patch
 0011-Fix-more-cstyle-warnings.patch
 0012-Fix-spl-kmod-builds-when-using-rpm-4.14.patch
 0013-Tag-spl-0.7.7.patch
@@ -0,0 +1,221 @@
 zfs-linux (0.7.7-pve1~bpo9) unstable; urgency=medium
  * update ZFS to 0.7.7
 -- Proxmox Support Team <support@proxmox.com>  Tue, 3 Apr 2018 14:28:35 +0200
 zfs-linux (0.7.6-pve1~bpo9) unstable; urgency=medium
  * update ZFS to 0.7.6
 -- Proxmox Support Team <support@proxmox.com>  Wed, 21 Feb 2018 09:48:29 +0100
 zfs-linux (0.7.4-pve2~bpo9) unstable; urgency=medium
  * cherry-pick ARC hit rate fix from 0.7.6
  * always load ZFS modules on boot
 -- Proxmox Support Team <support@proxmox.com>  Fri, 19 Jan 2018 11:31:14 +0100
 zfs-linux (0.7.4-pve1~bpo9) unstable; urgency=medium
  * update ZFS to 0.7.4
 -- Proxmox Support Team <support@proxmox.com>  Tue, 19 Dec 2017 12:52:42 +0100
 zfs-linux (0.7.3-pve1~bpo9) unstable; urgency=medium
  * update ZFS to 0.7.3
  * include fix for user namespace setgid issue (#6800 upstream)
 -- Proxmox Support Team <support@proxmox.com>  Mon, 6 Nov 2017 09:14:19 +0100
 zfs-linux (0.7.2-pve1~bpo90) unstable; urgency=medium
  * update zfs to 0.7.2
  * add PR 6616 - zfs send/recv compatibility with 0.6.5
  * add PR 6695 - zfs recv: don't skip over objects which should be freed
  * various small fixes
  * split test suite into zfs-test package
 -- Proxmox Support Team <support@proxmox.com>  Thu, 12 Oct 2017 13:34:05 +0200
 zfs-linux (0.6.5.11-pve18~bpo90) unstable; urgency=medium
  * fix #1509: arc_summary error with L2ARC
 -- Proxmox Support Team <support@proxmox.com>  Mon, 2 Oct 2017 09:30:41 +0200
 zfs-linux (0.6.5.11-pve17~bpo90) unstable; urgency=medium
  * update zfs to debian/0.6.5.11-1
 -- Proxmox Support Team <support@proxmox.com>  Thu, 27 Jul 2017 13:11:45 +0200
 zfs-linux (0.6.5.9-pve16~bpo90) unstable; urgency=medium
  * drop transitional packages
  * convert python scripts to python 3, drop .py suffix
  * rebuild for PVE 5.0 / Debian Stretch
 -- Proxmox Support Team <support@proxmox.com>  Fri, 10 Mar 2017 09:45:52 +0100
 zfs-linux (0.6.5.9-pve15~bpo80) unstable; urgency=medium
  * update zfs to debian/0.6.5.9-1
 -- Proxmox Support Team <support@proxmox.com>  Mon, 6 Feb 2017 12:39:10 +0100
 zfs-linux (0.6.5.8-pve14~bpo80) unstable; urgency=medium
  * update zfs to debian/0.6.5.8-3
 -- Proxmox Support Team <support@proxmox.com>  Wed, 11 Jan 2017 09:34:58 +0100
 zfs-linux (0.6.5.8-pve13~bpo80) unstable; urgency=medium
  * fix #1184: zfs-share.service has wrong path to 'rm' command
 -- Proxmox Support Team <support@proxmox.com>  Thu, 27 Oct 2016 11:25:47 +0200
 zfs-linux (0.6.5.8-pve12~bpo80) unstable; urgency=medium
  * import with "-d /dev/disk/by-id" in systemd service
 -- Proxmox Support Team <support@proxmox.com>  Mon, 24 Oct 2016 13:48:08 +0200
 zfs-linux (0.6.5.8-pve11~bpo80) unstable; urgency=medium
  * update zfs to debian/0.6.5.8-1
  * switch package upstream sources to Debian (Jessie)
  * add transitional packages for upgrades
 -- Proxmox Support Team <support@proxmox.com>  Wed, 12 Oct 2016 11:16:02 +0200
 zfs-linux (0.6.5.7-pve10~bpo80) unstable; urgency=medium
  * update to pkg-zfs jessie/0.6.5.7-8
  * change package versioning to allow upgrades from PVE3/wheezy
 -- Proxmox Support Team <support@proxmox.com>  Tue, 28 Jun 2016 09:50:00 +0200
 zfs-linux (0.6.5-pve9~jessie) unstable; urgency=medium
  * Update to pkg-zfs jessie/0.6.5.6-3
 -- Proxmox Support Team <support@proxmox.com>  Tue, 12 Apr 2016 09:51:35 +0200
 zfs-linux (0.6.5-pve8~jessie) unstable; urgency=medium
  * update to zfs-0.6.5.6
 -- Proxmox Support Team <support@proxmox.com>  Wed, 30 Mar 2016 10:50:22 +0200
 zfs-linux (0.6.5-pve7~jessie) unstable; urgency=medium
  * update to zfs-0.6.5.4
 -- Proxmox Support Team <support@proxmox.com>  Thu, 14 Jan 2016 10:51:17 +0100
 zfs-linux (0.6.5-pve6~jessie) unstable; urgency=medium
  * Prepare to tag zfs-0.6.5.3
 -- Proxmox Support Team <support@proxmox.com>  Thu, 05 Nov 2015 07:21:44 +0100
 zfs-linux (0.6.5-pve5~jessie) unstable; urgency=medium
  * Illumos 6267 - dn_bonus evicted too early
  * Fix use-after-free in vdev_disk_physio_completion
 -- Proxmox Support Team <support@proxmox.com>  Wed, 04 Nov 2015 17:42:42 +0100
 zfs-linux (0.6.5-pve4~jessie) unstable; urgency=medium
  * update to master/debian/jessie/0.6.5.2-2
 -- Proxmox Support Team <support@proxmox.com>  Mon, 05 Oct 2015 17:56:45 +0200
 zfs-linux (0.6.5-pve3~jessie) unstable; urgency=medium
  * do not install /etc/init.d/zfs-zed script to avoid double startup
    with systemd
 -- Proxmox Support Team <support@proxmox.com>  Mon, 28 Sep 2015 10:14:40 +0200
 zfs-linux (0.6.5-pve2~jessie) unstable; urgency=medium
  * update to master/debian/jessie/0.6.5.1-4
 -- Proxmox Support Team <support@proxmox.com>  Thu, 24 Sep 2015 12:45:33 +0200
 zfs-linux (0.6.5-pve1~jessie) unstable; urgency=medium
  * update to master/debian/jessie/0.6.5.1-2
 -- Proxmox Support Team <support@proxmox.com>  Mon, 21 Sep 2015 10:02:41 +0200
 zfs-linux (0.6.4-pve3~jessie) unstable; urgency=medium
  * update to snapshot/debian/jessie/0.6.4-24-6bec43
 -- Proxmox Support Team <support@proxmox.com>  Mon, 24 Aug 2015 06:13:44 +0200
 zfs-linux (0.6.4-pve2~jessie) unstable; urgency=medium
  * update to 0.6.4.2 (snapshot/debian/jessie/0.6.4-21-53b1d9)
 -- Proxmox Support Team <support@proxmox.com>  Tue, 21 Jul 2015 11:03:21 +0200
 zfs-linux (0.6.4-pve1~jessie) unstable; urgency=medium
  * update to 0.6.4 (use upstream zol package definitions)
 -- Proxmox Support Team <support@proxmox.com>  Tue, 14 Apr 2015 10:19:22 +0200
 zfs-linux (0.6.3-pve3~jessie) unstable; urgency=medium
  * ignore zfs-import-scan errors
 -- Proxmox Support Team <support@proxmox.com>  Tue, 31 Mar 2015 17:52:40 +0200
 zfs-linux (0.6.3-pve2~jessie) unstable; urgency=medium
  * use systemd for service startup
  * install zed configuration file /etc/zfs/zed.d/zed.rc
 -- Proxmox Support Team <support@proxmox.com>  Sun, 15 Mar 2015 15:52:54 +0100
 zfs-linux (0.6.3-pve1~jessie) unstable; urgency=medium
  * recompile on jessie
 -- Proxmox Support Team <support@proxmox.com>  Sat, 28 Feb 2015 16:02:08 +0100
 zfs-linux (0.6.3-2~wheezy) unstable; urgency=low
  * use /sbin/modprobe to avoid warning inside initrd
  * fix warning about undefined values inside initrd
 -- Proxmox Support Team <support@proxmox.com>  Wed, 14 Jan 2015 19:03:04 +0100
 zfs-linux (0.6.3-1~wheezy) unstable; urgency=low
  * first version for Proxmox VE
 -- Proxmox Support Team <support@proxmox.com>  Sat, 10 Jan 2015 14:06:34 +0100
@@ -1,14 +0,0 @@
 zfs-linux (0.6.3-2~wheezy) unstable; urgency=low
  * use /sbin/modprobe to avoid warning inside initrd
  * fix warning about undefined values inside initrd
 -- Proxmox Support Team <support@proxmox.com>  Wed, 14 Jan 2015 19:03:04 +0100
 zfs-linux (0.6.3-1~wheezy) unstable; urgency=low
  * first version for Proxmox VE
 -- Proxmox Support Team <support@proxmox.com>  Sat, 10 Jan 2015 14:06:34 +0100
@@ -1 +0,0 @@
 7
@@ -1,178 +0,0 @@
 Source: zfs-linux
 Section: kernel
 Priority: extra
 Maintainer: Proxmox Support Team <support@proxmox.com> 
 Build-Depends: autotools-dev,
 autoconf,
 autogen,
 automake,
 debhelper (>= 8),
 dh-autoreconf,
 dkms (>= 2.2.0.2),
 libselinux1-dev,
 libtool,
 uuid-dev,
 zlib1g-dev,
 Standards-Version: 3.9.5
 Package: libnvpair1
 Section: libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Replaces: libnvpair0
 Description: Solaris name-value library for Linux
 This library provides routines for packing and unpacking nv pairs for
 transporting data across process boundaries, transporting between
 kernel and userland, and possibly saving onto disk files.
 Package: libnvpair1-dbg
 Section: debug
 Architecture: linux-any
 Depends: ${misc:Depends}, libnvpair1 (= ${binary:Version})
 Replaces: libnvpair0-dbg
 Description: Debugging symbols for libnvpair1
 This library provides routines for packing and unpacking nv pairs for
 transporting data across process boundaries, transporting between
 kernel and userland, and possibly saving onto disk files.
 .
 This package contains the debugging symbols for libnvpair1.
 Package: libuutil1
 Section: libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Replaces: libuutil0
 Description: Solaris userland utility library for Linux
 This library provides a variety of glue functions for OpenZFS on Linux:
  * libspl: The Solaris Porting Layer library, which provides APIs that make it
 possible to run Solaris user code in a Linux environment with relatively
 minimal modification.
  * libavl: The Adelson-Velskii Landis balanced binary tree manipulation
 library.
  * libefi: The Extensible Firmware Interface library for GUID disk
 partitioning.
  * libshare: NFS and SMB service integration for OpenZFS.
 Package: libuutil1-dbg
 Section: debug
 Architecture: linux-any
 Depends: ${misc:Depends}, libuutil1 (= ${binary:Version})
 Replaces: libuutil0-dbg
 Description: Debugging symbols for libuutil1
 This library provides a variety of glue functions for OpenZFS on Linux:
  * libspl: The Solaris Porting Layer library, which provides APIs that make it
 possible to run Solaris user code in a Linux environment with relatively
 minimal modification.
  * libavl: The Adelson-Velskii Landis balanced binary tree manipulation
 library.
  * libefi: The Extensible Firmware Interface library for GUID disk
 partitioning.
  * libshare: NFS and SMB service integration for OpenZFS.
 .
 This package contains debugging symbols for libuutil1.
 Package: libzfs-dev
 Section: libdevel
 Architecture: linux-any
 Depends: ${misc:Depends}, libzfs2 (= ${binary:Version})
 Provides: libnvpair-dev, libuutil-dev
 Replaces: libefi1,
 libnvpair1,
 libshare1,
 libspl1,
 libunicode1,
 libuutil1,
 libzavl1,
 libzfs2,
 libzpool2,
 Description: Native OpenZFS filesystem development files for Linux
 Header files and static libraries for compiling software
 against libzfs.
 Package: libzfs2
 Section: libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Replaces: libzfs0, libzfs1
 Description: Native OpenZFS filesystem library for Linux
 The ZoL management library.
 Package: libzfs2-dbg
 Section: debug
 Architecture: linux-any
 Depends: ${misc:Depends}, libzfs2 (= ${binary:Version})
 Replaces: libzfs0-dbg, libzfs1-dbg
 Description: Debugging symbols for libzfs2
 The ZoL management library.
 .
 This package contains the debugging symbols for libzfs2.
 Package: libzpool2
 Section: libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Replaces: libzpool0, libzpool1
 Description: Native OpenZFS pool library for Linux
 The zpool management library.
 Package: libzpool2-dbg
 Section: debug
 Architecture: linux-any
 Depends: ${misc:Depends}, libzpool2 (= ${binary:Version})
 Replaces: libzpool0-dbg, libzpool1-dbg
 Description: Debugging symbols for libzpool2
 The zpool management library.
 .
 This package contains the debugging symbols for libzpool2.
 Package: zfs-dkms
 Section: kernel
 Architecture: linux-any
 Pre-Depends: spl-dkms (>= ${source:Upstream-Version})
 Depends: ${misc:Depends}, dkms (>= 2.2.0.2)
 Replaces: lzfs, lzfs-dkms
 Provides: lustre-backend-fs, lzfs, lzfs-dkms
 Conflicts: lzfs, lzfs-dkms
 Description: Native OpenZFS filesystem kernel modules for Linux
 An advanced integrated volume manager and filesystem that is designed for
 performance and data integrity. Snapshots, clones, checksums, deduplication,
 compression, and RAID redundancy are built-in features.
 .
 Includes the SPA, DMU, ZVOL, and ZPL components of OpenZFS.
 Package: zfs-doc
 Section: doc
 Architecture: linux-any
 Depends: ${misc:Depends}
 Description: Native OpenZFS filesystem documentation and examples.
 Shared boilerplate files for OpenZFS on Linux that are not required at runtime.
 Package: zfs-initramfs
 Section: kernel
 Architecture: linux-any
 Depends: ${misc:Depends}, zfsutils
 Description: Native OpenZFS root filesystem capabilities for Linux
 This package adds OpenZFS to the system initramfs with a hook
 for the initramfs-tools infrastructure.
 Package: zfsutils
 Section: admin
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: samba-common-bin (>= 3.0.23), nfs-kernel-server, zfs-initramfs
 Conflicts: zfs, zfs-fuse
 Replaces: zfs
 Description: Native OpenZFS management utilities for Linux
 This package provides the zpool and zfs commands that are used to
 manage OpenZFS filesystems.
 Package: zfsutils-dbg
 Section: debug
 Architecture: linux-any
 Depends: ${misc:Depends}, zfsutils (= ${binary:Version})
 Replaces: zfs-dbg
 Description: Debugging symbols for zfsutils
 This package provides the zpool and zfs commands that are used to
 manage OpenZFS filesystems.
 .
 This package contains the debugging symbols for zfsutils.
@@ -1 +0,0 @@
 lib/libnvpair.so.*
@@ -1 +0,0 @@
 lib/libuutil.so.*
@@ -1,4 +0,0 @@
 lib/*.a
 lib/*.la
 lib/*.so
 usr/include
@@ -1,2 +0,0 @@
 lib/libzfs.so.*
 lib/libzfs_core.so.*
@@ -1 +0,0 @@
 lib/libzpool.so.*
@@ -1,71 +0,0 @@
 From: Darik Horn <dajhorn@vanadac.com>
 Date: Tue, 17 Jan 2012 19:45:07 -0600
 Subject: Prevent manual builds in the DKMS source.
 Print an instructive error messsage and exit if the `dkms.conf` file
 exists when the userland is configured. (ie: `--with-config=user`)
 A non-trivial number of people try to rebuild ZoL from the
 `/usr/src/zfs` tree, which is modified to better satisfy Debian
 packaging policy and contains only the module sources for DKMS.
 Regardless, local installations usually break managed installations,
 so this autotools test could be further enhanced to check whether
 ZFS has a DKMS registration.
 ---
 config/dkms.m4      | 14 ++++++++++++++
 config/user.m4      |  1 +
 config/zfs-build.m4 |  6 +++---
 3 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 config/dkms.m4
 diff --git a/config/dkms.m4 b/config/dkms.m4
 new file mode 100644
 index 0000000..cfa1152
 --- /dev/null
 +++ b/config/dkms.m4
@@ -0,0 +1,14 @@
 +dnl #
 +dnl # Prevent manual building in DKMS source tree.
 +dnl #
 +AC_DEFUN([ZFS_AC_DKMS_INHIBIT], [
 +	AC_MSG_CHECKING([for dkms.conf file])
 +        AS_IF([test -e dkms.conf], [
 +		AC_MSG_ERROR([
 +	*** ZFS should not be manually built in the DKMS source tree.
 +	*** Remove all ZFS packages before compiling the ZoL sources.
 +	*** Running "make install" breaks ZFS packages.])
 +        ], [
 +		AC_MSG_RESULT([not found])
 +        ])
 +])
 diff --git a/config/user.m4 b/config/user.m4
 index 3802437..f5a8827 100644
 --- a/config/user.m4
 +++ b/config/user.m4
@@ -2,6 +2,7 @@ dnl #
 dnl # Default ZFS user configuration
 dnl #
 AC_DEFUN([ZFS_AC_CONFIG_USER], [
 +	ZFS_AC_DKMS_INHIBIT
 	ZFS_AC_CONFIG_USER_UDEV
 	ZFS_AC_CONFIG_USER_SYSTEMD
 	ZFS_AC_CONFIG_USER_SYSVINIT
 diff --git a/config/zfs-build.m4 b/config/zfs-build.m4
 index 5ec94a0..41eec88 100644
 --- a/config/zfs-build.m4
 +++ b/config/zfs-build.m4
@@ -87,10 +87,10 @@ AC_DEFUN([ZFS_AC_CONFIG], [
 	ZFS_AC_CONFIG_ALWAYS
 	case "$ZFS_CONFIG" in
 -		kernel) ZFS_AC_CONFIG_KERNEL ;;
 		user)	ZFS_AC_CONFIG_USER   ;;
 -		all)    ZFS_AC_CONFIG_KERNEL
 -			ZFS_AC_CONFIG_USER   ;;
 +		kernel) ZFS_AC_CONFIG_KERNEL ;;
 +		all)    ZFS_AC_CONFIG_USER
 +			ZFS_AC_CONFIG_KERNEL ;;
 		srpm)                        ;;
 		*)
 		AC_MSG_RESULT([Error!])
@@ -1,70 +0,0 @@
 From: Darik Horn <dajhorn@vanadac.com>
 Date: Sat, 18 Oct 2014 14:23:11 -0500
 Subject: Check for META and DCH consistency in autoconf.
 If a debian/ packaging overlay exists, then the software versions defined in
 the META and debian/changelog files must be the same to ensure that DKMS uses
 correct paths and that users see the same version everywhere.
 ---
 config/zfs-meta.m4 | 34 +++++++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)
 diff --git a/config/zfs-meta.m4 b/config/zfs-meta.m4
 index 7c92dd5..d174ccc 100644
 --- a/config/zfs-meta.m4
 +++ b/config/zfs-meta.m4
@@ -1,9 +1,10 @@
 dnl #
 dnl # DESCRIPTION:
 -dnl # Read meta data from the META file.  When building from a git repository
 -dnl # the ZFS_META_RELEASE field will be overwritten if there is an annotated
 -dnl # tag matching the form ZFS_META_NAME-ZFS_META_VERSION-*.  This allows
 -dnl # for working builds to be uniquely identified using the git commit hash.
 +dnl # Read meta data from the META file or the debian/changelog file if it
 +dnl # exists.  When building from a git repository the ZFS_META_RELEASE field
 +dnl # will be overwritten if there is an annotated tag matching the form
 +dnl # ZFS_META_NAME-ZFS_META_VERSION-*.  This allows for working builds to be
 +dnl # uniquely identified using the git commit hash.
 dnl #
 dnl #    The META file format is as follows:
 dnl #      ^[ ]*KEY:[ \t]+VALUE$
@@ -49,6 +50,7 @@ AC_DEFUN([ZFS_AC_META], [
 	_zfs_ac_meta_type="none"
 	if test -f "$META"; then
 		_zfs_ac_meta_type="META file"
 +		_dpkg_parsechangelog=$(dpkg-parsechangelog 2>/dev/null)
 		ZFS_META_NAME=_ZFS_AC_META_GETVAL([(Name|Project|Package)]);
 		if test -n "$ZFS_META_NAME"; then
@@ -66,8 +68,30 @@ AC_DEFUN([ZFS_AC_META], [
 			AC_SUBST([ZFS_META_VERSION])
 		fi
 +		if test -n "${_dpkg_parsechangelog}"; then
 +			_dpkg_version=$(echo "${_dpkg_parsechangelog}" \
 +				| $AWK '$[]1 == "Version:" { print $[]2; }' \
 +				| cut -d- -f1)
 +			if test "${_dpkg_version}" != "$ZFS_META_VERSION"; then
 +				AC_MSG_ERROR([
 +	*** Version $ZFS_META_VERSION in the META file is different than
 +	*** version $_dpkg_version in the debian/changelog file. DKMS and DEB
 +	*** packaging require that these files have the same version.
 +				])
 +			fi
 +		fi
 +
 		ZFS_META_RELEASE=_ZFS_AC_META_GETVAL([Release]);
 -		if test ! -f ".nogitrelease" && git rev-parse --git-dir > /dev/null 2>&1; then
 +
 +		if test -n "${_dpkg_parsechangelog}"; then
 +			_dpkg_release=$(echo "${_dpkg_parsechangelog}" \
 +				| $AWK '$[]1 == "Version:" { print $[]2; }' \
 +				| cut -d- -f2-)
 +			if test -n "${_dpkg_release}"; then
 +				ZFS_META_RELEASE=${_dpkg_release}
 +				_zfs_ac_meta_type="dpkg-parsechangelog"
 +			fi
 +		elif test ! -f ".nogitrelease" && git rev-parse --git-dir > /dev/null 2>&1; then
 			_match="${ZFS_META_NAME}-${ZFS_META_VERSION}"
 			_alias=$(git describe --match=${_match} 2>/dev/null)
 			_release=$(echo ${_alias}|cut -f3- -d'-'|sed 's/-/_/g')
@@ -1,41 +0,0 @@
 From: Darik Horn <dajhorn@vanadac.com>
 Date: Sat, 18 Oct 2014 19:48:46 -0500
 Subject: Add libuutil to LIBADD for libzfs and libzfs_core
 Resolve spurious dpkg-shlibdeps warnings like this:
 	warning: symbol strlcpy used by libzfs_core.so found in none of the libraries
 This happens because dpkg-shlibdeps does not recursively search for symbols.
 Signed-off-by: Darik Horn <dajhorn@vanadac.com>
 ---
 lib/libzfs/Makefile.am      | 1 +
 lib/libzfs_core/Makefile.am | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
 diff --git a/lib/libzfs/Makefile.am b/lib/libzfs/Makefile.am
 index 8b1f517..efdf84b 100644
 --- a/lib/libzfs/Makefile.am
 +++ b/lib/libzfs/Makefile.am
@@ -23,6 +23,7 @@ libzfs_la_SOURCES = \
 libzfs_la_LIBADD = \
 	$(top_builddir)/lib/libzfs_core/libzfs_core.la \
 +	$(top_builddir)/lib/libuutil/libuutil.la \
 	$(top_builddir)/lib/libshare/libshare.la \
 	$(top_builddir)/lib/libnvpair/libnvpair.la \
 	$(top_builddir)/lib/libzpool/libzpool.la
 diff --git a/lib/libzfs_core/Makefile.am b/lib/libzfs_core/Makefile.am
 index 0ecd208..6f0be5f 100644
 --- a/lib/libzfs_core/Makefile.am
 +++ b/lib/libzfs_core/Makefile.am
@@ -10,6 +10,7 @@ libzfs_core_la_SOURCES = \
 	$(top_srcdir)/lib/libzfs_core/libzfs_core.c
 libzfs_core_la_LIBADD = \
 -	$(top_builddir)/lib/libnvpair/libnvpair.la
 +	$(top_builddir)/lib/libnvpair/libnvpair.la \
 +	$(top_builddir)/lib/libuutil/libuutil.la
 libzfs_core_la_LDFLAGS = -version-info 1:0:0
@@ -1,31 +0,0 @@
 From: Ned Bass <bass6@llnl.gov>
 Date: Wed, 17 Dec 2014 11:01:42 -0800
 Subject: vdev_id: use mawk-compatible regular expression
 Slot mapping in vdev_id doesn't work on systems using mawk as the 'awk'
 alternative. A regular expression in map_slot() contains an unquoted
 empty string following the alternation (|) operator, which results in an
 "missing operand" error with mawk. The solution is to rearrange the
 expression so the alternation has two operands.
 Signed-off-by: Ned Bass <bass6@llnl.gov>
 Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Closes zfsonlinux/pkg-zfs#136
 Closes zfsonlinux/zfs#2965
 ---
 cmd/vdev_id/vdev_id | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/cmd/vdev_id/vdev_id b/cmd/vdev_id/vdev_id
 index b6752ba..6fddd12 100755
 --- a/cmd/vdev_id/vdev_id
 +++ b/cmd/vdev_id/vdev_id
@@ -116,7 +116,7 @@ map_slot() {
 	local MAPPED_SLOT=
 	MAPPED_SLOT=`awk "\\$1 == \"slot\" && \\$2 == ${LINUX_SLOT} && \
 -			\\$4 ~ /^(${CHANNEL}|)$/ { print \\$3; exit }" $CONFIG`
 +			\\$4 ~ /^${CHANNEL}$|^$/ { print \\$3; exit }" $CONFIG`
 	if [ -z "$MAPPED_SLOT" ] ; then
 		MAPPED_SLOT=$LINUX_SLOT
 	fi
@@ -1,4 +0,0 @@
 0001-Prevent-manual-builds-in-the-DKMS-source.patch
 0002-Check-for-META-and-DCH-consistency-in-autoconf.patch
 0003-Add-libuutil-to-LIBADD-for-libzfs-and-libzfs_core.patch
 0005-vdev_id-use-mawk-compatible-regular-expression.patch
@@ -1,115 +0,0 @@
 #!/usr/bin/make -f
 CHMOD ?= chmod
 INSTALL ?= install
 MAKE ?= make
 META_NAME := $(shell awk '$$1 == "Name:" { print $$2; }' META)
 VERSION := $(shell dpkg-parsechangelog \
  | awk '$$1 == "Version:" { print $$2; }' | cut -d- -f1)
 REVISION := $(shell dpkg-parsechangelog \
  | awk '$$1 == "Version:" { print $$2; }' | cut -d- -f2-)
 META_DISTDIR := $(CURDIR)/$(META_NAME)-$(VERSION)/
 %:
 	dh $@ --with autoreconf,dkms
 override_dh_auto_configure:
 	@# Embed the downstream version in the module.
 	@sed \
 	  -e 's/^Version:.*/Version:      $(VERSION)/' \
 	  -e 's/^Release:.*/Release:      $(REVISION)/' \
 	  -i.orig META
 	@# Build the userland, but don't build the kernel modules.
 	dh_auto_configure -- \
 	  --bindir=/bin \
 	  --sbindir=/sbin \
 	  --libdir=/lib \
 	  --with-udevdir=/lib/udev \
 	  --with-config=user
 override_dh_auto_test:
 	# The dh_auto_test rule is disabled because
 	# `make check` cannot run in an unprivileged build environment.
 override_dh_auto_install:
 	@# Install the utilities.
 	$(MAKE) install DESTDIR='$(CURDIR)/debian/tmp'
 	@# Get a bare copy of the source code for DKMS.
 	@# This creates the $(META_DISTDIR)/ tree.
 	$(MAKE) distdir
 	@# Delete components that are not required to build the kernel modules.
 	@# This prevents several lintian complaints, discourages users from
 	@# running `make install` in /usr/src, and reduces the installation
 	@# size by one third. The printf creates a dummy automake file.
 	umask 0111 && \
 	cd '$(META_DISTDIR)' && \
 	for ii in $$(find cmd dracut etc lib man rpm scripts udev -type f); do \
 	  rm "$$ii"; \
 	  test "$$ii" != "$${ii%.in}" && printf '%%:\n\t#\n' >"$$ii"; \
 	  true; \
 	done
 	@# This shunt allows DKMS to copy the Module.symvers and zfs_config.h
 	@# files into the ${dkms_tree} area through the POST_INSTALL directive.
 	printf '#!/bin/sh\ncp "$$@"\n' >'$(META_DISTDIR)/cp'
 	$(CHMOD) 755 '$(META_DISTDIR)/cp'
 	@# Install the DKMS source directly, avoiding dh_install.
 	$(INSTALL) -d '$(CURDIR)/debian/zfs-dkms/usr/src/'
 	mv '$(META_DISTDIR)' '$(CURDIR)/debian/zfs-dkms/usr/src/'
 override_dh_dkms:
 	dh_dkms -V
 override_dh_install:
 	@# Exclude the upstream /usr/lib/udev/rules.d files.
 	dh_install -X/rules.d/
 	@# Ensure that /etc/zfs is in the zfsutils package
 	@# because git has difficulty tracking empty directories.
 	$(INSTALL) -d '$(CURDIR)/debian/zfsutils/etc/zfs/'
 	@# Resolve lintian errors regarding Debian Policy Manual Section 8.4
 	@# by moving unversioned library links from /lib to /usr/lib in the
 	@# development package. Look at libc6-dev for a packaging example if
 	@# multiarch support ever becomes a concern here.
 	$(INSTALL) -d '$(CURDIR)/debian/libzfs-dev/usr/lib/'
 	cd '$(CURDIR)/debian/libzfs-dev/lib' && \
 	for ii in $$(find -type l); do \
 	  ln -s "../../lib/$$(readlink "$$ii")" "../usr/lib/$$(basename "$$ii")" \
 	  && rm "$$ii"; \
 	done
 override_dh_installdocs:
 	dh_installdocs --link-doc=zfs-doc
 override_dh_installinit:
 	@# Install debian/zfsutils.zfs.default as /etc/default/zfs.
 	dh_installinit --name=zfs
 	@# Install the /etc/init.d/zfs-mount script.
 	@# Debian runs local mounts at sysv sequences [10..12] [08..09].
 	dh_installinit --name=zfs-mount \
 	  --no-restart-on-upgrade --no-start -- defaults 13 07
 	@# Debian runs nfs-kernel-server at sysv sequence 17 01,
 	@# iscsitarget at 02 01, and samba at 01 02.
 	dh_installinit --name=zfs-share \
 	  --no-restart-on-upgrade --no-start -- defaults 18 00
 override_dh_installudev:
 	dh_installudev --name=zvol --priority=60
 	dh_installudev --name=vdev --priority=69
 override_dh_strip:
 	dh_strip -plibnvpair1 --dbg-package=libnvpair1-dbg
 	dh_strip -plibuutil1 --dbg-package=libuutil1-dbg
 	dh_strip -plibzfs2 --dbg-package=libzfs2-dbg
 	dh_strip -plibzpool2 --dbg-package=libzpool2-dbg
 	dh_strip -pzfsutils --dbg-package=zfsutils-dbg
@@ -1,6 +0,0 @@
 ## /etc/dpkg/dpkg.cfg.d/zfs-doc
 ##
 ## DPKG overrides that prevent the installation of ZoL documentation.
 ## Enable this line to reduce installation size.
 #path-exclude /usr/share/doc/zfs-doc/*
@@ -1,2 +0,0 @@
 # Force the inclusion of Busybox in the initramfs.
 BUSYBOX=y
@@ -1,78 +0,0 @@
 #!/bin/sh
 #
 # Add ZoL filesystem capabilities to an initrd, usually for a native OpenZFS root.
 #
 # This hook installs udev rules for ZoL.
 PREREQ="zdev"
 # These prerequisites are provided by the zfsutils package. The zdb utility is
 # not strictly required, but it can be useful at the initramfs recovery prompt.
 COPY_EXEC_LIST="/sbin/zdb /sbin/zpool /sbin/zfs /sbin/mount.zfs"
 # These prerequisites are provided by the base system.
 COPY_EXEC_LIST="$COPY_EXEC_LIST /bin/hostname /sbin/blkid"
 # Explicitly specify all kernel modules because automatic dependency resolution
 # is unreliable on many systems.
 MANUAL_ADD_MODULES_LIST="zlib_deflate spl zavl zcommon znvpair zunicode zfs"
 # Generic result code.
 RC=0
 case $1 in
 prereqs)
 	echo "$PREREQ"
 	exit 0
 	;;
 esac
 for ii in $COPY_EXEC_LIST
 do
 	if [ ! -x "$ii" ]
 	then
 		echo "Error: $ii is not executable."
 		RC=2
 	fi
 done
 if [ "$RC" -ne 0 ]
 then
 	exit "$RC"
 fi
 . /usr/share/initramfs-tools/hook-functions
 mkdir -p "$DESTDIR/etc/"
 # zpool requires /etc/mtab
 ln -sf "/proc/mounts" "$DESTDIR/etc/mtab"
 # ZDB uses pthreads for some functions, but the library dependency is not
 # automatically detected. The `find` utility and extended `cp` options are
 # used here because libgcc_s.so could be in a subdirectory of /lib for
 # multi-arch installations.
 cp --target-directory="$DESTDIR" --parents $(find /lib -type f -name libgcc_s.so.1)
 for ii in $COPY_EXEC_LIST
 do
 	copy_exec "$ii"
 done
 for ii in $MANUAL_ADD_MODULES_LIST
 do
 	manual_add_modules "$ii"
 done
 if [ -f "/etc/hostname" ]
 then
 	cp -p "/etc/hostname" "$DESTDIR/etc/"
 else
 	hostname >"$DESTDIR/etc/hostname"
 fi
 # ZoL 0.6.3 deprecated the hostid check.
 if [ -f /etc/hostid ]
 then
 	cp -p /etc/hostid "$DESTDIR/etc/hostid"
 fi
@@ -1,164 +0,0 @@
 # ZFS boot stub for initramfs-tools.
 #
 # In the initramfs environment, the /init script sources this stub to
 # override the default functions in the /scripts/local script.
 #
 # Enable this by passing boot=zfs on the kernel command line.
 #
 pre_mountroot()
 {
 	[ "$quiet" != "y" ] && log_begin_msg "Running /scripts/local-top"
 	run_scripts /scripts/local-top
 	[ "$quiet" != "y" ] && log_end_msg
 	if [ -r '/etc/default/zfs' ]
 	then
 		ZFS_INITRD_PRE_MOUNTROOT_SLEEP=0
 		. '/etc/default/zfs'
 		if [ "$ZFS_INITRD_PRE_MOUNTROOT_SLEEP" -gt '0' ]
 		then
 			[ "$quiet" != "y" ] && log_begin_msg "Sleeping for $ZFS_INITRD_PRE_MOUNTROOT_SLEEP seconds..."
 			sleep "$ZFS_INITRD_PRE_MOUNTROOT_SLEEP"
 			[ "$quiet" != "y" ] && log_end_msg
 		fi
 	fi
 }
 # Duplicates the functionality found under try_failure_hooks in functions
 # but invoking that would be inappropriate here.
 disable_plymouth()
 {
 	if [ -x /bin/plymouth ] && /bin/plymouth --ping
 	then
 		/bin/plymouth hide-splash >/dev/null 2>&1
 	fi
 }
 mountroot()
 {
 	pre_mountroot
 	[ "$quiet" != "y" ] && log_begin_msg "Running /scripts/local-premount"
 	run_scripts /scripts/local-premount
 	[ "$quiet" != "y" ] && log_end_msg
 	# Wait for all of the /dev/{hd,sd}[a-z] device nodes to appear.
 	wait_for_udev
 	# Load the module now to get consistent automatic pool import behavior.
 	/sbin/modprobe zfs
 	# Check the kernel command line for overrides.
 	ZFS_RPOOL="${rpool#rpool=}"
 	ZFS_BOOTFS="${bootfs#bootfs=}"
 	if [ -z "$ZFS_RPOOL" ]
 	then
 		# Check for the `-B zfs-bootfs=%s/%u,...` kind of parameter.
 		#
 		# The ${zfs-bootfs} variable is set at the kernel commmand
 		# line, usually by GRUB, but it cannot be referenced here
 		# directly because bourne variable names cannot contain a
 		# hyphen.
 		#
 		# Reassign the variable by dumping the environment and
 		# stripping the zfs-bootfs= prefix.  Let the shell handle
 		# quoting through the eval command.
 		eval ZFS_RPOOL=$(set | sed -n -e 's,^zfs-bootfs=,,p')
 		# Only the pool name is relevant because the ZFS filesystem on
 		# Linux is extrinsic and the userland cannot resolve a ZFS
 		# object number.
 		#
 		# Strip everything after the first slash character.
 		ZFS_RPOOL=$(echo "$ZFS_RPOOL" | sed -e 's,/.*,,')
 	fi
 	# Use "rpool" as the default, like on most Solaris systems.
 	[ -z "$ZFS_RPOOL" ] && ZFS_RPOOL='rpool'
 	# @FIXME: Forcing the import should not be necessary.
 	#
 	# Consider inhibiting automatic zpool imports in the initramfs
 	# environment and doing a full import in the regular system instead.
 	[ "$quiet" != "y" ] && log_begin_msg "Importing ZFS root pool $ZFS_RPOOL"
 	if [ -f /etc/zfs/zpool.cache ]
 	then
 		ZFS_STDERR=$(zpool list "$ZFS_RPOOL" 1>/dev/null 2>&1 \
 		  || zpool import -f -N "$ZFS_RPOOL" 2>&1)
 		ZFS_ERROR=$?
 	else
 		ZFS_STDERR=$(zpool import -f -N "$ZFS_RPOOL" 2>&1)
 		ZFS_ERROR=$?
 	fi
 	[ "$quiet" != "y" ] && log_end_msg
 	if [ "$ZFS_ERROR" -ne 0 ]
 	then
 		disable_plymouth
 		echo "Command: zpool import -f -N $ZFS_RPOOL"
 		echo "Message: $ZFS_STDERR"
 		echo "Error: $ZFS_ERROR"
 		echo ""
 		echo "Manually import the root pool at the command prompt and then exit."
 		echo "Hint: Try:  zpool import -f -R / -N $ZFS_RPOOL"
 		/bin/sh
 	fi
 	if [ -z "$ZFS_BOOTFS" ]
 	then
 		[ "$quiet" != "y" ] && log_begin_msg "Getting ZFS bootfs property"
 		ZFS_BOOTFS=$(zpool list -H -o bootfs "$ZFS_RPOOL")
 		ZFS_ERROR=$?
 		[ "$quiet" != "y" ] && log_end_msg
 	fi
 	if [ -z "$ZFS_BOOTFS" ]
 	then
 		disable_plymouth
 		echo "Command: zpool list -H -o bootfs $ZFS_RPOOL"
 		echo "Error: $ZFS_ERROR, unable to get the bootfs property."
 		echo ""
 		echo "Manually mount the root filesystem on $rootmnt and then exit."
 		echo "Hint: Try:  mount -t zfs -o zfsutil $ZFS_RPOOL/ROOT/system $rootmnt"
 		/bin/sh	
 	fi
 	# Force the mountpoint to the only correct value for a root filesystem.
 	[ "$quiet" != "y" ] && log_begin_msg "Setting mountpoint=/ on ZFS filesystem $ZFS_BOOTFS"
 	ZFS_STDERR=$(zfs set mountpoint=/ "$ZFS_BOOTFS" 2>&1)
 	[ "$quiet" != "y" ] && log_end_msg
 	# Ideally, the root filesystem would be mounted like this:
 	#
 	#   zpool import -R "$rootmnt" -N "$ZFS_RPOOL"
 	#   zfs mount -o mountpoint=/ "$ZFS_BOOTFS"
 	#
 	# but the MOUNTPOINT prefix is preserved on descendent filesystem after
 	# the pivot into the regular root, which later breaks things like
 	# `zfs mount -a` and the /etc/mtab refresh.
 	[ "$quiet" != "y" ] && log_begin_msg "Mounting ZFS filesystem $ZFS_BOOTFS"
 	ZFS_STDERR=$(mount -t zfs -o zfsutil "$ZFS_BOOTFS" "$rootmnt" 2>&1)
 	ZFS_ERROR=$?
 	[ "$quiet" != "y" ] && log_end_msg
 	if [ "$ZFS_ERROR" -ne 0 ]
 	then
 		disable_plymouth
 		echo ""
 		echo "Command: mount -t zfs -o zfsutil $ZFS_BOOTFS $rootmnt"
 		echo "Message: $ZFS_STDERR"
 		echo "Error: $ZFS_ERROR"
 		echo ""
 		echo "Manually mount the root filesystem on $rootmnt and then exit."
 		/bin/sh	
 	fi
 	[ "$quiet" != "y" ] && log_begin_msg "Running /scripts/local-bottom"
 	run_scripts /scripts/local-bottom
 	[ "$quiet" != "y" ] && log_end_msg
 }
@@ -1,391 +0,0 @@
 # Copyright (c) 2013, Aneurin Price <aneurin.price@gmail.com>
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation
 # files (the "Software"), to deal in the Software without
 # restriction, including without limitation the rights to use,
 # copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the
 # Software is furnished to do so, subject to the following
 # conditions:
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
 # OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 # NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
 # HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
 # WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 # OTHER DEALINGS IN THE SOFTWARE.
 if [[ -w /dev/zfs ]]; then
    __ZFS_CMD="zfs"
    __ZPOOL_CMD="zpool"
 else
    __ZFS_CMD="sudo zfs"
    __ZPOOL_CMD="sudo zpool"
 fi
 __zfs_get_commands()
 {
    $__ZFS_CMD 2>&1 | awk '/^\t[a-z]/ {print $1}' | cut -f1 -d '|' | uniq
 }
 __zfs_get_properties()
 {
    $__ZFS_CMD get 2>&1 | awk '$2 == "YES" || $2 == "NO" {print $1}'; echo all name space
 }
 __zfs_get_editable_properties()
 {
    $__ZFS_CMD get 2>&1 | awk '$2 == "YES" {print $1"="}'
 }
 __zfs_get_inheritable_properties()
 {
    $__ZFS_CMD get 2>&1 | awk '$3 == "YES" {print $1}'
 }
 __zfs_list_datasets()
 {
    $__ZFS_CMD list -H -o name -t filesystem,volume
 }
 __zfs_list_filesystems()
 {
    $__ZFS_CMD list -H -o name -t filesystem
 }
 __zfs_match_snapshot()
 {
    local base_dataset=${cur%@*}
    if [[ $base_dataset != $cur ]]
    then
        $__ZFS_CMD list -H -o name -s name -t snapshot -d 1 $base_dataset
    else
        $__ZFS_CMD list -H -o name -t filesystem,volume | awk '{print $1"@"}'
    fi
 }
 __zfs_match_explicit_snapshot()
 {
    local base_dataset=${cur%@*}
    if [[ $base_dataset != $cur ]]
    then
        $__ZFS_CMD list -H -o name -s name -t snapshot -d 1 $base_dataset
    fi
 }
 __zfs_match_multiple_snapshots()
 {
    local existing_opts=$(expr "$cur" : '\(.*\)[%,]')
    if [[ $existing_opts ]]
    then
        local base_dataset=${cur%@*}
        if [[ $base_dataset != $cur ]]
        then
            local cur=${cur##*,}
            if [[ $cur =~ ^%|%.*% ]]
            then
                # correct range syntax is start%end
                return 1
            fi
            local range_start=$(expr "$cur" : '\(.*%\)')
            $__ZFS_CMD list -H -o name -s name -t snapshot -d 1 $base_dataset | sed 's$.*@$'$range_start'$g'
        fi
    else
        __zfs_match_explicit_snapshot; __zfs_list_datasets
    fi
 }
 __zfs_list_volumes()
 {
    $__ZFS_CMD list -H -o name -t volume
 }
 __zfs_argument_chosen()
 {
    local word property
    for word in $(seq $((COMP_CWORD-1)) -1 2)
    do
        local prev="${COMP_WORDS[$word]}"
        if [[ ${COMP_WORDS[$word-1]} != -[tos] ]]
        then
            if [[ "$prev" == [^,]*,* ]] || [[ "$prev" == *[@:]* ]]
            then
                return 0
            fi
            for property in $@
            do
                if [[ $prev == "$property" ]]
                then
                    return 0
                fi
            done
        fi
    done
    return 1
 }
 __zfs_complete_ordered_arguments()
 {
    local list1=$1
    local list2=$2
    local cur=$3
    local extra=$4
    if __zfs_argument_chosen $list1
    then
        COMPREPLY=($(compgen -W "$list2 $extra" -- "$cur"))
    else
        COMPREPLY=($(compgen -W "$list1 $extra" -- "$cur"))
    fi
 }
 __zfs_complete_multiple_options()
 {
    local options=$1
    local cur=$2
    COMPREPLY=($(compgen -W "$options" -- "${cur##*,}"))
    local existing_opts=$(expr "$cur" : '\(.*,\)')
    if [[ $existing_opts ]] 
    then
        COMPREPLY=( "${COMPREPLY[@]/#/${existing_opts}}" )
    fi
 }
 __zfs_complete_switch()
 {
    local options=$1
    if [[ ${cur:0:1} == - ]]
    then
        COMPREPLY=($(compgen -W "-{$options}" -- "$cur"))
        return 0
    else
        return 1
    fi
 }
 __zfs_complete()
 {
    local cur prev cmd cmds
    COMPREPLY=()
    # Don't split on colon
    _get_comp_words_by_ref -n : -c cur -p prev -w COMP_WORDS -i COMP_CWORD
    cmd="${COMP_WORDS[1]}"
    if [[ ${prev##*/} == zfs ]]
    then
        cmds=$(__zfs_get_commands)
        COMPREPLY=($(compgen -W "$cmds -?" -- "$cur"))
        return 0
    fi
    case "${cmd}" in
        clone)
            case "${prev}" in
                -o)
                    COMPREPLY=($(compgen -W "$(__zfs_get_editable_properties)" -- "$cur"))
                    ;;
                *)
                    if ! __zfs_complete_switch "o,p"
                    then
                        if __zfs_argument_chosen
                        then
                            COMPREPLY=($(compgen -W "$(__zfs_list_datasets)" -- "$cur"))
                        else
                            COMPREPLY=($(compgen -W "$(__zfs_match_snapshot)" -- "$cur"))
                        fi
                    fi
                    ;;
            esac
            ;;
        get)
            case "${prev}" in
                -d)
                    COMPREPLY=($(compgen -W "" -- "$cur"))
                    ;;
                -t)
                    __zfs_complete_multiple_options "filesystem volume snapshot all" "$cur"
                    ;;
                -s)
                    __zfs_complete_multiple_options "local default inherited temporary none" "$cur"
                    ;;
                -o)
                    __zfs_complete_multiple_options "name property value source received all" "$cur"
                    ;;
                *)
                    if ! __zfs_complete_switch "H,r,p,d,o,t,s"
                    then
                        if __zfs_argument_chosen $(__zfs_get_properties)
                        then
                            COMPREPLY=($(compgen -W "$(__zfs_match_explicit_snapshot) $(__zfs_list_datasets)" -- "$cur"))
                        else
                            __zfs_complete_multiple_options "$(__zfs_get_properties)" "$cur"
                        fi
                    fi
                    ;;
            esac
            ;;
        inherit)
            if ! __zfs_complete_switch "r"
            then
                __zfs_complete_ordered_arguments "$(__zfs_get_inheritable_properties)" "$(__zfs_match_explicit_snapshot) $(__zfs_list_datasets)" $cur
            fi
            ;;
        list)
            case "${prev}" in
                -d)
                    COMPREPLY=($(compgen -W "" -- "$cur"))
                    ;;
                -t)
                    __zfs_complete_multiple_options "filesystem volume snapshot all" "$cur"
                    ;;
                -o)
                    __zfs_complete_multiple_options "$(__zfs_get_properties)" "$cur"
                    ;;
                -s|-S)
                    COMPREPLY=($(compgen -W "$(__zfs_get_properties)" -- "$cur"))
                    ;;
                *)
                    if ! __zfs_complete_switch "H,r,d,o,t,s,S"
                    then
                        COMPREPLY=($(compgen -W "$(__zfs_match_explicit_snapshot) $(__zfs_list_datasets)" -- "$cur"))
                    fi
                    ;;
            esac
            ;;
        promote)
            COMPREPLY=($(compgen -W "$(__zfs_list_filesystems)" -- "$cur"))
            ;;
        rollback)
            if ! __zfs_complete_switch "r,R,f"
            then
                COMPREPLY=($(compgen -W "$(__zfs_match_snapshot)" -- "$cur"))
            fi
            ;;
        send)
            if ! __zfs_complete_switch "d,n,P,p,R,v,i,I"
            then
                COMPREPLY=($(compgen -W "$(__zfs_match_snapshot)" -- "$cur"))
            fi
            ;;
        snapshot)
            case "${prev}" in
                -o)
                    COMPREPLY=($(compgen -W "$(__zfs_get_editable_properties)" -- "$cur"))
                    ;;
                *)
                    if ! __zfs_complete_switch "o,r"
                    then
                        COMPREPLY=($(compgen -W "$(__zfs_list_datasets | awk '{print $1"@"}')" -- "$cur"))
                    fi
                    ;;
            esac
            ;;
        set)
            __zfs_complete_ordered_arguments "$(__zfs_get_editable_properties)" "$(__zfs_match_explicit_snapshot) $(__zfs_list_datasets)" $cur
            ;;
        upgrade)
            case "${prev}" in
                -a|-V|-v)
                    COMPREPLY=($(compgen -W "" -- "$cur"))
                    ;;
                *)
                    if ! __zfs_complete_switch "a,V,v,r"
                    then
                        COMPREPLY=($(compgen -W "$(__zfs_list_filesystems)" -- "$cur"))
                    fi
                    ;;
            esac
            ;;
        destroy)
            if ! __zfs_complete_switch "d,f,n,p,R,r,v"
            then
                __zfs_complete_multiple_options "$(__zfs_match_multiple_snapshots)" $cur
            fi
            ;;
        *)
            COMPREPLY=($(compgen -W "$(__zfs_match_explicit_snapshot) $(__zfs_list_datasets)" -- "$cur"))
            ;;
    esac
    __ltrim_colon_completions "$cur"
    return 0
 }
 __zpool_get_commands()
 {
    $__ZPOOL_CMD 2>&1 | awk '/^\t[a-z]/ {print $1}' | uniq
 }
 __zpool_get_properties()
 {
    $__ZPOOL_CMD get 2>&1 | awk '$2 == "YES" || $2 == "NO" {print $1}'; echo all
 }
 __zpool_get_editable_properties()
 {
    $__ZPOOL_CMD get 2>&1 | awk '$2 == "YES" {print $1"="}'
 }
 __zpool_list_pools()
 {
    $__ZPOOL_CMD list -H -o name
 }
 __zpool_complete()
 {
    local cur prev cmd cmds
    COMPREPLY=()
    cur="${COMP_WORDS[COMP_CWORD]}"
    prev="${COMP_WORDS[COMP_CWORD-1]}"
    cmd="${COMP_WORDS[1]}"
    if [[ ${prev##*/} == zpool ]]
    then
        cmds=$(__zpool_get_commands)
        COMPREPLY=($(compgen -W "$cmds" -- "$cur"))
        return 0
    fi
    case "${cmd}" in
        get)
            __zfs_complete_ordered_arguments "$(__zpool_get_properties)" "$(__zpool_list_pools)" $cur
            return 0
            ;;
        import)
            if [[ $prev == -d ]]
            then
                _filedir -d
            else
                COMPREPLY=($(compgen -W "$(__zpool_list_pools) -d" -- "$cur"))
            fi
            return 0
            ;;
        set)
            __zfs_complete_ordered_arguments "$(__zpool_get_editable_properties)" "$(__zpool_list_pools)" $cur
            return 0
            ;;
        add|attach|clear|create|detach|offline|online|remove|replace)
            local pools="$(__zpool_list_pools)"
            if __zfs_argument_chosen $pools
            then
                _filedir
            else
                COMPREPLY=($(compgen -W "$pools" -- "$cur"))
            fi
            return 0
            ;;
        *)
            COMPREPLY=($(compgen -W "$(__zpool_list_pools)" -- "$cur"))
            return 0
            ;;
    esac
 }
 complete -F __zfs_complete zfs
 complete -F __zpool_complete zpool
@@ -1,28 +0,0 @@
 ## Allow read-only ZoL commands to be called through sudo
 ## without a password. Remove the first '#' column to enable.
 ##
 ## CAUTION: Any syntax error introduced here will break sudo.
 ##
 ## Cmnd alias specification
 #Cmnd_Alias C_ZFS = \
 #  /sbin/zfs "", /sbin/zfs help *, \
 #  /sbin/zfs get, /sbin/zfs get *, \
 #  /sbin/zfs list, /sbin/zfs list *, \
 #  /sbin/zpool "", /sbin/zpool help *, \
 #  /sbin/zpool iostat, /sbin/zpool iostat *, \
 #  /sbin/zpool list, /sbin/zpool list *, \
 #  /sbin/zpool status, /sbin/zpool status *, \
 #  /sbin/zpool upgrade, /sbin/zpool upgrade -v
 #
 #Runas_Alias R_ROOT = root
 #
 ## User privilege specification
 #root    ALL=(ALL) ALL
 #
 ## Members of the admin group may gain root privileges
 #%adm ALL=(ALL) ALL  # linux
 #%admin ALL=(ALL) ALL  # linux
 #%staff ALL=(ALL) ALL  # solaris
 #
 ## allow any user to use basic read-only ZFS commands
 #ALL ALL = (R_ROOT) NOPASSWD: C_ZFS
@@ -1,14 +0,0 @@
 #!/bin/sh
 # Sub-test to exclude ZVOLs
 set -e
 partition="$1"
 . /usr/share/os-prober/common.sh
 if [ "$(stat -L -c %t "$partition")" = "e6" ] ; then
 	debug "$1 is a ZVOL; skipping"
 	exit 0
 fi
 # No ZVOLs found
 exit 1
@@ -1,67 +0,0 @@
 #!/bin/sh
 #
 # Add udev rules for ZoL to the initrd.
 #
 PREREQ="udev"
 PREREQ_UDEV_RULES="60-zvol.rules 69-vdev.rules"
 COPY_EXEC_LIST="/lib/udev/vdev_id /lib/udev/zvol_id"
 # Generic result code.
 RC=0
 case $1 in
 prereqs)
 	echo "$PREREQ"
 	exit 0
 	;;
 esac
 for ii in $COPY_EXEC_LIST
 do
 	if [ ! -x "$ii" ]
 	then
 		echo "Error: $ii is not executable."
 		RC=2
 	fi
 done
 if [ "$RC" -ne 0 ]
 then
 	exit "$RC"
 fi
 . /usr/share/initramfs-tools/hook-functions
 mkdir -p "$DESTDIR/lib/udev/rules.d/"
 for ii in $PREREQ_UDEV_RULES
 do
 	if [ -e "/etc/udev/rules.d/$ii" ]
 	then
 		cp -p "/etc/udev/rules.d/$ii" "$DESTDIR/lib/udev/rules.d/"
 	elif [ -e "/lib/udev/rules.d/$ii" ]
 	then
 		cp -p "/lib/udev/rules.d/$ii" "$DESTDIR/lib/udev/rules.d/"
 	else
 		echo "Error: Missing udev rule: $ii"
 		echo "       This file must be in the /etc/udev/rules.d or /lib/udev/rules.d directory."
 		exit 1
 	fi
 done
 for ii in $COPY_EXEC_LIST
 do
 	copy_exec "$ii"
 done
 if [ -f '/etc/default/zfs' -a -r '/etc/default/zfs' ]
 then
 	mkdir -p "$DESTDIR/etc/default"	
 	cp -a '/etc/default/zfs' "$DESTDIR/etc/default/"
 fi
 if [ -d '/etc/zfs' -a -r '/etc/zfs' ]
 then
 	mkdir -p "$DESTDIR/etc"
 	cp -a '/etc/zfs' "$DESTDIR/etc/"
 fi
@@ -1,88 +0,0 @@
 BUILD_DEPENDS[0]="spl"
 AUTOINSTALL="yes"
 PACKAGE_NAME="zfs"
 PACKAGE_VERSION="#MODULE_VERSION#"
 PRE_BUILD="configure
  --prefix=/usr
  --with-config=kernel
  --with-linux=$(
    case `lsb_release -is` in
      (Debian)
        if [[ -e ${kernel_source_dir/%build/source} ]]
        then
          echo ${kernel_source_dir/%build/source}
        else
          # A kpkg exception for Proxmox 2.0
          echo ${kernel_source_dir}
        fi
      ;;
      (*)
        echo ${kernel_source_dir}
      ;;
    esac
  )
  --with-linux-obj=${kernel_source_dir}
  --with-spl=${source_tree}/spl-${PACKAGE_VERSION}
  --with-spl-obj=${dkms_tree}/spl/${PACKAGE_VERSION}/${kernelver}/${arch}
  $(
    [[ -r /etc/default/zfs ]] \
    && source /etc/default/zfs \
    && shopt -q -s extglob \
    && \
    {
      if [[ ${ZFS_DKMS_ENABLE_DEBUG,,} == @(y|yes) ]]
      then
        echo --enable-debug
      fi
      if [[ ${ZFS_DKMS_ENABLE_DEBUG_DMU_TX,,} == @(y|yes) ]]
      then
        echo --enable-debug-dmu-tx
      fi
    }
  )
 "
 POST_BUILD="cp
  ${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/zfs_config.h
  ${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/module/Module.symvers
  ${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/${kernelver}/${arch}/
 "
 REMAKE_INITRD="$(
  if [ -e /usr/share/initramfs-tools/hooks/zfs \
       -o -e /usr/share/dracut/modules.d/90zfs ]
  then
    echo -n yes
  else
    echo -n no
  fi
 )"
 MAKE[0]="make"
 STRIP[0]="$(
  [[ -r /etc/default/zfs ]] \
  && source /etc/default/zfs \
  && shopt -q -s extglob \
  && [[ ${ZFS_DKMS_DISABLE_STRIP,,} == @(y|yes) ]] \
  && echo -n no
 )"
 STRIP[1]="${STRIP[0]}"
 STRIP[2]="${STRIP[0]}"
 STRIP[3]="${STRIP[0]}"
 STRIP[4]="${STRIP[0]}"
 STRIP[5]="${STRIP[0]}"
 BUILT_MODULE_NAME[0]="zavl"
 BUILT_MODULE_LOCATION[0]="module/avl/"
 DEST_MODULE_LOCATION[0]="/extra/zfs/zavl"
 BUILT_MODULE_NAME[1]="zcommon"
 BUILT_MODULE_LOCATION[1]="module/zcommon/"
 DEST_MODULE_LOCATION[1]="/extra/zfs/zcommon"
 BUILT_MODULE_NAME[2]="znvpair"
 BUILT_MODULE_LOCATION[2]="module/nvpair/"
 DEST_MODULE_LOCATION[2]="/extra/zfs/znvpair"
 BUILT_MODULE_NAME[3]="zpios"
 BUILT_MODULE_LOCATION[3]="module/zpios/"
 DEST_MODULE_LOCATION[3]="/extra/zfs/zpios"
 BUILT_MODULE_NAME[4]="zunicode"
 BUILT_MODULE_LOCATION[4]="module/unicode/"
 DEST_MODULE_LOCATION[4]="/extra/zfs/zunicode"
 BUILT_MODULE_NAME[5]="zfs"
 BUILT_MODULE_LOCATION[5]="module/zfs/"
 DEST_MODULE_LOCATION[5]="/extra/zfs/zfs"
@@ -1,10 +0,0 @@
 #!/bin/sh -e
 case $1 in
 	(configure)
 		[ -x /usr/share/update-notifier/notify-reboot-required ] \
 		  && /usr/share/update-notifier/notify-reboot-required
 		;;
 esac
 #DEBHELPER#
@@ -1,3 +0,0 @@
 #!/bin/sh -e
 #DEBHELPER#
@@ -1,2 +0,0 @@
 COPYRIGHT
 OPENSOLARIS.LICENSE
@@ -1,56 +0,0 @@
 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
 scripts/common.sh
 scripts/zconfig.sh
 scripts/zfault.sh
 scripts/zfs.sh
 scripts/zpios-profile/zpios-profile-disk.sh
 scripts/zpios-profile/zpios-profile-pids.sh
 scripts/zpios-profile/zpios-profile-post.sh
 scripts/zpios-profile/zpios-profile-pre.sh
 scripts/zpios-profile/zpios-profile.sh
 scripts/zpios-sanity.sh
 scripts/zpios-survey.sh
 scripts/zpios-test/16th-8192rc-4rs-1cs-4off.sh
 scripts/zpios-test/1th-16rc-4rs-1cs-4off.sh
 scripts/zpios-test/1x256th-65536rc-4rs-1cs-4off.sh
 scripts/zpios-test/256th-65536rc-4rs-1cs-4off.sh
 scripts/zpios-test/4th-1024rc-4rs-1cs-4off.sh
 scripts/zpios-test/large-thread-survey.sh
 scripts/zpios-test/large.sh
 scripts/zpios-test/lustre.sh
 scripts/zpios-test/medium.sh
 scripts/zpios-test/small.sh
 scripts/zpios-test/tiny.sh
 scripts/zpios.sh
 scripts/zpool-config/dm0-raid0.sh
 scripts/zpool-config/file-raid0.sh
 scripts/zpool-config/file-raid10.sh
 scripts/zpool-config/file-raidz.sh
 scripts/zpool-config/file-raidz2.sh
 scripts/zpool-config/hda-raid0.sh
 scripts/zpool-config/lo-faulty-raid0.sh
 scripts/zpool-config/lo-faulty-raid10.sh
 scripts/zpool-config/lo-faulty-raidz.sh
 scripts/zpool-config/lo-faulty-raidz2.sh
 scripts/zpool-config/lo-faulty-raidz3.sh
 scripts/zpool-config/lo-raid0.sh
 scripts/zpool-config/lo-raid10.sh
 scripts/zpool-config/lo-raidz.sh
 scripts/zpool-config/lo-raidz2.sh
 scripts/zpool-config/md0-raid10.sh
 scripts/zpool-config/md0-raid5.sh
 scripts/zpool-config/ram0-raid0.sh
 scripts/zpool-config/scsi_debug-noraid.sh
 scripts/zpool-config/scsi_debug-raid0.sh
 scripts/zpool-config/scsi_debug-raid10.sh
 scripts/zpool-config/scsi_debug-raidz.sh
 scripts/zpool-config/scsi_debug-raidz2.sh
 scripts/zpool-config/scsi_debug-raidz3.sh
 scripts/zpool-config/sda-raid0.sh
 scripts/zpool-config/zpool-raid0.sh
 scripts/zpool-config/zpool-raid10.sh
 scripts/zpool-config/zpool-raidz.sh
 scripts/zpool-create.sh
@@ -1 +0,0 @@
 ../tree/zfs-doc/* /
@@ -1 +0,0 @@
 ../tree/zfs-initramfs/* /
@@ -1,10 +0,0 @@
 #!/bin/sh -e
 # @FIXME: During system start, the /etc/init/mountall.conf on Ubuntu is unable
 # to generate the /etc/mtab file from the /proc/mounts file if a ZFS filesystem
 # is already mounted.
 # This depends on mountall 2.18, which recognizes the link.
 ln -sf /proc/mounts /etc/mtab
 #DEBHELPER#
@@ -1,4 +0,0 @@
 ../tree/zfsutils/* /
 sbin
 lib/udev
 usr/share/man
@@ -1,9 +0,0 @@
 #!/bin/sh -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 -- "$@"
 fi
 #DEBHELPER#
@@ -1,9 +0,0 @@
 #!/bin/sh -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 -- "$@"
 fi
 #DEBHELPER#
@@ -1,9 +0,0 @@
 #!/bin/sh -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 -- "$@"
 fi
 #DEBHELPER#
@@ -1,4 +0,0 @@
 ENV{DEVTYPE}=="disk", IMPORT{program}="/lib/udev/vdev_id -d %k"
 KERNEL=="*[!0-9]", ENV{SUBSYSTEM}=="block", ENV{ID_VDEV}=="?*", SYMLINK+="$env{ID_VDEV_PATH}"
 KERNEL=="*[0-9]", ENV{SUBSYSTEM}=="block", ENV{DEVTYPE}=="partition", ENV{ID_VDEV}=="?*", SYMLINK+="$env{ID_VDEV_PATH}-part%n"
 KERNEL=="dm-[0-9]*", ENV{SUBSYSTEM}=="block", ENV{ID_VDEV}=="?*", SYMLINK+="$env{ID_VDEV_PATH}"
@@ -1,80 +0,0 @@
 #!/bin/sh
 #
 ### BEGIN INIT INFO
 # Provides: zvol zfs
 # Required-Start: $local_fs
 # Required-Stop: $local_fs
 # Default-Start: 2 3 4 5
 # Default-Stop: 0 1 6
 # Short-Description: Mount ZFS filesystems
 # Description: Run the `zfs mount -a` or `zfs umount -a` command.
 #              This init script is deprecated and should be disabled in the
 #              /etc/default/zfs options file. Instead, use the zfs-mount
 #              package for Debian or the zfs-mountall package for Ubuntu
 ### END INIT INFO
 PATH=/sbin:/bin
 . /lib/lsb/init-functions
 . /lib/init/vars.sh
 [ -f /etc/default/zfs ] && . /etc/default/zfs
 do_start()
 {
 	log_begin_msg "Mounting ZFS filesystems"
 	log_progress_msg "filesystems"
 	zfs mount -a
 	RET=$?
 	if [ $RET != 0 ] ; then
 		log_end_msg $RET
 		exit $RET
 	fi
 	log_end_msg 0
 }
 do_stop()
 {
 	log_begin_msg "Unmounting ZFS filesystems"
 	log_progress_msg "filesystems"
 	zfs unmount -a
 	RET=$?
 	# Ignore a non-zero `zfs` result so that a busy ZFS instance
 	# does not hang the system during shutdown.
 	if [ $RET != 0 ] ; then
 		log_end_msg $RET
 	fi
 	log_end_msg 0
 }
 case "$1" in
 	(start)
 		case "$ZFS_MOUNT" in
 			([Oo][Ff][Ff]|[Nn][Oo]|'')
 				exit 0
 				;;
 		esac
 		do_start
 		;;
 	(stop)
 		case "$ZFS_UNMOUNT" in
 			([Oo][Ff][Ff]|[Nn][Oo]|'')
 				exit 0
 				;;
 		esac
 		do_stop
 		;;
 	(force-reload|reload|restart|status)
 		# no-op
 		;;
 	(*)
 		[ -n "$1" ] && echo "Error: Unknown command $1."
 		echo "Usage: $0 {start|stop}"
 		exit 3
 	;;
 esac
@@ -1,80 +0,0 @@
 #!/bin/sh
 ### BEGIN INIT INFO
 # Provides: shareiscsi sharenfs sharesmb zfs-share
 # Required-Start: $local_fs $network $remote_fs
 # Required-Stop: $local_fs $network $remote_fs
 # Default-Start: 2 3 4 5
 # Default-Stop: 0 1 6
 # Should-Start: iscsi iscsitarget istgt nfs-kernel-server samba
 # Should-Stop: iscsi iscsitarget istgt nfs-kernel-server samba
 # Short-Description: Network share OpenZFS datasets.
 # Description: Run the `zfs share -a` or `zfs unmount -a` commands
 #	for controlling iSCSI, NFS, or CIFS network shares.
 ### END INIT INFO
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 . /lib/lsb/init-functions
 . /lib/init/vars.sh
 [ -f /etc/default/zfs ] && . /etc/default/zfs
 do_start()
 {
 	log_begin_msg "Sharing OpenZFS filesystems"
 	log_progress_msg "filesystems"
 	zfs share -a
 	RET=$?
 	if [ $RET != 0 ] ; then
 		log_end_msg $RET
 		exit $RET
 	fi
 	log_end_msg 0
 }
 do_stop()
 {
 	log_begin_msg "Unsharing OpenZFS filesystems"
 	log_progress_msg "filesystems"
 	zfs unshare -a
 	RET=$?
 	# Ignore a non-zero `zfs` result so that a busy OpenZFS instance
 	# does not hang the system during shutdown.
 	if [ $RET != 0 ] ; then
 		log_end_msg $RET
 	fi
 	log_end_msg 0
 }
 case "$1" in
 	(start)
 		case "$ZFS_SHARE" in
 			([Oo][Ff][Ff]|[Nn][Oo]|'')
 				exit 0
 				;;
 		esac
 		do_start
 		;;
 	(stop)
 		case "$ZFS_UNSHARE" in
 			([Oo][Ff][Ff]|[Nn][Oo]|'')
 				exit 0
 				;;
 		esac
 		do_stop
 		;;
 	(force-reload|reload|restart|status)
 		# no-op
 		;;
 	(*)
 		[ -n "$1" ] && echo "Error: Unknown command $1."
 		echo "Usage: $0 {start|stop}"
 		exit 3
 	;;
 esac
@@ -1,15 +0,0 @@
 # ZoL userland configuration.
 # uncomment the following line to mount zfs at startup
 #ZFS_MOUNT=yes
 # Wait this many seconds during system start for pool member devices to appear
 # before attempting import and starting mountall.
 ZFS_AUTOIMPORT_TIMEOUT='30'
 # Run `zfs share -a` during system start?
 # nb: The shareiscsi, sharenfs, and sharesmb dataset properties.
 ZFS_SHARE='no'
 # Run `zfs unshare -a` during system stop?
 ZFS_UNSHARE='no'
@@ -1 +0,0 @@
 KERNEL=="zd*" SUBSYSTEM=="block" ACTION=="add|change" PROGRAM="/lib/udev/zvol_id $tempnode" SYMLINK+="zvol/%c"
@@ -0,0 +1,282 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
 Date: Mon, 6 Feb 2017 11:03:10 +0100
 Subject: [PATCH] remove DKMS, modules and dracut build
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 ---
 debian/control.in    |  41 ++------------------
 debian/control       |   1 -
 debian/not-installed |   2 +
 debian/rules         | 105 +--------------------------------------------------
 4 files changed, 7 insertions(+), 142 deletions(-)
 diff --git a/debian/control.in b/debian/control.in
 index aef8cac2e..3cc15a05b 100644
 --- a/debian/control.in
 +++ b/debian/control.in
@@ -9,7 +9,6 @@ Build-Depends: autotools-dev,
                debhelper (>= 10.2),
                dh-autoreconf,
                dh-python,
 -               dkms (>> 2.1.1.2-5),
                libattr1-dev,
                libblkid-dev,
                libselinux1-dev,
@@ -86,27 +85,10 @@ Description: OpenZFS pool library for Linux
  .
  This zpool library provides support for managing zpools.
 -Package: zfs-dkms
 -Architecture: all
 -Pre-Depends: spl-dkms (<<${source:Upstream-Version}.),
 -             spl-dkms (>= ${source:Upstream-Version})
 -Depends: dkms (>> 2.1.1.2-5), lsb-release, ${misc:Depends}
 -Recommends: zfs-zed, zfsutils-linux (>= ${binary:Version}),
 -              @LINUX_COMPAT@
 -Provides: zfs-modules
 -Description: OpenZFS filesystem kernel modules for Linux
 - The Z file system is a pooled filesystem designed for maximum data
 - integrity, supporting data snapshots, multiple copies, and data
 - checksums.
 - .
 - This DKMS package includes the SPA, DMU, ZVOL, and ZPL components of
 - OpenZFS.
 -
 Package: zfs-initramfs
 Architecture: all
 Depends: busybox-initramfs | busybox-static | busybox,
          initramfs-tools,
 -         zfs-modules | zfs-dkms,
          zfsutils-linux (>= ${binary:Version}),
          ${misc:Depends}
 Description: OpenZFS root filesystem capabilities for Linux - initramfs
@@ -117,29 +99,14 @@ Description: OpenZFS root filesystem capabilities for Linux - initramfs
  This package adds OpenZFS to the system initramfs with a hook
  for the initramfs-tools infrastructure.
 -Package: zfs-dracut
 -Architecture: all
 -Depends: dracut,
 -         zfs-modules | zfs-dkms,
 -         zfsutils-linux (>= ${binary:Version}),
 -         ${misc:Depends}
 -Description: OpenZFS root filesystem capabilities for Linux - dracut
 - The Z file system is a pooled filesystem designed for maximum data
 - integrity, supporting data snapshots, multiple copies, and data
 - checksums.
 - .
 - This package adds OpenZFS to the system initramfs with a hook
 - for the dracut infrastructure.
 -
 Package: zfsutils-linux
 Section: contrib/admin
 Architecture: linux-any
 Depends: python3, ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}
 -Recommends: lsb-base, zfs-modules | zfs-dkms, zfs-zed
 -Breaks: zfs-dkms (<< ${binary:Version}), zfs-dkms (>> ${binary:Version})
 +Recommends: lsb-base, zfs-zed
 Suggests: nfs-kernel-server,
           samba-common-bin (>= 3.0.23),
 -          zfs-initramfs | zfs-dracut
 +          zfs-initramfs
 Conflicts: zfs, zfs-fuse, zutils
 Provides: zfsutils
 Description: command-line tools to manage OpenZFS filesystems
@@ -153,8 +120,7 @@ Description: command-line tools to manage OpenZFS filesystems
 Package: zfs-zed
 Section: contrib/admin
 Architecture: linux-any
 -Depends: zfs-modules | zfs-dkms,
 -         zfsutils-linux (>= ${binary:Version}),
 +Depends: zfsutils-linux (>= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Description: OpenZFS Event Daemon
@@ -177,7 +143,6 @@ Depends: acl,
          python,
          sudo,
          sysstat,
 -         zfs-modules | zfs-dkms,
          zfsutils-linux (>=${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 diff --git a/debian/control b/debian/control
 index 3cf6fb649..51cfe6a64 100644
 --- a/debian/control
 +++ b/debian/control
@@ -9,7 +9,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/not-installed b/debian/not-installed
 index f54fe7310..c3929d90e 100644
 --- a/debian/not-installed
 +++ b/debian/not-installed
@@ -5,3 +5,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 cc47a74a1..a5c37c81d 100755
 --- a/debian/rules
 +++ b/debian/rules
@@ -5,9 +5,6 @@ include /usr/share/dpkg/default.mk
 LSB_DISTRIBUTOR := $(shell lsb_release -is)
 NAME := $(shell awk '$$1 == "Name:" { print $$2; }' META)
 -DKMSFILES := module include config zfs.release.in autogen.sh META AUTHORS \
 -		DISCLAIMER COPYRIGHT OPENSOLARIS.LICENSE README.markdown
 -
 ifndef BUILD_UDEB
 BUILD_UDEB=false
 endif
@@ -17,21 +14,16 @@ KVERS=$(shell uname -r)
 endif
 ifndef SPL
 -SPL=/usr/src/spl-$(DEB_VERSION_UPSTREAM)
 -endif
 -
 -ifndef SPLOBJ
 -SPLOBJ=/var/lib/dkms/spl/$(DEB_VERSION_UPSTREAM)/$(KVERS)/$(DEB_TARGET_GNU_CPU)
 +SPL=../spl-build
 endif
 non_epoch_version=$(shell echo $(KVERS) | perl -pe 's/^\d+://')
 PACKAGE=zfs
 -pmodules = $(PACKAGE)-modules-$(non_epoch_version)
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 %:
 -	dh $@ --with autoreconf,dkms,python3,systemd --parallel
 +	dh $@ --with autoreconf,python3,systemd --parallel
 override_dh_auto_configure:
 	sed "s/@LINUX_COMPAT@/linux-libc-dev \(< $(shell debian/get_next.sh)\)/" debian/control.in > debian/control
@@ -73,36 +65,6 @@ override_dh_auto_install:
 	$(INSTALL) -d '$(CURDIR)/debian/tmp/usr/sbin/'
 	mv '$(CURDIR)/debian/tmp/sbin/zed' '$(CURDIR)/debian/tmp/usr/sbin/zed'
 -	@# Get a bare copy of the source code for DKMS.
 -	@# This creates the $(CURDIR)/$(NAME)-$(DEB_VERSION_UPSTREAM)/ tree, which does not
 -	@# contain the userland sources. NB: Remove-userland-dist-rules.patch
 -	$(MAKE) distdir
 -
 -	@# Install the DKMS source.
 -	@# We only want the files needed to build the modules
 -	mkdir -p '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)'
 -	$(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
 -	awk '/^AC_CONFIG_FILES\(\[/,/^\]\)/ { if ($$0 !~ /^(AC_CONFIG_FILES\(\[([ \t]+)?$$|\]\)([ \t]+)?$$|([ \t]+)?(include\/|module\/|Makefile([ \t]+)?$$|zfs\.release([ \t]+)?$$))/){next} } {print}' \
 -		'$(CURDIR)/$(NAME)-$(DEB_VERSION_UPSTREAM)/configure.ac' > '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/configure.ac'
 -	@# Set "SUBDIRS = module include" for CONFIG_KERNEL and remove SUBDIRS for all other configs.
 -	sed '1,/CONFIG_KERNEL/s/SUBDIRS.*=.*//g;s/SUBDIRS.*=.*/SUBDIRS = module include/g;' \
 -		'$(CURDIR)/$(NAME)-$(DEB_VERSION_UPSTREAM)/Makefile.am' > '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/Makefile.am'
 -	@# Sanity test
 -	grep -q 'SUBDIRS = module include' '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/Makefile.am'
 -	@# Run autogen on the stripped source tree
 -	cd '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)'; ./autogen.sh
 -	rm -fr '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/autom4te.cache'
 -
 -	@# 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)-$(DEB_VERSION_UPSTREAM)/cp'
 -	chmod 755 '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/cp'
 -
 	mkdir -p $(CURDIR)/debian/tmp/usr/lib
 	for i in `ls $(CURDIR)/debian/tmp/lib/*.so`; do \
 		ln -s /lib/`readlink $${i}` $(CURDIR)/debian/tmp/usr/lib/`basename $${i}`; \
@@ -112,9 +74,6 @@ override_dh_auto_install:
 	chmod a-x $(CURDIR)/debian/tmp/etc/zfs/zfs-functions
 	chmod a-x $(CURDIR)/debian/tmp/etc/default/zfs
 -override_dh_dkms:
 -	dh_dkms -V $(DEB_VERSION_UPSTREAM)
 -
 override_dh_makeshlibs:
 	dh_makeshlibs -a -V
 ifeq ($(BUILD_UDEB), true)
@@ -152,65 +111,5 @@ override_dh_install:
 # ------------
 -override_dh_prep-deb-files:
 -	for templ in $(wildcard $(CURDIR)/debian/*_KVERS_*.in); do \
 -		sed -e 's/##KVERS##/$(KVERS)/g ; s/#KVERS#/$(KVERS)/g ; s/_KVERS_/$(KVERS)/g ; s/##KDREV##/$(KDREV)/g ; s/#KDREV#/$(KDREV)/g ; s/_KDREV_/$(KDREV)/g ; s/_ARCH_/$(DEB_HOST_ARCH)/' \
 -		< $$templ > `echo $$templ | sed -e 's/_KVERS_/$(KVERS)/g ; s/_ARCH_/$(DEB_HOST_ARCH)/g ; s/\.in$$//'` ; \
 -	done
 -	sed -e 's/##KVERS##/$(KVERS)/g ; s/#KVERS#/$(KVERS)/g ; s/_KVERS_/$(KVERS)/g ; s/##KDREV##/$(KDREV)/g ; s/#KDREV#/$(KDREV)/g ; s/_KDREV_/$(KDREV)/g ; s/_ARCH_/$(DEB_HOST_ARCH)/g' \
 -	< debian/control.modules.in > debian/control
 -
 -override_dh_configure_modules_udeb: override_dh_configure_modules_udeb_stamp
 -override_dh_configure_modules_udeb_stamp:
 -	./configure \
 -		--without-selinux \
 -		--with-config=kernel \
 -		--with-linux=$(KSRC) \
 -		--with-linux-obj=$(KOBJ) \
 -		--with-spl=$(SPL) \
 -		--with-spl-obj=$(SPLOBJ)
 -	touch override_dh_configure_modules_udeb_stamp
 -
 -override_dh_configure_modules: override_dh_configure_modules_stamp
 -override_dh_configure_modules_stamp:
 -	./configure \
 -		--with-config=kernel \
 -		--with-linux=$(KSRC) \
 -		--with-linux-obj=$(KOBJ) \
 -		--with-spl=$(SPL) \
 -		--with-spl-obj=$(SPLOBJ)
 -	touch override_dh_configure_modules_stamp
 -
 -override_dh_binary-modules-udeb: override_dh_prep-deb-files override_dh_configure_modules_udeb
 -	dh_testdir
 -	dh_testroot
 -	dh_prep
 -
 -	$(MAKE) -C $(CURDIR)/module modules
 -
 -	dh_installdirs -p${pmodules}-di
 -	dh_install -p${pmodules}-di
 -	dh_gencontrol -p${pmodules}-di
 -
 -	dh_builddeb -p${pmodules}-di
 -
 -override_dh_binary-modules: override_dh_prep-deb-files override_dh_configure_modules
 -	dh_testdir
 -	dh_testroot
 -	dh_prep
 -
 -	$(MAKE) -C $(CURDIR)/module modules
 -
 -	dh_install -p${pmodules}
 -	dh_installdocs -p${pmodules}
 -	dh_installchangelogs -p${pmodules}
 -	dh_compress -p${pmodules}
 -	dh_strip -p${pmodules}
 -	dh_fixperms -p${pmodules}
 -	dh_installdeb -p${pmodules}
 -	dh_gencontrol -p${pmodules}
 -	dh_md5sums -p${pmodules}
 -	dh_builddeb -p${pmodules}
 -
 debian-copyright:
 	cme update dpkg-copyright -file debian/copyright.cme
 -- 
 2.14.2
@@ -0,0 +1,29 @@
 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] 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>
 ---
 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 227f5b74f..cc428b0d0 100644
 --- a/etc/systemd/system/zfs-import-scan.service.in
 +++ b/etc/systemd/system/zfs-import-scan.service.in
@@ -12,7 +12,7 @@ ConditionPathExists=!@sysconfdir@/zfs/zpool.cache
 Type=oneshot
 RemainAfterExit=yes
 ExecStartPre=/sbin/modprobe zfs
 -ExecStart=@sbindir@/zpool import -aN -o cachefile=none
 +ExecStart=@sbindir@/zpool import -aN -d /dev/disk/by-id -o cachefile=none
 [Install]
 WantedBy=zfs-import.target
 -- 
 2.14.2
@@ -0,0 +1,30 @@
 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>
 ---
 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 8b41baa30..59b058c9a 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
 -- 
 2.14.2
@@ -0,0 +1,89 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Richard Yao <richard.yao@clusterhq.com>
 Date: Tue, 23 Sep 2014 13:31:33 -0400
 Subject: [PATCH] Make --enable-debug fail when given bogus args
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 Currently, bogus options to --enable-debug become --disable-debug. That
 means that passing --enable-debug=true is analogous to --disable-debug,
 but the result is counterintuitive. We switch to AS_CASE to allow us to
 fail when given a bogus option.
 Also, we modify the text printed to clarify that --enable-debug enables
 assertions.
 Reviewed-by: Chunwei Chen <tuxoko@gmail.com>
 Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Signed-off-by: Richard Yao <richard.yao@clusterhq.com>
 Closes #2734
 (cherry picked from commit 0f1ff38476ba255eb1f066f675c8721168ff2295)
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 ---
 config/zfs-build.m4 | 43 +++++++++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 18 deletions(-)
 diff --git a/config/zfs-build.m4 b/config/zfs-build.m4
 index 7651dc2c1..78a87aef7 100644
 --- a/config/zfs-build.m4
 +++ b/config/zfs-build.m4
@@ -6,30 +6,37 @@ AC_DEFUN([ZFS_AC_LICENSE], [
 	AC_MSG_RESULT([$ZFS_META_LICENSE])
 ])
 +AC_DEFUN([ZFS_AC_DEBUG_ENABLE], [
 +	KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG -Werror"
 +	HOSTCFLAGS="${HOSTCFLAGS} -DDEBUG -Werror"
 +	DEBUG_CFLAGS="-DDEBUG -Werror"
 +	DEBUG_STACKFLAGS="-fstack-check"
 +	DEBUG_ZFS="_with_debug"
 +	AC_DEFINE(ZFS_DEBUG, 1, [zfs debugging enabled])
 +])
 +
 +AC_DEFUN([ZFS_AC_DEBUG_DISABLE], [
 +	KERNELCPPFLAGS="${KERNELCPPFLAGS} -DNDEBUG "
 +	HOSTCFLAGS="${HOSTCFLAGS} -DNDEBUG "
 +	DEBUG_CFLAGS="-DNDEBUG"
 +	DEBUG_STACKFLAGS=""
 +	DEBUG_ZFS="_without_debug"
 +])
 +
 AC_DEFUN([ZFS_AC_DEBUG], [
 -	AC_MSG_CHECKING([whether debugging is enabled])
 +	AC_MSG_CHECKING([whether assertion support will be enabled])
 	AC_ARG_ENABLE([debug],
 		[AS_HELP_STRING([--enable-debug],
 -		[Enable generic debug support @<:@default=no@:>@])],
 +		[Enable assertion support @<:@default=no@:>@])],
 		[],
 		[enable_debug=no])
 -	AS_IF([test "x$enable_debug" = xyes],
 -	[
 -		KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG -Werror"
 -		HOSTCFLAGS="${HOSTCFLAGS} -DDEBUG -Werror"
 -		DEBUG_CFLAGS="-DDEBUG -Werror"
 -		DEBUG_STACKFLAGS="-fstack-check"
 -		DEBUG_ZFS="_with_debug"
 -		AC_DEFINE(ZFS_DEBUG, 1, [zfs debugging enabled])
 -	],
 -	[
 -		KERNELCPPFLAGS="${KERNELCPPFLAGS} -DNDEBUG "
 -		HOSTCFLAGS="${HOSTCFLAGS} -DNDEBUG "
 -		DEBUG_CFLAGS="-DNDEBUG"
 -		DEBUG_STACKFLAGS=""
 -		DEBUG_ZFS="_without_debug"
 -	])
 +	AS_CASE(["x$enable_debug"],
 +		["xyes"],
 +		[ZFS_AC_DEBUG_ENABLE],
 +		["xno"],
 +		[ZFS_AC_DEBUG_DISABLE],
 +		[AC_MSG_ERROR([Unknown option $enable_debug])])
 	AC_SUBST(DEBUG_CFLAGS)
 	AC_SUBST(DEBUG_STACKFLAGS)
 -- 
 2.14.2
@@ -0,0 +1,122 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Richard Yao <richard.yao@clusterhq.com>
 Date: Tue, 23 Sep 2014 14:29:30 -0400
 Subject: [PATCH] Implement --enable-debuginfo to force debuginfo
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 Inspection of a Ubuntu 14.04 x64 system revealed that the config file
 used to build the kernel image differs from the config file used to
 build kernel modules by the presence of CONFIG_DEBUG_INFO=y:
 This in itself is insufficient to show that the kernel is built with
 debuginfo, but a cursory analysis of the debuginfo provided and the
 size of the kernel strongly suggests that it was built with
 CONFIG_DEBUG_INFO=y while the modules were not. Installing
 linux-image-$(uname -r)-dbgsym had no obvious effect on the debuginfo
 provided by either the modules or the kernel.
 The consequence is that issue reports from distributions such as Ubuntu
 and its derivatives build kernel modules without debuginfo contain
 nonsensical backtraces. It is therefore desireable to force generation
 of debuginfo, so we implement --enable-debuginfo. Since the build system
 can build both userspace components and kernel modules, the generic
 --enable-debuginfo option will force debuginfo for both. However, it
 also supports --enable-debuginfo=kernel and --enable-debuginfo=user for
 finer grained control.
 Enabling debuginfo for the kernel modules works by injecting
 CONFIG_DEBUG_INFO=y into the make environment. This is enables
 generation of debuginfo by the kernel build systems on all Linux
 kernels, but the build environment is slightly different int hat
 CONFIG_DEBUG_INFO has not been in the CPP. Adding -DCONFIG_DEBUG_INFO
 would fix that, but it would also cause build failures on kernels where
 CONFIG_DEBUG_INFO=y is already set. That would complicate its use in
 DKMS environments that support a range of kernels and is therefore
 undesireable. We could write a compatibility shim to enable
 CONFIG_DEBUG_INFO only when it is explicitly disabled, but we forgo
 doing that because it is unnecessary. Nothing in ZoL or the kernel uses
 CONFIG_DEBUG_INFO in the CPP at this time and that is unlikely to
 change.
 Enabling debuginfo for the userspace components is done by injecting -g
 into CPPFLAGS. This is not necessary because the build system honors the
 environment's CPPFLAGS by appending them to the actual CPPFLAGS used,
 but it is supported for consistency.
 Reviewed-by: Chunwei Chen <tuxoko@gmail.com>
 Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Signed-off-by: Richard Yao <richard.yao@clusterhq.com>
 Closes #2734
 (cherry picked from commit 834815e9f767c9c5e7220ff84f29b1f069822a4d)
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 ---
 configure.ac        |  1 +
 config/zfs-build.m4 | 33 ++++++++++++++++++++++++++++++++-
 2 files changed, 33 insertions(+), 1 deletion(-)
 diff --git a/configure.ac b/configure.ac
 index 0c7977ef8..e145aa370 100644
 --- a/configure.ac
 +++ b/configure.ac
@@ -55,6 +55,7 @@ ZFS_AC_LICENSE
 ZFS_AC_PACKAGE
 ZFS_AC_CONFIG
 ZFS_AC_DEBUG
 +ZFS_AC_DEBUGINFO
 AC_CONFIG_FILES([
 	Makefile
 diff --git a/config/zfs-build.m4 b/config/zfs-build.m4
 index 78a87aef7..a8609b829 100644
 --- a/config/zfs-build.m4
 +++ b/config/zfs-build.m4
@@ -38,12 +38,43 @@ AC_DEFUN([ZFS_AC_DEBUG], [
 		[ZFS_AC_DEBUG_DISABLE],
 		[AC_MSG_ERROR([Unknown option $enable_debug])])
 -	AC_SUBST(DEBUG_CFLAGS)
 	AC_SUBST(DEBUG_STACKFLAGS)
 	AC_SUBST(DEBUG_ZFS)
 	AC_MSG_RESULT([$enable_debug])
 ])
 +AC_DEFUN([ZFS_AC_DEBUGINFO_KERNEL], [
 +	KERNELMAKE_PARAMS="$KERNELMAKE_PARAMS CONFIG_DEBUG_INFO=y"
 +])
 +
 +AC_DEFUN([ZFS_AC_DEBUGINFO_USER], [
 +	DEBUG_CFLAGS="$DEBUG_CFLAGS -g"
 +])
 +
 +AC_DEFUN([ZFS_AC_DEBUGINFO], [
 +	AC_MSG_CHECKING([whether debuginfo support will be forced])
 +	AC_ARG_ENABLE([debuginfo],
 +		[AS_HELP_STRING([--enable-debuginfo],
 +		[Force generation of debuginfo @<:@default=no@:>@])],
 +		[],
 +		[enable_debuginfo=no])
 +
 +	AS_CASE(["x$enable_debuginfo"],
 +		["xyes"],
 +		[ZFS_AC_DEBUGINFO_KERNEL
 +		ZFS_AC_DEBUGINFO_USER],
 +		["xkernel"],
 +		[ZFS_AC_DEBUGINFO_KERNEL],
 +		["xuser"],
 +		[ZFS_AC_DEBUGINFO_USER],
 +		["xno"],
 +		[],
 +		[AC_MSG_ERROR([Unknown option $enable_debug])])
 +
 +	AC_SUBST(DEBUG_CFLAGS)
 +	AC_MSG_RESULT([$enable_debuginfo])
 +])
 +
 AC_DEFUN([ZFS_AC_CONFIG_ALWAYS], [
 	ZFS_AC_CONFIG_ALWAYS_NO_UNUSED_BUT_SET_VARIABLE
 	ZFS_AC_CONFIG_ALWAYS_NO_BOOL_COMPARE
 -- 
 2.14.2
@@ -0,0 +1,121 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Brian Behlendorf <behlendorf1@llnl.gov>
 Date: Fri, 15 Sep 2017 10:24:13 -0700
 Subject: [PATCH] Add configure option to enable gcov analysis
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 * Add configure option to enable gcov analysis.
 * Includes a few minor ctime fixes.
 * Add codecov.yml configuration.
 Reviewed-by: Prakash Surya <prakash.surya@delphix.com>
 Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Closes #6642
 (cherry picked from commit 184087f822ef178d6f5c155681ee7c3d90f23321)
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 ---
 configure.ac                                       |  1 +
 Makefile.am                                        |  8 +++---
 .github/codecov.yml                                |  9 +++++++
 config/zfs-build.m4                                | 31 ++++++++++++++++++++++
 .../tests/functional/ctime/ctime_001_pos.ksh       |  0
 5 files changed, 45 insertions(+), 4 deletions(-)
 create mode 100644 .github/codecov.yml
 mode change 100644 => 100755 tests/zfs-tests/tests/functional/ctime/ctime_001_pos.ksh
 diff --git a/configure.ac b/configure.ac
 index e145aa370..ee754fd38 100644
 --- a/configure.ac
 +++ b/configure.ac
@@ -56,6 +56,7 @@ ZFS_AC_PACKAGE
 ZFS_AC_CONFIG
 ZFS_AC_DEBUG
 ZFS_AC_DEBUGINFO
 +ZFS_AC_GCOV
 AC_CONFIG_FILES([
 	Makefile
 diff --git a/Makefile.am b/Makefile.am
 index 508d3f40e..732a373bd 100644
 --- a/Makefile.am
 +++ b/Makefile.am
@@ -29,10 +29,10 @@ distclean-local::
 		-o -name .pc -o -name .hg -o -name .git \) -prune -o \
 		\( -name '*.orig' -o -name '*.rej' -o -name '*~' \
 		-o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
 -		-o -name '.*.rej' -o -name '.script-config' -o -size 0 \
 -		-o -name '*%' -o -name '.*.cmd' -o -name 'core' \
 -		-o -name 'Makefile' -o -name 'Module.symvers' \
 -		-o -name '*.order' -o -name '*.markers' \) \
 +		-o -name '.*.rej' -o -size 0 -o -name '*%' -o -name '.*.cmd' \
 +		-o -name 'core' -o -name 'Makefile' -o -name 'Module.symvers' \
 +		-o -name '*.order' -o -name '*.markers' -o -name '*.gcda' \
 +		-o -name '*.gcno' \) \
 		-type f -print | xargs $(RM)
 dist-hook:
 diff --git a/.github/codecov.yml b/.github/codecov.yml
 new file mode 100644
 index 000000000..f36be39cb
 --- /dev/null
 +++ b/.github/codecov.yml
@@ -0,0 +1,9 @@
 +codecov:
 +  strict_yaml_branch: master # only use the latest copy on master branch
 +
 +comment: off
 +
 +coverage:
 +  status:
 +    project: off
 +    patch: off
 diff --git a/config/zfs-build.m4 b/config/zfs-build.m4
 index a8609b829..b84658a64 100644
 --- a/config/zfs-build.m4
 +++ b/config/zfs-build.m4
@@ -75,6 +75,37 @@ AC_DEFUN([ZFS_AC_DEBUGINFO], [
 	AC_MSG_RESULT([$enable_debuginfo])
 ])
 +AC_DEFUN([ZFS_AC_GCOV_KERNEL], [
 +])
 +
 +AC_DEFUN([ZFS_AC_GCOV_USER], [
 +	DEBUG_CFLAGS="$DEBUG_CFLAGS -fprofile-arcs -ftest-coverage"
 +])
 +
 +AC_DEFUN([ZFS_AC_GCOV], [
 +	AC_MSG_CHECKING([whether gcov profiling will be enabled])
 +	AC_ARG_ENABLE([gcov],
 +		[AS_HELP_STRING([--enable-gcov],
 +		[Enable gcov profiling @<:@default=no@:>@])],
 +		[],
 +		[enable_gcov=no])
 +
 +	AS_CASE(["x$enable_gcov"],
 +		["xyes"],
 +		[ZFS_AC_GCOV_KERNEL
 +		ZFS_AC_GCOV_USER],
 +		["xkernel"],
 +		[ZFS_AC_GCOV_KERNEL],
 +		["xuser"],
 +		[ZFS_AC_GCOV_USER],
 +		["xno"],
 +		[],
 +		[AC_MSG_ERROR([Unknown option $enable_gcov])])
 +
 +	AC_SUBST(DEBUG_CFLAGS)
 +	AC_MSG_RESULT([$enable_gcov])
 +])
 +
 AC_DEFUN([ZFS_AC_CONFIG_ALWAYS], [
 	ZFS_AC_CONFIG_ALWAYS_NO_UNUSED_BUT_SET_VARIABLE
 	ZFS_AC_CONFIG_ALWAYS_NO_BOOL_COMPARE
 diff --git a/tests/zfs-tests/tests/functional/ctime/ctime_001_pos.ksh b/tests/zfs-tests/tests/functional/ctime/ctime_001_pos.ksh
 old mode 100644
 new mode 100755
 -- 
 2.14.2
@@ -0,0 +1,43 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Prakash Surya <prakash.surya@delphix.com>
 Date: Fri, 15 Sep 2017 11:47:11 -0700
 Subject: [PATCH] Make "-fno-inline" compile option more accessible
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 When functions are inlined, it can make the system much more difficult
 to instrument using tools such as ftrace, BPF, crash, etc. Thus, to aid
 development and increase the system's observability, when the
 "--enable-debuginfo" flag is specified, the "-fno-inline" compilation
 option will be used for both userspace and kernel modules.
 Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Signed-off-by: Prakash Surya <prakash.surya@delphix.com>
 Closes #6605
 (cherry picked from commit f1236ebf35d1531db75ac8a57b23e8fe48d6b780)
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 ---
 config/zfs-build.m4 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
 diff --git a/config/zfs-build.m4 b/config/zfs-build.m4
 index b84658a64..c695a882e 100644
 --- a/config/zfs-build.m4
 +++ b/config/zfs-build.m4
@@ -45,10 +45,11 @@ AC_DEFUN([ZFS_AC_DEBUG], [
 AC_DEFUN([ZFS_AC_DEBUGINFO_KERNEL], [
 	KERNELMAKE_PARAMS="$KERNELMAKE_PARAMS CONFIG_DEBUG_INFO=y"
 +	KERNELCPPFLAGS="${KERNELCPPFLAGS} -fno-inline"
 ])
 AC_DEFUN([ZFS_AC_DEBUGINFO_USER], [
 -	DEBUG_CFLAGS="$DEBUG_CFLAGS -g"
 +	DEBUG_CFLAGS="${DEBUG_CFLAGS} -g -fno-inline"
 ])
 AC_DEFUN([ZFS_AC_DEBUGINFO], [
 -- 
 2.14.2
@@ -0,0 +1,399 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Prakash Surya <prakash.surya@delphix.com>
 Date: Fri, 22 Sep 2017 18:49:57 -0700
 Subject: [PATCH] Add support for "--enable-code-coverage" option
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 This change adds support for a new option that can be passed to the
 configure script: "--enable-code-coverage". Further, the "--enable-gcov"
 option has been removed, as this new option provides the same
 functionality (plus more).
 When using this new option the following make targets are available:
 * check-code-coverage
 * code-coverage-capture
 * code-coverage-clean
 Note: these make targets can only be run from the root of the project.
 Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Signed-off-by: Prakash Surya <prakash.surya@delphix.com>
 Closes #6670
 (cherry picked from commit 6b278f3223c0322527836da2e11e33978e54a234)
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 ---
 configure.ac               |   2 +-
 Makefile.am                |   2 +
 config/Rules.am            |   2 +
 config/ax_code_coverage.m4 | 264 +++++++++++++++++++++++++++++++++++++++++++++
 config/zfs-build.m4        |  31 ------
 5 files changed, 269 insertions(+), 32 deletions(-)
 create mode 100644 config/ax_code_coverage.m4
 diff --git a/configure.ac b/configure.ac
 index ee754fd38..d71712e4c 100644
 --- a/configure.ac
 +++ b/configure.ac
@@ -50,13 +50,13 @@ AC_PROG_CC
 AC_PROG_LIBTOOL
 AM_PROG_AS
 AM_PROG_CC_C_O
 +AX_CODE_COVERAGE
 ZFS_AC_LICENSE
 ZFS_AC_PACKAGE
 ZFS_AC_CONFIG
 ZFS_AC_DEBUG
 ZFS_AC_DEBUGINFO
 -ZFS_AC_GCOV
 AC_CONFIG_FILES([
 	Makefile
 diff --git a/Makefile.am b/Makefile.am
 index 732a373bd..b539ff30f 100644
 --- a/Makefile.am
 +++ b/Makefile.am
@@ -23,6 +23,8 @@ EXTRA_DIST  = autogen.sh copy-builtin
 EXTRA_DIST += config/config.awk config/rpm.am config/deb.am config/tgz.am
 EXTRA_DIST += META DISCLAIMER COPYRIGHT README.markdown OPENSOLARIS.LICENSE
 +@CODE_COVERAGE_RULES@
 +
 distclean-local::
 	-$(RM) -R autom4te*.cache
 	-find . \( -name SCCS -o -name BitKeeper -o -name .svn -o -name CVS \
 diff --git a/config/Rules.am b/config/Rules.am
 index 1d39e7779..215f09c34 100644
 --- a/config/Rules.am
 +++ b/config/Rules.am
@@ -6,6 +6,7 @@ AM_CFLAGS += ${NO_UNUSED_BUT_SET_VARIABLE}
 AM_CFLAGS += ${NO_BOOL_COMPARE}
 AM_CFLAGS += -fno-strict-aliasing
 AM_CFLAGS += -std=gnu99
 +AM_CFLAGS += $(CODE_COVERAGE_CFLAGS)
 AM_CPPFLAGS  = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT
 AM_CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64
 AM_CPPFLAGS += -D_LARGEFILE64_SOURCE -DHAVE_LARGE_STACKS=1
@@ -14,3 +15,4 @@ AM_CPPFLAGS += -DLIBEXECDIR=\"$(libexecdir)\"
 AM_CPPFLAGS += -DRUNSTATEDIR=\"$(runstatedir)\"
 AM_CPPFLAGS += -DSBINDIR=\"$(sbindir)\"
 AM_CPPFLAGS += -DSYSCONFDIR=\"$(sysconfdir)\"
 +AM_CPPFLAGS += $(CODE_COVERAGE_CPPFLAGS)
 diff --git a/config/ax_code_coverage.m4 b/config/ax_code_coverage.m4
 new file mode 100644
 index 000000000..6484f0332
 --- /dev/null
 +++ b/config/ax_code_coverage.m4
@@ -0,0 +1,264 @@
 +# ===========================================================================
 +#     https://www.gnu.org/software/autoconf-archive/ax_code_coverage.html
 +# ===========================================================================
 +#
 +# SYNOPSIS
 +#
 +#   AX_CODE_COVERAGE()
 +#
 +# DESCRIPTION
 +#
 +#   Defines CODE_COVERAGE_CPPFLAGS, CODE_COVERAGE_CFLAGS,
 +#   CODE_COVERAGE_CXXFLAGS and CODE_COVERAGE_LIBS which should be included
 +#   in the CPPFLAGS, CFLAGS CXXFLAGS and LIBS/LIBADD variables of every
 +#   build target (program or library) which should be built with code
 +#   coverage support. Also defines CODE_COVERAGE_RULES which should be
 +#   substituted in your Makefile; and $enable_code_coverage which can be
 +#   used in subsequent configure output. CODE_COVERAGE_ENABLED is defined
 +#   and substituted, and corresponds to the value of the
 +#   --enable-code-coverage option, which defaults to being disabled.
 +#
 +#   Test also for gcov program and create GCOV variable that could be
 +#   substituted.
 +#
 +#   Note that all optimization flags in CFLAGS must be disabled when code
 +#   coverage is enabled.
 +#
 +#   Usage example:
 +#
 +#   configure.ac:
 +#
 +#     AX_CODE_COVERAGE
 +#
 +#   Makefile.am:
 +#
 +#     @CODE_COVERAGE_RULES@
 +#     my_program_LIBS = ... $(CODE_COVERAGE_LIBS) ...
 +#     my_program_CPPFLAGS = ... $(CODE_COVERAGE_CPPFLAGS) ...
 +#     my_program_CFLAGS = ... $(CODE_COVERAGE_CFLAGS) ...
 +#     my_program_CXXFLAGS = ... $(CODE_COVERAGE_CXXFLAGS) ...
 +#
 +#   This results in a "check-code-coverage" rule being added to any
 +#   Makefile.am which includes "@CODE_COVERAGE_RULES@" (assuming the module
 +#   has been configured with --enable-code-coverage). Running `make
 +#   check-code-coverage` in that directory will run the module's test suite
 +#   (`make check`) and build a code coverage report detailing the code which
 +#   was touched, then print the URI for the report.
 +#
 +#   In earlier versions of this macro, CODE_COVERAGE_LDFLAGS was defined
 +#   instead of CODE_COVERAGE_LIBS. They are both still defined, but use of
 +#   CODE_COVERAGE_LIBS is preferred for clarity; CODE_COVERAGE_LDFLAGS is
 +#   deprecated. They have the same value.
 +#
 +#   This code was derived from Makefile.decl in GLib, originally licenced
 +#   under LGPLv2.1+.
 +#
 +# LICENSE
 +#
 +#   Copyright (c) 2012, 2016 Philip Withnall
 +#   Copyright (c) 2012 Xan Lopez
 +#   Copyright (c) 2012 Christian Persch
 +#   Copyright (c) 2012 Paolo Borelli
 +#   Copyright (c) 2012 Dan Winship
 +#   Copyright (c) 2015 Bastien ROUCARIES
 +#
 +#   This library is free software; you can redistribute it and/or modify it
 +#   under the terms of the GNU Lesser General Public License as published by
 +#   the Free Software Foundation; either version 2.1 of the License, or (at
 +#   your option) any later version.
 +#
 +#   This library is distributed in the hope that it will be useful, but
 +#   WITHOUT ANY WARRANTY; without even the implied warranty of
 +#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
 +#   General Public License for more details.
 +#
 +#   You should have received a copy of the GNU Lesser General Public License
 +#   along with this program. If not, see <https://www.gnu.org/licenses/>.
 +
 +#serial 25
 +
 +AC_DEFUN([AX_CODE_COVERAGE],[
 +	dnl Check for --enable-code-coverage
 +	AC_REQUIRE([AC_PROG_SED])
 +
 +	# allow to override gcov location
 +	AC_ARG_WITH([gcov],
 +	  [AS_HELP_STRING([--with-gcov[=GCOV]], [use given GCOV for coverage (GCOV=gcov).])],
 +	  [_AX_CODE_COVERAGE_GCOV_PROG_WITH=$with_gcov],
 +	  [_AX_CODE_COVERAGE_GCOV_PROG_WITH=gcov])
 +
 +	AC_MSG_CHECKING([whether to build with code coverage support])
 +	AC_ARG_ENABLE([code-coverage],
 +	  AS_HELP_STRING([--enable-code-coverage],
 +	  [Whether to enable code coverage support]),,
 +	  enable_code_coverage=no)
 +
 +	AM_CONDITIONAL([CODE_COVERAGE_ENABLED], [test x$enable_code_coverage = xyes])
 +	AC_SUBST([CODE_COVERAGE_ENABLED], [$enable_code_coverage])
 +	AC_MSG_RESULT($enable_code_coverage)
 +
 +	AS_IF([ test "$enable_code_coverage" = "yes" ], [
 +		# check for gcov
 +		AC_CHECK_TOOL([GCOV],
 +		  [$_AX_CODE_COVERAGE_GCOV_PROG_WITH],
 +		  [:])
 +		AS_IF([test "X$GCOV" = "X:"],
 +		  [AC_MSG_ERROR([gcov is needed to do coverage])])
 +		AC_SUBST([GCOV])
 +
 +		dnl Check if gcc is being used
 +		AS_IF([ test "$GCC" = "no" ], [
 +			AC_MSG_ERROR([not compiling with gcc, which is required for gcov code coverage])
 +		])
 +
 +		AC_CHECK_PROG([LCOV], [lcov], [lcov])
 +		AC_CHECK_PROG([GENHTML], [genhtml], [genhtml])
 +
 +		AS_IF([ test -z "$LCOV" ], [
 +			AC_MSG_ERROR([To enable code coverage reporting you must have lcov installed])
 +		])
 +
 +		AS_IF([ test -z "$GENHTML" ], [
 +			AC_MSG_ERROR([Could not find genhtml from the lcov package])
 +		])
 +
 +		dnl Build the code coverage flags
 +		dnl Define CODE_COVERAGE_LDFLAGS for backwards compatibility
 +		CODE_COVERAGE_CPPFLAGS="-DNDEBUG"
 +		CODE_COVERAGE_CFLAGS="-O0 -g -fprofile-arcs -ftest-coverage"
 +		CODE_COVERAGE_CXXFLAGS="-O0 -g -fprofile-arcs -ftest-coverage"
 +		CODE_COVERAGE_LIBS="-lgcov"
 +		CODE_COVERAGE_LDFLAGS="$CODE_COVERAGE_LIBS"
 +
 +		AC_SUBST([CODE_COVERAGE_CPPFLAGS])
 +		AC_SUBST([CODE_COVERAGE_CFLAGS])
 +		AC_SUBST([CODE_COVERAGE_CXXFLAGS])
 +		AC_SUBST([CODE_COVERAGE_LIBS])
 +		AC_SUBST([CODE_COVERAGE_LDFLAGS])
 +
 +		[CODE_COVERAGE_RULES_CHECK='
 +	-$(A''M_V_at)$(MAKE) $(AM_MAKEFLAGS) -k check
 +	$(A''M_V_at)$(MAKE) $(AM_MAKEFLAGS) code-coverage-capture
 +']
 +		[CODE_COVERAGE_RULES_CAPTURE='
 +	$(code_coverage_v_lcov_cap)$(LCOV) $(code_coverage_quiet) $(addprefix --directory ,$(CODE_COVERAGE_DIRECTORY)) --capture --output-file "$(CODE_COVERAGE_OUTPUT_FILE).tmp" --test-name "$(call code_coverage_sanitize,$(PACKAGE_NAME)-$(PACKAGE_VERSION))" --no-checksum --compat-libtool $(CODE_COVERAGE_LCOV_SHOPTS) $(CODE_COVERAGE_LCOV_OPTIONS)
 +	$(code_coverage_v_lcov_ign)$(LCOV) $(code_coverage_quiet) $(addprefix --directory ,$(CODE_COVERAGE_DIRECTORY)) --remove "$(CODE_COVERAGE_OUTPUT_FILE).tmp" "/tmp/*" $(CODE_COVERAGE_IGNORE_PATTERN) --output-file "$(CODE_COVERAGE_OUTPUT_FILE)" $(CODE_COVERAGE_LCOV_SHOPTS) $(CODE_COVERAGE_LCOV_RMOPTS)
 +	-@rm -f $(CODE_COVERAGE_OUTPUT_FILE).tmp
 +	$(code_coverage_v_genhtml)LANG=C $(GENHTML) $(code_coverage_quiet) $(addprefix --prefix ,$(CODE_COVERAGE_DIRECTORY)) --output-directory "$(CODE_COVERAGE_OUTPUT_DIRECTORY)" --title "$(PACKAGE_NAME)-$(PACKAGE_VERSION) Code Coverage" --legend --show-details "$(CODE_COVERAGE_OUTPUT_FILE)" $(CODE_COVERAGE_GENHTML_OPTIONS)
 +	@echo "file://$(abs_builddir)/$(CODE_COVERAGE_OUTPUT_DIRECTORY)/index.html"
 +']
 +		[CODE_COVERAGE_RULES_CLEAN='
 +clean: code-coverage-clean
 +distclean: code-coverage-clean
 +code-coverage-clean:
 +	-$(LCOV) --directory $(top_builddir) -z
 +	-rm -rf $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_FILE).tmp $(CODE_COVERAGE_OUTPUT_DIRECTORY)
 +	-find . \( -name "*.gcda" -o -name "*.gcno" -o -name "*.gcov" \) -delete
 +']
 +	], [
 +		[CODE_COVERAGE_RULES_CHECK='
 +	@echo "Need to reconfigure with --enable-code-coverage"
 +']
 +		CODE_COVERAGE_RULES_CAPTURE="$CODE_COVERAGE_RULES_CHECK"
 +		CODE_COVERAGE_RULES_CLEAN=''
 +	])
 +
 +[CODE_COVERAGE_RULES='
 +# Code coverage
 +#
 +# Optional:
 +#  - CODE_COVERAGE_DIRECTORY: Top-level directory for code coverage reporting.
 +#    Multiple directories may be specified, separated by whitespace.
 +#    (Default: $(top_builddir))
 +#  - CODE_COVERAGE_OUTPUT_FILE: Filename and path for the .info file generated
 +#    by lcov for code coverage. (Default:
 +#    $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage.info)
 +#  - CODE_COVERAGE_OUTPUT_DIRECTORY: Directory for generated code coverage
 +#    reports to be created. (Default:
 +#    $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage)
 +#  - CODE_COVERAGE_BRANCH_COVERAGE: Set to 1 to enforce branch coverage,
 +#    set to 0 to disable it and leave empty to stay with the default.
 +#    (Default: empty)
 +#  - CODE_COVERAGE_LCOV_SHOPTS_DEFAULT: Extra options shared between both lcov
 +#    instances. (Default: based on $CODE_COVERAGE_BRANCH_COVERAGE)
 +#  - CODE_COVERAGE_LCOV_SHOPTS: Extra options to shared between both lcov
 +#    instances. (Default: $CODE_COVERAGE_LCOV_SHOPTS_DEFAULT)
 +#  - CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH: --gcov-tool pathtogcov
 +#  - CODE_COVERAGE_LCOV_OPTIONS_DEFAULT: Extra options to pass to the
 +#    collecting lcov instance. (Default: $CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH)
 +#  - CODE_COVERAGE_LCOV_OPTIONS: Extra options to pass to the collecting lcov
 +#    instance. (Default: $CODE_COVERAGE_LCOV_OPTIONS_DEFAULT)
 +#  - CODE_COVERAGE_LCOV_RMOPTS_DEFAULT: Extra options to pass to the filtering
 +#    lcov instance. (Default: empty)
 +#  - CODE_COVERAGE_LCOV_RMOPTS: Extra options to pass to the filtering lcov
 +#    instance. (Default: $CODE_COVERAGE_LCOV_RMOPTS_DEFAULT)
 +#  - CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT: Extra options to pass to the
 +#    genhtml instance. (Default: based on $CODE_COVERAGE_BRANCH_COVERAGE)
 +#  - CODE_COVERAGE_GENHTML_OPTIONS: Extra options to pass to the genhtml
 +#    instance. (Default: $CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT)
 +#  - CODE_COVERAGE_IGNORE_PATTERN: Extra glob pattern of files to ignore
 +#
 +# The generated report will be titled using the $(PACKAGE_NAME) and
 +# $(PACKAGE_VERSION). In order to add the current git hash to the title,
 +# use the git-version-gen script, available online.
 +
 +# Optional variables
 +CODE_COVERAGE_DIRECTORY ?= $(top_builddir)
 +CODE_COVERAGE_OUTPUT_FILE ?= $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage.info
 +CODE_COVERAGE_OUTPUT_DIRECTORY ?= $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage
 +CODE_COVERAGE_BRANCH_COVERAGE ?=
 +CODE_COVERAGE_LCOV_SHOPTS_DEFAULT ?= $(if $(CODE_COVERAGE_BRANCH_COVERAGE),\
 +--rc lcov_branch_coverage=$(CODE_COVERAGE_BRANCH_COVERAGE))
 +CODE_COVERAGE_LCOV_SHOPTS ?= $(CODE_COVERAGE_LCOV_SHOPTS_DEFAULT)
 +CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH ?= --gcov-tool "$(GCOV)"
 +CODE_COVERAGE_LCOV_OPTIONS_DEFAULT ?= $(CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH)
 +CODE_COVERAGE_LCOV_OPTIONS ?= $(CODE_COVERAGE_LCOV_OPTIONS_DEFAULT)
 +CODE_COVERAGE_LCOV_RMOPTS_DEFAULT ?=
 +CODE_COVERAGE_LCOV_RMOPTS ?= $(CODE_COVERAGE_LCOV_RMOPTS_DEFAULT)
 +CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT ?=\
 +$(if $(CODE_COVERAGE_BRANCH_COVERAGE),\
 +--rc genhtml_branch_coverage=$(CODE_COVERAGE_BRANCH_COVERAGE))
 +CODE_COVERAGE_GENHTML_OPTIONS ?= $(CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT)
 +CODE_COVERAGE_IGNORE_PATTERN ?=
 +
 +GITIGNOREFILES ?=
 +GITIGNOREFILES += $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_DIRECTORY)
 +
 +code_coverage_v_lcov_cap = $(code_coverage_v_lcov_cap_$(V))
 +code_coverage_v_lcov_cap_ = $(code_coverage_v_lcov_cap_$(AM_DEFAULT_VERBOSITY))
 +code_coverage_v_lcov_cap_0 = @echo "  LCOV   --capture"\
 + $(CODE_COVERAGE_OUTPUT_FILE);
 +code_coverage_v_lcov_ign = $(code_coverage_v_lcov_ign_$(V))
 +code_coverage_v_lcov_ign_ = $(code_coverage_v_lcov_ign_$(AM_DEFAULT_VERBOSITY))
 +code_coverage_v_lcov_ign_0 = @echo "  LCOV   --remove /tmp/*"\
 + $(CODE_COVERAGE_IGNORE_PATTERN);
 +code_coverage_v_genhtml = $(code_coverage_v_genhtml_$(V))
 +code_coverage_v_genhtml_ = $(code_coverage_v_genhtml_$(AM_DEFAULT_VERBOSITY))
 +code_coverage_v_genhtml_0 = @echo "  GEN   " $(CODE_COVERAGE_OUTPUT_DIRECTORY);
 +code_coverage_quiet = $(code_coverage_quiet_$(V))
 +code_coverage_quiet_ = $(code_coverage_quiet_$(AM_DEFAULT_VERBOSITY))
 +code_coverage_quiet_0 = --quiet
 +
 +# sanitizes the test-name: replaces with underscores: dashes and dots
 +code_coverage_sanitize = $(subst -,_,$(subst .,_,$(1)))
 +
 +# Use recursive makes in order to ignore errors during check
 +check-code-coverage:'"$CODE_COVERAGE_RULES_CHECK"'
 +
 +# Capture code coverage data
 +code-coverage-capture: code-coverage-capture-hook'"$CODE_COVERAGE_RULES_CAPTURE"'
 +
 +# Hook rule executed before code-coverage-capture, overridable by the user
 +code-coverage-capture-hook:
 +
 +'"$CODE_COVERAGE_RULES_CLEAN"'
 +
 +A''M_DISTCHECK_CONFIGURE_FLAGS ?=
 +A''M_DISTCHECK_CONFIGURE_FLAGS += --disable-code-coverage
 +
 +.PHONY: check-code-coverage code-coverage-capture code-coverage-capture-hook code-coverage-clean
 +']
 +
 +	AC_SUBST([CODE_COVERAGE_RULES])
 +	m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([CODE_COVERAGE_RULES])])
 +])
 diff --git a/config/zfs-build.m4 b/config/zfs-build.m4
 index c695a882e..17cc80462 100644
 --- a/config/zfs-build.m4
 +++ b/config/zfs-build.m4
@@ -76,37 +76,6 @@ AC_DEFUN([ZFS_AC_DEBUGINFO], [
 	AC_MSG_RESULT([$enable_debuginfo])
 ])
 -AC_DEFUN([ZFS_AC_GCOV_KERNEL], [
 -])
 -
 -AC_DEFUN([ZFS_AC_GCOV_USER], [
 -	DEBUG_CFLAGS="$DEBUG_CFLAGS -fprofile-arcs -ftest-coverage"
 -])
 -
 -AC_DEFUN([ZFS_AC_GCOV], [
 -	AC_MSG_CHECKING([whether gcov profiling will be enabled])
 -	AC_ARG_ENABLE([gcov],
 -		[AS_HELP_STRING([--enable-gcov],
 -		[Enable gcov profiling @<:@default=no@:>@])],
 -		[],
 -		[enable_gcov=no])
 -
 -	AS_CASE(["x$enable_gcov"],
 -		["xyes"],
 -		[ZFS_AC_GCOV_KERNEL
 -		ZFS_AC_GCOV_USER],
 -		["xkernel"],
 -		[ZFS_AC_GCOV_KERNEL],
 -		["xuser"],
 -		[ZFS_AC_GCOV_USER],
 -		["xno"],
 -		[],
 -		[AC_MSG_ERROR([Unknown option $enable_gcov])])
 -
 -	AC_SUBST(DEBUG_CFLAGS)
 -	AC_MSG_RESULT([$enable_gcov])
 -])
 -
 AC_DEFUN([ZFS_AC_CONFIG_ALWAYS], [
 	ZFS_AC_CONFIG_ALWAYS_NO_UNUSED_BUT_SET_VARIABLE
 	ZFS_AC_CONFIG_ALWAYS_NO_BOOL_COMPARE
 -- 
 2.14.2
@@ -0,0 +1,97 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Brian Behlendorf <behlendorf1@llnl.gov>
 Date: Fri, 22 Sep 2017 18:54:34 -0700
 Subject: [PATCH] Update codecov.yml
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 Update the codecov.yml to make the following functional changes.
 * Do not require the CI testing to pass before posting results.
 * Set red-yellow-green coverage percent from 50%-100%
 * Allow a 1% drop in coverage to still be considered a pass.
 * Reduce the size of the comment posted to the issue.
 Additionally, the top level README.markdown has been updated
 to include the codecov.io badge and the project summary reworded.
 Reviewed-by: Prakash Surya <prakash.surya@delphix.com>
 Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Closes #6669
 (cherry picked from commit 3790bfa80f9b26fd750b4a554c5707b9d380aac4)
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 ---
 README.markdown     | 12 ++++++------
 .github/codecov.yml | 31 ++++++++++++++++++++++++++-----
 2 files changed, 32 insertions(+), 11 deletions(-)
 diff --git a/README.markdown b/README.markdown
 index fd2ca8c86..1c305b35d 100644
 --- a/README.markdown
 +++ b/README.markdown
@@ -1,9 +1,9 @@
 -<p align="center"><img src="http://zfsonlinux.org/images/zfs-linux.png"/></p>
 -ZFS is an advanced file system and volume manager which was originally
 -developed for Solaris and is now maintained by the Illumos community.
 +![img](http://zfsonlinux.org/images/zfs-linux.png)
 -ZFS on Linux, which is also known as ZoL, is currently feature complete.  It
 -includes fully functional and stable SPA, DMU, ZVOL, and ZPL layers. And it's native!
 +ZFS on Linux is an advanced file system and volume manager which was originally
 +developed for Solaris and is now maintained by the OpenZFS community.
 +
 +[![codecov](https://codecov.io/gh/zfsonlinux/zfs/branch/master/graph/badge.svg)](https://codecov.io/gh/zfsonlinux/zfs)
 # Official Resources
   * [Site](http://zfsonlinux.org)
@@ -16,4 +16,4 @@ Full documentation for installing ZoL on your favorite Linux distribution can
 be found at [our site](http://zfsonlinux.org/).
 # Contribute & Develop
 -We have a separate document with [contribution guidelines](./.github/CONTRIBUTING.md).
 \ No newline at end of file
 +We have a separate document with [contribution guidelines](./.github/CONTRIBUTING.md).
 diff --git a/.github/codecov.yml b/.github/codecov.yml
 index f36be39cb..e74c59a0f 100644
 --- a/.github/codecov.yml
 +++ b/.github/codecov.yml
@@ -1,9 +1,30 @@
 codecov:
 -  strict_yaml_branch: master # only use the latest copy on master branch
 -
 -comment: off
 +  notify:
 +    require_ci_to_pass: no
 coverage:
 +  precision: 2
 +  round: down
 +  range: "50...100"
 +
   status:
 -    project: off
 -    patch: off
 +    project:
 +      default:
 +        threshold: 1%
 +
 +    patch:
 +      default:
 +        threshold: 1%
 +
 +parsers:
 +  gcov:
 +    branch_detection:
 +      conditional: yes
 +      loop: yes
 +      method: no
 +      macro: no
 +
 +comment:
 +  layout: "header, sunburst, diff"
 +  behavior: default
 +  require_changes: no
 -- 
 2.14.2
@@ -0,0 +1,35 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Brian Behlendorf <behlendorf1@llnl.gov>
 Date: Fri, 22 Sep 2017 22:16:18 -0700
 Subject: [PATCH] Fix "--enable-code-coverage" debug build
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 When --enable-code-coverage is provided it should not result
 in NDEBUG being defined.  This is controlled by --enable-debug.
 Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Closes #6674
 (cherry picked from commit 6897ea475fd0c82a74edacf374d4e339f9a9b86b)
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 ---
 config/ax_code_coverage.m4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/config/ax_code_coverage.m4 b/config/ax_code_coverage.m4
 index 6484f0332..4417d4444 100644
 --- a/config/ax_code_coverage.m4
 +++ b/config/ax_code_coverage.m4
@@ -124,7 +124,7 @@ AC_DEFUN([AX_CODE_COVERAGE],[
 		dnl Build the code coverage flags
 		dnl Define CODE_COVERAGE_LDFLAGS for backwards compatibility
 -		CODE_COVERAGE_CPPFLAGS="-DNDEBUG"
 +		CODE_COVERAGE_CPPFLAGS=""
 		CODE_COVERAGE_CFLAGS="-O0 -g -fprofile-arcs -ftest-coverage"
 		CODE_COVERAGE_CXXFLAGS="-O0 -g -fprofile-arcs -ftest-coverage"
 		CODE_COVERAGE_LIBS="-lgcov"
 -- 
 2.14.2
@@ -0,0 +1,153 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Brian Behlendorf <behlendorf1@llnl.gov>
 Date: Thu, 19 Oct 2017 10:06:55 -0700
 Subject: [PATCH] Remove vn_rename and vn_remove dependency
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 The only place vn_rename and vn_remove are used is when writing
 out an updated pool configuration file.  By truncating the file
 instead of renaming and removing it we can avoid having to implement
 these interfaces entirely.  Functionally an empty cache file is
 treated the same as a missing cache file.  This is particularly
 advantageous because the Linux kernel has never provided a way
 to reliably implement vn_rename and vn_remove.
 The cachefile_004_pos.ksh test case was updated to understand
 that an empty cache file is the same as a missing one.
 The zfs-import-* systemd service files were not updated to use
 ConditionFileNotEmpty in place of ConditionPathExists.  This
 means that after exporting all pools and rebooting new pools
 will not the scanned for on the next boot.  This small change
 should not impact normal usage since pools are not exported
 as part of a normal shutdown.
 Documentation was updated accordingly.
 Reviewed-by: George Melikov <mail@gmelikov.ru>
 Reviewed-by: Arkadiusz Bubała <arkadiusz.bubala@open-e.com>
 Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Closes zfsonlinux/spl#648
 Closes #6753
 (cherry picked from commit 5d62588032aa1d13d7f789cf564a0d20c77a5762)
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 ---
 module/zfs/spa_config.c                            | 34 ++++++++++++++++++----
 man/man8/zpool.8                                   |  2 +-
 .../functional/cachefile/cachefile_004_pos.ksh     |  6 ++--
 3 files changed, 32 insertions(+), 10 deletions(-)
 diff --git a/module/zfs/spa_config.c b/module/zfs/spa_config.c
 index 5b792b868..fea239014 100644
 --- a/module/zfs/spa_config.c
 +++ b/module/zfs/spa_config.c
@@ -147,6 +147,26 @@ out:
 	kobj_close_file(file);
 }
 +static int
 +spa_config_remove(spa_config_dirent_t *dp)
 +{
 +#if defined(__linux__) && defined(_KERNEL)
 +	int error, flags = FWRITE | FTRUNC;
 +	uio_seg_t seg = UIO_SYSSPACE;
 +	vnode_t *vp;
 +
 +	error = vn_open(dp->scd_path, seg, flags, 0644, &vp, 0, 0);
 +	if (error == 0) {
 +		(void) VOP_FSYNC(vp, FSYNC, kcred, NULL);
 +		(void) VOP_CLOSE(vp, 0, 1, 0, kcred, NULL);
 +	}
 +
 +	return (error);
 +#else
 +	return (vn_remove(dp->scd_path, UIO_SYSSPACE, RMFILE));
 +#endif
 +}
 +
 static int
 spa_config_write(spa_config_dirent_t *dp, nvlist_t *nvl)
 {
@@ -161,7 +181,10 @@ spa_config_write(spa_config_dirent_t *dp, nvlist_t *nvl)
 	 * If the nvlist is empty (NULL), then remove the old cachefile.
 	 */
 	if (nvl == NULL) {
 -		err = vn_remove(dp->scd_path, UIO_SYSSPACE, RMFILE);
 +		err = spa_config_remove(dp);
 +		if (err == ENOENT)
 +			err = 0;
 +
 		return (err);
 	}
@@ -174,9 +197,9 @@ spa_config_write(spa_config_dirent_t *dp, nvlist_t *nvl)
 #if defined(__linux__) && defined(_KERNEL)
 	/*
 	 * Write the configuration to disk.  Due to the complexity involved
 -	 * in performing a rename from within the kernel the file is truncated
 -	 * and overwritten in place.  In the event of an error the file is
 -	 * unlinked to make sure we always have a consistent view of the data.
 +	 * in performing a rename and remove from within the kernel the file
 +	 * is instead truncated and overwritten in place.  This way we always
 +	 * have a consistent view of the data or a zero length file.
 	 */
 	err = vn_open(dp->scd_path, UIO_SYSSPACE, oflags, 0644, &vp, 0, 0);
 	if (err == 0) {
@@ -186,9 +209,8 @@ spa_config_write(spa_config_dirent_t *dp, nvlist_t *nvl)
 			err = VOP_FSYNC(vp, FSYNC, kcred, NULL);
 		(void) VOP_CLOSE(vp, oflags, 1, 0, kcred, NULL);
 -
 		if (err)
 -			(void) vn_remove(dp->scd_path, UIO_SYSSPACE, RMFILE);
 +			(void) spa_config_remove(dp);
 	}
 #else
 	/*
 diff --git a/man/man8/zpool.8 b/man/man8/zpool.8
 index 328ba3dce..22579101a 100644
 --- a/man/man8/zpool.8
 +++ b/man/man8/zpool.8
@@ -655,7 +655,7 @@ Because the kernel destroys and recreates this file when pools are added and
 removed, care should be taken when attempting to access this file.
 When the last pool using a
 .Sy cachefile
 -is exported or destroyed, the file is removed.
 +is exported or destroyed, the file will be empty.
 .It Sy comment Ns = Ns Ar text
 A text string consisting of printable ASCII characters that will be stored
 such that it is available even if the pool becomes faulted.
 diff --git a/tests/zfs-tests/tests/functional/cachefile/cachefile_004_pos.ksh b/tests/zfs-tests/tests/functional/cachefile/cachefile_004_pos.ksh
 index ae54a9365..e0b81e166 100755
 --- a/tests/zfs-tests/tests/functional/cachefile/cachefile_004_pos.ksh
 +++ b/tests/zfs-tests/tests/functional/cachefile/cachefile_004_pos.ksh
@@ -98,13 +98,13 @@ log_must zpool set cachefile=$CPATH2 $TESTPOOL1
 log_must pool_in_cache $TESTPOOL1 $CPATH2
 log_must zpool set cachefile=$CPATH2 $TESTPOOL2
 log_must pool_in_cache $TESTPOOL2 $CPATH2
 -if [[ -f $CPATH1 ]]; then
 +if [[ -s $CPATH1 ]]; then
 	log_fail "Verify set when cachefile is set on pool."
 fi
 log_must zpool export $TESTPOOL1
 log_must zpool export $TESTPOOL2
 -if [[ -f $CPATH2 ]]; then
 +if [[ -s $CPATH2 ]]; then
 	log_fail "Verify export when cachefile is set on pool."
 fi
@@ -117,7 +117,7 @@ log_must pool_in_cache $TESTPOOL2 $CPATH2
 log_must zpool destroy $TESTPOOL1
 log_must zpool destroy $TESTPOOL2
 -if [[ -f $CPATH2 ]]; then
 +if [[ -s $CPATH2 ]]; then
 	log_fail "Verify destroy when cachefile is set on pool."
 fi
 -- 
 2.14.2
@@ -0,0 +1,102 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: LOLi <loli10K@users.noreply.github.com>
 Date: Sun, 17 Dec 2017 23:08:48 +0100
 Subject: [PATCH] Fix --with-systemd on Debian-based distributions (#6963)
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 These changes propagate the "--with-systemd" configure option to the
 RPM spec file, allowing Debian-based distributions to package
 systemd-related files.
 Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Signed-off-by: loli10K <ezomori.nozomu@gmail.com>
 Closes #6591
 Closes #6963
 (cherry picked from commit 03658d5081c64e14898cc9be45da3305b27fac9e)
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 ---
 rpm/generic/zfs.spec.in |  2 +-
 config/user-systemd.m4  | 20 ++++++++++++++++----
 config/zfs-build.m4     |  2 +-
 3 files changed, 18 insertions(+), 6 deletions(-)
 diff --git a/rpm/generic/zfs.spec.in b/rpm/generic/zfs.spec.in
 index 8df57fa46..4a911b4c2 100644
 --- a/rpm/generic/zfs.spec.in
 +++ b/rpm/generic/zfs.spec.in
@@ -87,11 +87,11 @@ BuildRequires:  libblkid-devel
 BuildRequires:  libudev-devel
 BuildRequires:  libattr-devel
 %endif
 +
 %if 0%{?_systemd}
 Requires(post): systemd
 Requires(preun): systemd
 Requires(postun): systemd
 -BuildRequires: systemd
 %endif
 # The zpool iostat/status -c scripts call some utilities like lsblk and iostat
 diff --git a/config/user-systemd.m4 b/config/user-systemd.m4
 index c2105abce..de2a44f10 100644
 --- a/config/user-systemd.m4
 +++ b/config/user-systemd.m4
@@ -2,7 +2,8 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_SYSTEMD], [
 	AC_ARG_ENABLE(systemd,
 		AC_HELP_STRING([--enable-systemd],
 		[install systemd unit/preset files [[default: yes]]]),
 -		[],enable_systemd=yes)
 +		[enable_systemd=$enableval],
 +		[enable_systemd=check])
 	AC_ARG_WITH(systemdunitdir,
 		AC_HELP_STRING([--with-systemdunitdir=DIR],
@@ -19,16 +20,27 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_SYSTEMD], [
 		[install systemd module load files into dir [[/usr/lib/modules-load.d]]]),
 		systemdmoduleloaddir=$withval,systemdmodulesloaddir=/usr/lib/modules-load.d)
 +	AS_IF([test "x$enable_systemd" = xcheck], [
 +		AS_IF([systemctl --version >/dev/null 2>&1],
 +			[enable_systemd=yes],
 +			[enable_systemd=no])
 +	])
 -	AS_IF([test "x$enable_systemd" = xyes],
 -		[
 +	AC_MSG_CHECKING(for systemd support)
 +	AC_MSG_RESULT([$enable_systemd])
 +
 +	AS_IF([test "x$enable_systemd" = xyes], [
 		ZFS_INIT_SYSTEMD=systemd
 		ZFS_MODULE_LOAD=modules-load.d
 +		DEFINE_SYSTEMD='--with systemd --define "_unitdir $(systemdunitdir)" --define "_presetdir $(systemdpresetdir)"'
 		modulesloaddir=$systemdmodulesloaddir
 -		])
 +	],[
 +		DEFINE_SYSTEMD='--without systemd'
 +	])
 	AC_SUBST(ZFS_INIT_SYSTEMD)
 	AC_SUBST(ZFS_MODULE_LOAD)
 +	AC_SUBST(DEFINE_SYSTEMD)
 	AC_SUBST(systemdunitdir)
 	AC_SUBST(systemdpresetdir)
 	AC_SUBST(modulesloaddir)
 diff --git a/config/zfs-build.m4 b/config/zfs-build.m4
 index 17cc80462..5eaa49c87 100644
 --- a/config/zfs-build.m4
 +++ b/config/zfs-build.m4
@@ -160,7 +160,7 @@ AC_DEFUN([ZFS_AC_RPM], [
 	])
 	RPM_DEFINE_COMMON='--define "$(DEBUG_ZFS) 1"'
 -	RPM_DEFINE_UTIL='--define "_dracutdir $(dracutdir)" --define "_udevdir $(udevdir)" --define "_udevruledir $(udevruledir)" --define "_initconfdir $(DEFAULT_INITCONF_DIR)" $(DEFINE_INITRAMFS)'
 +	RPM_DEFINE_UTIL='--define "_dracutdir $(dracutdir)" --define "_udevdir $(udevdir)" --define "_udevruledir $(udevruledir)" --define "_initconfdir $(DEFAULT_INITCONF_DIR)" $(DEFINE_INITRAMFS) $(DEFINE_SYSTEMD)'
 	RPM_DEFINE_KMOD='--define "kernels $(LINUX_VERSION)" --define "require_spldir $(SPL)" --define "require_splobj $(SPL_OBJ)" --define "ksrc $(LINUX)" --define "kobj $(LINUX_OBJ)"'
 	RPM_DEFINE_DKMS=
 -- 
 2.14.2
@@ -0,0 +1,137 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: LOLi <loli10K@users.noreply.github.com>
 Date: Tue, 19 Dec 2017 19:49:33 +0100
 Subject: [PATCH] ZTS: Fix create-o_ashift test case
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 The function that fills the uberblock ring buffer on every device label
 has been reworked to avoid occasional failures caused by a race
 condition that prevents 'zpool sync' from writing some uberblock
 sequentially: this happens when the pool sync ioctl dispatch code calls
 txg_wait_synced() while we're already waiting for a TXG to sync.
 Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Signed-off-by: loli10K <ezomori.nozomu@gmail.com>
 Closes #6924
 Closes #6977
 (cherry picked from commit 6c891ade8bee9c54484d5cf9b939582b7a9b7eeb)
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 ---
 cmd/zdb/zdb.c                                      |  8 ++--
 .../cli_root/zpool_create/create-o_ashift.ksh      | 47 ++++++++++------------
 2 files changed, 26 insertions(+), 29 deletions(-)
 diff --git a/cmd/zdb/zdb.c b/cmd/zdb/zdb.c
 index 1097501e8..442685486 100644
 --- a/cmd/zdb/zdb.c
 +++ b/cmd/zdb/zdb.c
@@ -2716,10 +2716,6 @@ dump_label(const char *dev)
 		exit(1);
 	}
 -	if (ioctl(fd, BLKFLSBUF) != 0)
 -		(void) printf("failed to invalidate cache '%s' : %s\n", path,
 -		    strerror(errno));
 -
 	if (fstat64_blk(fd, &statbuf) != 0) {
 		(void) printf("failed to stat '%s': %s\n", path,
 		    strerror(errno));
@@ -2727,6 +2723,10 @@ dump_label(const char *dev)
 		exit(1);
 	}
 +	if (S_ISBLK(statbuf.st_mode) && ioctl(fd, BLKFLSBUF) != 0)
 +		(void) printf("failed to invalidate cache '%s' : %s\n", path,
 +		    strerror(errno));
 +
 	avl_create(&config_tree, cksum_record_compare,
 	    sizeof (cksum_record_t), offsetof(cksum_record_t, link));
 	avl_create(&uberblock_tree, cksum_record_compare,
 diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_create/create-o_ashift.ksh b/tests/zfs-tests/tests/functional/cli_root/zpool_create/create-o_ashift.ksh
 index 6449c8a91..6a9c3e28c 100755
 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_create/create-o_ashift.ksh
 +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_create/create-o_ashift.ksh
@@ -44,47 +44,45 @@ verify_runnable "global"
 function cleanup
 {
 -	poolexists $TESTPOOL && destroy_pool $TESTPOOL
 +	destroy_pool $TESTPOOL
 	log_must rm -f $disk
 }
 #
 -# Commit the specified number of TXGs to the provided pool
 -# We use 'zpool sync' here because we can't force it via sync(1) like on illumos
 -# $1 pool name
 -# $2 number of txg syncs
 +# Fill the uberblock ring in every <device> label: we do this by committing
 +# TXGs to the provided <pool> until every slot contains a valid uberblock.
 +# NOTE: We use 'zpool sync' here because we can't force it via sync(1) like on
 +# illumos
 #
 -function txg_sync
 +function write_device_uberblocks # <device> <pool>
 {
 -	typeset pool=$1
 -	typeset -i count=$2
 -	typeset -i i=0;
 +	typeset device=$1
 +	typeset pool=$2
 -	while [ $i -lt $count ]
 +	while [ "$(zdb -quuul $device | grep -c 'invalid')" -ne 0 ]
 	do
 -		log_must sync_pool $pool true
 -		((i = i + 1))
 +		sync_pool $pool true
 	done
 }
 #
 -# Verify device $1 labels contains $2 valid uberblocks in every label
 -# $1 device
 -# $2 uberblocks count
 +# Verify every label on <device> contains <count> (valid) uberblocks
 #
 -function verify_device_uberblocks
 +function verify_device_uberblocks # <device> <count>
 {
 	typeset device=$1
 	typeset ubcount=$2
 	zdb -quuul $device | egrep '^(\s+)?Uberblock' |
 -	    egrep -v 'invalid$' | awk \
 -	    -v ubcount=$ubcount '{ uberblocks[$0]++; }
 -	    END { for (i in uberblocks) {
 -		count++;
 -		if (uberblocks[i] != 4) { exit 1; }
 -	    }
 -	    if (count != ubcount) { exit 1; } }'
 +	    awk -v ubcount=$ubcount 'BEGIN { count=0 } { uberblocks[$0]++; }
 +	    END {
 +	        for (i in uberblocks) {
 +	            if (i ~ /invalid/) { continue; }
 +	            if (uberblocks[i] != 4) { exit 1; }
 +	            count++;
 +	        }
 +	        if (count != ubcount) { exit 1; }
 +	    }'
 	return $?
 }
@@ -110,8 +108,7 @@ do
 		log_fail "Pool was created without setting ashift value to "\
 		    "$ashift (current = $pprop)"
 	fi
 -	# force 128 txg sync to fill the uberblock ring
 -	txg_sync $TESTPOOL 128
 +	write_device_uberblocks $disk $TESTPOOL
 	verify_device_uberblocks $disk ${ubcount[$i]}
 	if [[ $? -ne 0 ]]
 	then
 -- 
 2.14.2
@@ -0,0 +1,49 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: "John L. Hammond" <35266395+jhammond-intel@users.noreply.github.com>
 Date: Wed, 17 Jan 2018 14:24:42 -0600
 Subject: [PATCH] Emit an error message before MMP suspends pool
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 In mmp_thread(), emit an MMP specific error message before calling
 zio_suspend() so that the administrator will understand why the pool
 is being suspended.
 Reviewed-by: Olaf Faaland <faaland1@llnl.gov>
 Reviewed-by: Giuseppe Di Natale <dinatale2@llnl.gov>
 Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Signed-off-by: John L. Hammond <john.hammond@intel.com>
 Closes #7048
 (cherry picked from commit ecc972c7f009e1fa75900e276a4c1306c55b5722)
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 ---
 module/zfs/mmp.c | 5 +++++
 1 file changed, 5 insertions(+)
 diff --git a/module/zfs/mmp.c b/module/zfs/mmp.c
 index 6f2aa3f59..e91ae628a 100644
 --- a/module/zfs/mmp.c
 +++ b/module/zfs/mmp.c
@@ -26,6 +26,7 @@
 #include <sys/mmp.h>
 #include <sys/spa.h>
 #include <sys/spa_impl.h>
 +#include <sys/time.h>
 #include <sys/vdev.h>
 #include <sys/vdev_impl.h>
 #include <sys/zfs_context.h>
@@ -428,6 +429,10 @@ mmp_thread(spa_t *spa)
 		 */
 		if (!suspended && mmp_fail_intervals && multihost &&
 		    (start - mmp->mmp_last_write) > max_fail_ns) {
 +			cmn_err(CE_WARN, "MMP writes to pool '%s' have not "
 +			    "succeeded in over %llus; suspending pool",
 +			    spa_name(spa),
 +			    NSEC2SEC(start - mmp->mmp_last_write));
 			zio_suspend(spa, NULL);
 		}
 -- 
 2.14.2
@@ -0,0 +1,85 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: LOLi <loli10K@users.noreply.github.com>
 Date: Fri, 2 Feb 2018 22:50:42 +0100
 Subject: [PATCH] Fix systemd_ RPM macros usage on Debian-based distributions
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 Debian-based distributions do not seem to provide RPM macros for
 dealing with systemd pre- and post- (un)install actions: this results
 in errors when installing or upgrading .deb packages because the
 resulting control scripts contain the following unresolved macros:
 * %systemd_post
 * %systemd_preun
 * %systemd_postun
 Fix this by providing default values for postinstall, preuninstall and
 postuninstall scripts when these macros are not defined.
 Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Reviewed-by: Giuseppe Di Natale <dinatale2@llnl.gov>
 Signed-off-by: loli10K <ezomori.nozomu@gmail.com>
 Closes #7074
 Closes #7100
 (cherry picked from commit 29b79dcfe90a67a919c2f42fbaa2e557ea484bd5)
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 ---
 rpm/generic/zfs.spec.in | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)
 diff --git a/rpm/generic/zfs.spec.in b/rpm/generic/zfs.spec.in
 index 4a911b4c2..ce028794c 100644
 --- a/rpm/generic/zfs.spec.in
 +++ b/rpm/generic/zfs.spec.in
@@ -245,8 +245,15 @@ find %{?buildroot}%{_libdir} -name '*.la' -exec rm -f {} \;
 %post
 %if 0%{?_systemd}
 +%if 0%{?systemd_post:1}
 %systemd_post %{systemd_svcs}
 %else
 +if [ "$1" = "1" -o "$1" = "install" ] ; then
 +    # Initial installation
 +    systemctl preset %{systemd_svcs} >/dev/null || true
 +fi
 +%endif
 +%else
 if [ -x /sbin/chkconfig ]; then
     /sbin/chkconfig --add zfs-import
     /sbin/chkconfig --add zfs-mount
@@ -258,9 +265,17 @@ exit 0
 %preun
 %if 0%{?_systemd}
 +%if 0%{?systemd_preun:1}
 %systemd_preun %{systemd_svcs}
 %else
 -if [ "$1" = "0" ] && [ -x /sbin/chkconfig ]; then
 +if [ "$1" = "0" -o "$1" = "remove" ] ; then
 +    # Package removal, not upgrade
 +    systemctl --no-reload disable %{systemd_svcs} >/dev/null || true
 +    systemctl stop %{systemd_svcs} >/dev/null || true
 +fi
 +%endif
 +%else
 +if [ "$1" = "0" -o "$1" = "remove" ] && [ -x /sbin/chkconfig ]; then
     /sbin/chkconfig --del zfs-import
     /sbin/chkconfig --del zfs-mount
     /sbin/chkconfig --del zfs-share
@@ -271,7 +286,11 @@ exit 0
 %postun
 %if 0%{?_systemd}
 +%if 0%{?systemd_postun:1}
 %systemd_postun %{systemd_svcs}
 +%else
 +systemctl --system daemon-reload >/dev/null || true
 +%endif
 %endif
 %files
 -- 
 2.14.2
@@ -0,0 +1,39 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: wli5 <weigang.li@intel.com>
 Date: Tue, 6 Feb 2018 02:26:27 +0800
 Subject: [PATCH] Bug fix in qat_compress.c for vmalloc addr check
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 Remove the unused vmalloc address check, and function mem_to_page
 will handle the non-vmalloc address when map it to a physical
 address.
 Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Signed-off-by: Weigang Li <weigang.li@intel.com>
 Closes #7125
 (cherry picked from commit 5f38142e7b3a8994afef60faa2e65d72e7993807)
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 ---
 module/zfs/qat_compress.c | 4 ----
 1 file changed, 4 deletions(-)
 diff --git a/module/zfs/qat_compress.c b/module/zfs/qat_compress.c
 index 4d17d7ac9..62655f56d 100644
 --- a/module/zfs/qat_compress.c
 +++ b/module/zfs/qat_compress.c
@@ -364,10 +364,6 @@ qat_compress(qat_compress_dir_t dir, char *src, int src_len,
 	Cpa32U dst_buffer_list_mem_size = sizeof (CpaBufferList) +
 	    (num_dst_buf * sizeof (CpaFlatBuffer));
 -	if (!is_vmalloc_addr(src) || !is_vmalloc_addr(src + src_len - 1) ||
 -	    !is_vmalloc_addr(dst) || !is_vmalloc_addr(dst + dst_len - 1))
 -		return (-1);
 -
 	if (PHYS_CONTIG_ALLOC(&in_pages,
 	    num_src_buf * sizeof (struct page *)) != CPA_STATUS_SUCCESS)
 		goto fail;
 -- 
 2.14.2
@@ -0,0 +1,52 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Brian Behlendorf <behlendorf1@llnl.gov>
 Date: Mon, 5 Feb 2018 20:42:52 -0800
 Subject: [PATCH] Fix default libdir for Debian/Ubuntu
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 The distribution provided architecture specific RPM macro files
 for x86_64 and other architectures on Debian/Ubuntu specify the
 wrong default libdir install location.  When building deb packages
 override _lib with the correct location.
 Reviewed-by: Giuseppe Di Natale <dinatale2@llnl.gov>
 Reviewed-by: loli10K <ezomori.nozomu@gmail.com>
 Reviewed by: George Melikov <mail@gmelikov.ru>
 Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Closes #7083
 Closes #7101
 (cherry picked from commit f1dde3fb20eb27c05b57ad82e0905a587ced8ee8)
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 ---
 config/zfs-build.m4 | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 diff --git a/config/zfs-build.m4 b/config/zfs-build.m4
 index 5eaa49c87..7c19cecd6 100644
 --- a/config/zfs-build.m4
 +++ b/config/zfs-build.m4
@@ -164,6 +164,19 @@ AC_DEFUN([ZFS_AC_RPM], [
 	RPM_DEFINE_KMOD='--define "kernels $(LINUX_VERSION)" --define "require_spldir $(SPL)" --define "require_splobj $(SPL_OBJ)" --define "ksrc $(LINUX)" --define "kobj $(LINUX_OBJ)"'
 	RPM_DEFINE_DKMS=
 +	dnl # Override default lib directory on Debian/Ubuntu systems.  The provided
 +	dnl # /usr/lib/rpm/platform/<arch>/macros files do not specify the correct
 +	dnl # path for multiarch systems as described by the packaging guidelines.
 +	dnl #
 +	dnl # https://wiki.ubuntu.com/MultiarchSpec
 +	dnl # https://wiki.debian.org/Multiarch/Implementation
 +	dnl #
 +	AS_IF([test "$DEFAULT_PACKAGE" = "deb"], [
 +		MULTIARCH_LIBDIR="lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
 +		RPM_DEFINE_UTIL+=' --define "_lib $(MULTIARCH_LIBDIR)"'
 +		AC_SUBST(MULTIARCH_LIBDIR)
 +	])
 +
 	SRPM_DEFINE_COMMON='--define "build_src_rpm 1"'
 	SRPM_DEFINE_UTIL=
 	SRPM_DEFINE_KMOD=
 -- 
 2.14.2
@@ -0,0 +1,71 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Richard Elling <Richard.Elling@RichardElling.com>
 Date: Wed, 7 Feb 2018 11:54:20 -0800
 Subject: [PATCH] Remove deprecated zfs_arc_p_aggressive_disable
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 zfs_arc_p_aggressive_disable is no more. This PR removes docs
 and module parameters for zfs_arc_p_aggressive_disable.
 Reviewed-by: Giuseppe Di Natale <dinatale2@llnl.gov>
 Reviewed by: George Melikov <mail@gmelikov.ru>
 Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Richard Elling <Richard.Elling@RichardElling.com>
 Closes #7135
 (cherry picked from commit a58e1284d8998b0d7e409a6ec009d9d372aad41b)
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 ---
 module/zfs/arc.c                 |  4 ----
 man/man5/zfs-module-parameters.5 | 11 -----------
 2 files changed, 15 deletions(-)
 diff --git a/module/zfs/arc.c b/module/zfs/arc.c
 index 264e67735..9d1d0db1d 100644
 --- a/module/zfs/arc.c
 +++ b/module/zfs/arc.c
@@ -391,7 +391,6 @@ unsigned long zfs_arc_dnode_limit_percent = 10;
  */
 unsigned long zfs_arc_sys_free = 0;
 int zfs_arc_min_prefetch_lifespan = 0;
 -int zfs_arc_p_aggressive_disable = 1;
 int zfs_arc_p_dampener_disable = 1;
 int zfs_arc_meta_prune = 10000;
 int zfs_arc_meta_strategy = ARC_STRATEGY_META_BALANCED;
@@ -7928,9 +7927,6 @@ MODULE_PARM_DESC(zfs_arc_meta_strategy, "Meta reclaim strategy");
 module_param(zfs_arc_grow_retry, int, 0644);
 MODULE_PARM_DESC(zfs_arc_grow_retry, "Seconds before growing arc size");
 -module_param(zfs_arc_p_aggressive_disable, int, 0644);
 -MODULE_PARM_DESC(zfs_arc_p_aggressive_disable, "disable aggressive arc_p grow");
 -
 module_param(zfs_arc_p_dampener_disable, int, 0644);
 MODULE_PARM_DESC(zfs_arc_p_dampener_disable, "disable arc_p adapt dampener");
 diff --git a/man/man5/zfs-module-parameters.5 b/man/man5/zfs-module-parameters.5
 index 19e6becfd..d4daffde6 100644
 --- a/man/man5/zfs-module-parameters.5
 +++ b/man/man5/zfs-module-parameters.5
@@ -674,17 +674,6 @@ max arc_p
 Default value: \fB0\fR.
 .RE
 -.sp
 -.ne 2
 -.na
 -\fBzfs_arc_p_aggressive_disable\fR (int)
 -.ad
 -.RS 12n
 -Disable aggressive arc_p growth
 -.sp
 -Use \fB1\fR for yes (default) and \fB0\fR to disable.
 -.RE
 -
 .sp
 .ne 2
 .na
 -- 
 2.14.2
@@ -0,0 +1,51 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: WHR <msl0000023508@gmail.com>
 Date: Sun, 14 Jan 2018 23:57:54 +0300
 Subject: [PATCH] OpenZFS 8966 - Source file zfs_acl.c, function
 zfs_aclset_common contains a use after end of the lifetime of a local
 variable
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 Authored by: WHR <msl0000023508@gmail.com>
 Reviewed by: Matt Ahrens <mahrens@delphix.com>
 Reviewed by: Andriy Gapon <avg@FreeBSD.org>
 Reviewed by: George Melikov <mail@gmelikov.ru>
 Reviewed by: Brian Behlendorf <behlendorf1@llnl.gov>
 Approved by: Richard Lowe <richlowe@richlowe.net>
 Ported-by: Giuseppe Di Natale <dinatale2@llnl.gov>
 OpenZFS-issue: https://www.illumos.org/issues/8966
 OpenZFS-commit: https://github.com/openzfs/openzfs/commit/c95549fcdc
 Closes #7141
 (cherry picked from commit a196b3bc3dcc14bda32b2fbed40d5e436319aca6)
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 ---
 module/zfs/zfs_acl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/module/zfs/zfs_acl.c b/module/zfs/zfs_acl.c
 index 7ddedeaaf..1fcfca0c7 100644
 --- a/module/zfs/zfs_acl.c
 +++ b/module/zfs/zfs_acl.c
@@ -1323,6 +1323,7 @@ zfs_aclset_common(znode_t *zp, zfs_acl_t *aclp, cred_t *cr, dmu_tx_t *tx)
 	sa_bulk_attr_t		bulk[5];
 	uint64_t		ctime[2];
 	int			count = 0;
 +	zfs_acl_phys_t		acl_phys;
 	mode = zp->z_mode;
@@ -1369,7 +1370,6 @@ zfs_aclset_common(znode_t *zp, zfs_acl_t *aclp, cred_t *cr, dmu_tx_t *tx)
 	} else { /* Painful legacy way */
 		zfs_acl_node_t *aclnode;
 		uint64_t off = 0;
 -		zfs_acl_phys_t acl_phys;
 		uint64_t aoid;
 		if ((error = sa_lookup(zp->z_sa_hdl, SA_ZPL_ZNODE_ACL(zfsvfs),
 -- 
 2.14.2
@@ -0,0 +1,145 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Brian Behlendorf <behlendorf1@llnl.gov>
 Date: Thu, 8 Feb 2018 14:27:59 -0800
 Subject: [PATCH] Linux 4.16 compat: inode_set_iversion()
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 A new interface was added to manipulate the version field of an
 inode.  Add a inode_set_iversion() wrapper for older kernels and
 use the new interface when available.
 The i_version field was dropped from the trace point due to the
 switch to an atomic64_t i_version type.
 Reviewed-by: Olaf Faaland <faaland1@llnl.gov>
 Reviewed-by: Giuseppe Di Natale <dinatale2@llnl.gov>
 Reviewed-by: Chunwei Chen <david.chen@nutanix.com>
 Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Closes #7148
 (cherry picked from commit 310e63dfd18f59ad583631dfa2f55d40cedf1415)
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 ---
 include/linux/vfs_compat.h          | 14 ++++++++++++++
 include/sys/trace_acl.h             |  6 ++----
 module/zfs/zpl_super.c              |  2 +-
 config/kernel-inode-set-iversion.m4 | 19 +++++++++++++++++++
 config/kernel.m4                    |  1 +
 5 files changed, 37 insertions(+), 5 deletions(-)
 create mode 100644 config/kernel-inode-set-iversion.m4
 diff --git a/include/linux/vfs_compat.h b/include/linux/vfs_compat.h
 index 6111f0afc..f51ff887d 100644
 --- a/include/linux/vfs_compat.h
 +++ b/include/linux/vfs_compat.h
@@ -578,4 +578,18 @@ current_time(struct inode *ip)
 }
 #endif
 +/*
 + * 4.16 API change
 + * Added iversion interface for managing inode version field.
 + */
 +#ifdef HAVE_INODE_SET_IVERSION
 +#include <linux/iversion.h>
 +#else
 +static inline void
 +inode_set_iversion(struct inode *ip, u64 val)
 +{
 +	ip->i_version = val;
 +}
 +#endif
 +
 #endif /* _ZFS_VFS_H */
 diff --git a/include/sys/trace_acl.h b/include/sys/trace_acl.h
 index 1057e560b..610bbe29c 100644
 --- a/include/sys/trace_acl.h
 +++ b/include/sys/trace_acl.h
@@ -68,7 +68,6 @@ DECLARE_EVENT_CLASS(zfs_ace_class,
 	    __field(uint32_t,		i_gid)
 	    __field(unsigned long,	i_ino)
 	    __field(unsigned int,	i_nlink)
 -	    __field(u64,		i_version)
 	    __field(loff_t,		i_size)
 	    __field(unsigned int,	i_blkbits)
 	    __field(unsigned short,	i_bytes)
@@ -103,7 +102,6 @@ DECLARE_EVENT_CLASS(zfs_ace_class,
 	    __entry->i_gid		= KGID_TO_SGID(ZTOI(zn)->i_gid);
 	    __entry->i_ino		= zn->z_inode.i_ino;
 	    __entry->i_nlink		= zn->z_inode.i_nlink;
 -	    __entry->i_version		= zn->z_inode.i_version;
 	    __entry->i_size		= zn->z_inode.i_size;
 	    __entry->i_blkbits		= zn->z_inode.i_blkbits;
 	    __entry->i_bytes		= zn->z_inode.i_bytes;
@@ -121,7 +119,7 @@ DECLARE_EVENT_CLASS(zfs_ace_class,
 	    "mapcnt %llu size %llu pflags %llu "
 	    "sync_cnt %u mode 0x%x is_sa %d "
 	    "is_mapped %d is_ctldir %d is_stale %d inode { "
 -	    "uid %u gid %u ino %lu nlink %u version %llu size %lli "
 +	    "uid %u gid %u ino %lu nlink %u size %lli "
 	    "blkbits %u bytes %u mode 0x%x generation %x } } "
 	    "ace { type %u flags %u access_mask %u } mask_matched %u",
 	    __entry->z_id, __entry->z_unlinked, __entry->z_atime_dirty,
@@ -131,7 +129,7 @@ DECLARE_EVENT_CLASS(zfs_ace_class,
 	    __entry->z_is_sa, __entry->z_is_mapped,
 	    __entry->z_is_ctldir, __entry->z_is_stale, __entry->i_uid,
 	    __entry->i_gid, __entry->i_ino, __entry->i_nlink,
 -	    __entry->i_version, __entry->i_size, __entry->i_blkbits,
 +	    __entry->i_size, __entry->i_blkbits,
 	    __entry->i_bytes, __entry->i_mode, __entry->i_generation,
 	    __entry->z_type, __entry->z_flags, __entry->z_access_mask,
 	    __entry->mask_matched)
 diff --git a/module/zfs/zpl_super.c b/module/zfs/zpl_super.c
 index b6ef60277..25e75a897 100644
 --- a/module/zfs/zpl_super.c
 +++ b/module/zfs/zpl_super.c
@@ -36,7 +36,7 @@ zpl_inode_alloc(struct super_block *sb)
 	struct inode *ip;
 	VERIFY3S(zfs_inode_alloc(sb, &ip), ==, 0);
 -	ip->i_version = 1;
 +	inode_set_iversion(ip, 1);
 	return (ip);
 }
 diff --git a/config/kernel-inode-set-iversion.m4 b/config/kernel-inode-set-iversion.m4
 new file mode 100644
 index 000000000..9a7d7890e
 --- /dev/null
 +++ b/config/kernel-inode-set-iversion.m4
@@ -0,0 +1,19 @@
 +dnl #
 +dnl # 4.16 API change
 +dnl # inode_set_iversion introduced to set i_version
 +dnl #
 +AC_DEFUN([ZFS_AC_KERNEL_INODE_SET_IVERSION], [
 +	AC_MSG_CHECKING([whether inode_set_iversion() exists])
 +	ZFS_LINUX_TRY_COMPILE([
 +		#include <linux/iversion.h>
 +	],[
 +		struct inode inode;
 +		inode_set_iversion(&inode, 1);
 +	],[
 +		AC_MSG_RESULT(yes)
 +		AC_DEFINE(HAVE_INODE_SET_IVERSION, 1,
 +		    [inode_set_iversion() exists])
 +	],[
 +		AC_MSG_RESULT(no)
 +	])
 +])
 diff --git a/config/kernel.m4 b/config/kernel.m4
 index b759ccd39..b83f021e8 100644
 --- a/config/kernel.m4
 +++ b/config/kernel.m4
@@ -65,6 +65,7 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
 	ZFS_AC_KERNEL_INODE_OPERATIONS_SET_ACL
 	ZFS_AC_KERNEL_INODE_OPERATIONS_GETATTR
 	ZFS_AC_KERNEL_INODE_SET_FLAGS
 +	ZFS_AC_KERNEL_INODE_SET_IVERSION
 	ZFS_AC_KERNEL_GET_ACL_HANDLE_CACHE
 	ZFS_AC_KERNEL_SHOW_OPTIONS
 	ZFS_AC_KERNEL_FILE_INODE
 -- 
 2.14.2
@@ -0,0 +1,53 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Brian Behlendorf <behlendorf1@llnl.gov>
 Date: Thu, 8 Feb 2018 14:31:08 -0800
 Subject: [PATCH] Linux 4.11 compat: avoid refcount_t name conflict
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 Related to commit 4859fe796, when directly using the kernel's
 refcount functions in kernel compatibility code do not map
 refcount_t to zfs_refcount_t.  This leads to a type mismatch.
 Longer term we should consider renaming refcount_t to
 zfs_refcount_t in the zfs code base.
 Reviewed-by: Olaf Faaland <faaland1@llnl.gov>
 Reviewed-by: Giuseppe Di Natale <dinatale2@llnl.gov>
 Reviewed-by: Chunwei Chen <david.chen@nutanix.com>
 Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Closes #7148
 (cherry picked from commit 3713b7333532f221733f7b74189d996359ed4311)
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 ---
 include/linux/vfs_compat.h | 6 ++++++
 1 file changed, 6 insertions(+)
 diff --git a/include/linux/vfs_compat.h b/include/linux/vfs_compat.h
 index f51ff887d..7fcf3c055 100644
 --- a/include/linux/vfs_compat.h
 +++ b/include/linux/vfs_compat.h
@@ -272,6 +272,10 @@ 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>
 #if defined(HAVE_POSIX_ACL_RELEASE) && !defined(HAVE_POSIX_ACL_RELEASE_GPL_ONLY)
@@ -397,6 +401,8 @@ 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 */
 /*
 -- 
 2.14.2
@@ -0,0 +1,116 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Chunwei Chen <david.chen@nutanix.com>
 Date: Tue, 30 Jan 2018 13:39:11 -0800
 Subject: [PATCH] Fix zdb -c traverse stop on damaged objset root
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 If a corruption happens to be on a root block of an objset, zdb -c will
 not correctly report the error, and it will not traverse the datasets
 that come after. This is because traverse_visitbp, which does the
 callback and reset error for TRAVERSE_HARD, is skipped when traversing
 zil is failed in traverse_impl.
 Here's example of what 'zdb -eLcc' command looks like on a pool with
 damaged objset root:
 == before patch:
 Traversing all blocks to verify checksums ...
 Error counts:
 	errno  count
 block traversal size 379392 != alloc 33987072 (unreachable 33607680)
 	bp count:             172
 	ganged count:           0
 	bp logical:       1678336      avg:   9757
 	bp physical:       130560      avg:    759     compression:  12.85
 	bp allocated:      379392      avg:   2205     compression:   4.42
 	bp deduped:             0    ref>1:      0   deduplication:   1.00
 	SPA allocated:   33987072     used:  0.80%
 	additional, non-pointer bps of type 0:         71
 	Dittoed blocks on same vdev: 101
 == after patch:
 Traversing all blocks to verify checksums ...
 zdb_blkptr_cb: Got error 52 reading <54, 0, -1, 0>  -- skipping
 Error counts:
 	errno  count
 	   52  1
 block traversal size 33963520 != alloc 33987072 (unreachable 23552)
 	bp count:             447
 	ganged count:           0
 	bp logical:      36093440      avg:  80745
 	bp physical:     33699840      avg:  75391     compression:   1.07
 	bp allocated:    33963520      avg:  75981     compression:   1.06
 	bp deduped:             0    ref>1:      0   deduplication:   1.00
 	SPA allocated:   33987072     used:  0.80%
 	additional, non-pointer bps of type 0:         76
 	Dittoed blocks on same vdev: 115
 ==
 Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Reviewed-by: loli10K <ezomori.nozomu@gmail.com>
 Signed-off-by: Chunwei Chen <david.chen@nutanix.com>
 Closes #7099
 (cherry picked from commit 23227313a2016449176cbfcbae2d4fc463a2bc09)
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 ---
 module/zfs/dmu_traverse.c | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)
 diff --git a/module/zfs/dmu_traverse.c b/module/zfs/dmu_traverse.c
 index c78228d74..b494bef35 100644
 --- a/module/zfs/dmu_traverse.c
 +++ b/module/zfs/dmu_traverse.c
@@ -599,19 +599,27 @@ traverse_impl(spa_t *spa, dsl_dataset_t *ds, uint64_t objset, blkptr_t *rootbp,
 	/* See comment on ZIL traversal in dsl_scan_visitds. */
 	if (ds != NULL && !ds->ds_is_snapshot && !BP_IS_HOLE(rootbp)) {
 +		enum zio_flag zio_flags = ZIO_FLAG_CANFAIL;
 		uint32_t flags = ARC_FLAG_WAIT;
 		objset_phys_t *osp;
 		arc_buf_t *buf;
 -		err = arc_read(NULL, td->td_spa, rootbp,
 -		    arc_getbuf_func, &buf,
 -		    ZIO_PRIORITY_ASYNC_READ, ZIO_FLAG_CANFAIL, &flags, czb);
 -		if (err != 0)
 -			return (err);
 -
 -		osp = buf->b_data;
 -		traverse_zil(td, &osp->os_zil_header);
 -		arc_buf_destroy(buf, &buf);
 +		err = arc_read(NULL, td->td_spa, rootbp, arc_getbuf_func,
 +		    &buf, ZIO_PRIORITY_ASYNC_READ, zio_flags, &flags, czb);
 +		if (err != 0) {
 +			/*
 +			 * If both TRAVERSE_HARD and TRAVERSE_PRE are set,
 +			 * continue to visitbp so that td_func can be called
 +			 * in pre stage, and err will reset to zero.
 +			 */
 +			if (!(td->td_flags & TRAVERSE_HARD) ||
 +			    !(td->td_flags & TRAVERSE_PRE))
 +				return (err);
 +		} else {
 +			osp = buf->b_data;
 +			traverse_zil(td, &osp->os_zil_header);
 +			arc_buf_destroy(buf, &buf);
 +		}
 	}
 	if (!(flags & TRAVERSE_PREFETCH_DATA) ||
 -- 
 2.14.2
@@ -0,0 +1,40 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Chunwei Chen <david.chen@nutanix.com>
 Date: Thu, 1 Feb 2018 15:41:05 -0800
 Subject: [PATCH] Fix zle_decompress out of bound access
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Reviewed-by: loli10K <ezomori.nozomu@gmail.com>
 Signed-off-by: Chunwei Chen <david.chen@nutanix.com>
 Closes #7099
 (cherry picked from commit 5e566c57726226ceeca09b1eb19cb1c373622763)
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 ---
 module/zfs/zle.c | 4 ++++
 1 file changed, 4 insertions(+)
 diff --git a/module/zfs/zle.c b/module/zfs/zle.c
 index 13c5673fb..613607faa 100644
 --- a/module/zfs/zle.c
 +++ b/module/zfs/zle.c
@@ -74,10 +74,14 @@ zle_decompress(void *s_start, void *d_start, size_t s_len, size_t d_len, int n)
 	while (src < s_end && dst < d_end) {
 		int len = 1 + *src++;
 		if (len <= n) {
 +			if (src + len > s_end || dst + len > d_end)
 +				return (-1);
 			while (len-- != 0)
 				*dst++ = *src++;
 		} else {
 			len -= n;
 +			if (dst + len > d_end)
 +				return (-1);
 			while (len-- != 0)
 				*dst++ = 0;
 		}
 -- 
 2.14.2
@@ -0,0 +1,59 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Chunwei Chen <david.chen@nutanix.com>
 Date: Thu, 1 Feb 2018 15:42:41 -0800
 Subject: [PATCH] Fix racy assignment of zcb.zcb_haderrors
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 zcb_haderrors will be modified in zdb_blkptr_done, which is
 asynchronous. So we must move this assignment after zio_wait.
 Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Reviewed-by: loli10K <ezomori.nozomu@gmail.com>
 Signed-off-by: Chunwei Chen <david.chen@nutanix.com>
 Closes #7099
 (cherry picked from commit c797f0898ec11669427e2fc481118bc2e2d8ef3f)
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 ---
 cmd/zdb/zdb.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
 diff --git a/cmd/zdb/zdb.c b/cmd/zdb/zdb.c
 index 442685486..0cc1656a8 100644
 --- a/cmd/zdb/zdb.c
 +++ b/cmd/zdb/zdb.c
@@ -3313,7 +3313,7 @@ dump_block_stats(spa_t *spa)
 	uint64_t norm_alloc, norm_space, total_alloc, total_found;
 	int flags = TRAVERSE_PRE | TRAVERSE_PREFETCH_METADATA | TRAVERSE_HARD;
 	boolean_t leaks = B_FALSE;
 -	int e, c;
 +	int e, c, err;
 	bp_embedded_type_t i;
 	(void) printf("\nTraversing all blocks %s%s%s%s%s...\n\n",
@@ -3354,7 +3354,7 @@ dump_block_stats(spa_t *spa)
 	zcb.zcb_totalasize = metaslab_class_get_alloc(spa_normal_class(spa));
 	zcb.zcb_start = zcb.zcb_lastprint = gethrtime();
 -	zcb.zcb_haderrors |= traverse_pool(spa, 0, flags, zdb_blkptr_cb, &zcb);
 +	err = traverse_pool(spa, 0, flags, zdb_blkptr_cb, &zcb);
 	/*
 	 * If we've traversed the data blocks then we need to wait for those
@@ -3370,6 +3370,12 @@ dump_block_stats(spa_t *spa)
 		}
 	}
 +	/*
 +	 * Done after zio_wait() since zcb_haderrors is modified in
 +	 * zdb_blkptr_done()
 +	 */
 +	zcb.zcb_haderrors |= err;
 +
 	if (zcb.zcb_haderrors) {
 		(void) printf("\nError counts:\n\n");
 		(void) printf("\t%5s  %s\n", "errno", "count");
 -- 
 2.14.2
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
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
Fabian Grünbichler	33edb24418	bump version to 0.6.5.9-pve15~bpo80/-pve8~bpo80	2017-02-07 13:33:33 +01:00
Fabian Grünbichler	2d5ff41105	refresh patches and manage them as rebasing patch queue branch	2017-02-07 13:33:32 +01:00
Fabian Grünbichler	d93bc1b005	update sources to debian/0.6.5.9-1	2017-02-07 13:33:28 +01:00
Fabian Grünbichler	18708aae25	bump zfs version to 0.6.5.8-pve14~bpo80	2017-01-11 09:35:44 +01:00
Fabian Grünbichler	904f90c739	revert python changes these changes are a bit disruptive for a minor version bump, postpone until PVE 5.0 packages + upgrade notes.	2017-01-11 09:34:02 +01:00
Fabian Grünbichler	81f5dae8f7	update zfs source to 0.6.5.8-3	2017-01-11 09:32:25 +01:00
Fabian Grünbichler	7bfc3db5e1	bump zfs version to 0.6.5.8-pve13	2016-10-27 11:26:37 +02:00
Fabian Grünbichler	49f86653f1	fix #1184 : zfs-share.service has wrong path to 'rm' command	2016-10-27 11:25:24 +02:00
Fabian Grünbichler	3474a9b46b	bump version to 0.6.5.8-pve12~bpo80	2016-10-24 13:49:06 +02:00
Fabian Grünbichler	d0b125705d	import with '-d /dev/disk/by-id' in systemd service	2016-10-24 13:48:46 +02:00
Fabian Grünbichler	8a287a137b	bump version to 0.6.5.8-pve11/-pve7	2016-10-20 15:11:32 +02:00
Fabian Grünbichler	00d871a78a	add transitional packages and relations for upgrades	2016-10-20 15:11:32 +02:00
Fabian Grünbichler	23db36409e	switch pkg source to Debian Jessie update to 0.6.5.8 drop unneeded patches refresh no-DKMS and no-dracut patches	2016-10-19 10:48:58 +02:00
Fabian Grünbichler	d72bef5bd3	update make upload target	2016-06-28 09:59:50 +02:00
Fabian Grünbichler	b894a06c2c	bump versions, update changelogs	2016-06-28 09:51:10 +02:00
Fabian Grünbichler	0b15456e05	update zfs/spl source archives	2016-06-28 09:50:45 +02:00
Fabian Grünbichler	2aba4528fd	update to zfs/spl 0.6.5.7 update versioning scheme for backwards compatibility / upgrade paths	2016-06-28 09:48:19 +02:00
Dietmar Maurer	00c2573479	bump spl package version to 0.6.5-pve5~jessie	2016-04-15 11:12:46 +02:00
Dietmar Maurer	531bc89e39	update spl sources	2016-04-15 11:10:47 +02:00
Fabian Grünbichler	de76987c78	Make patches unfuzzy	2016-04-15 11:06:44 +02:00
Fabian Grünbichler	8155ecfe17	Update pkg-spl to jessie/0.6.5.6-3	2016-04-15 11:03:55 +02:00
Dietmar Maurer	c5aee9e4ce	Update to pkg-zfs jessie/0.6.5.6-3	2016-04-12 09:53:56 +02:00
Fabian Grünbichler	03ab644074	Update to pkg-zfs jessie/0.6.5.6-3 drop cherry-pick workarounds drop unneeded/non-upstream pull requests: - #1099: iSCSI support for ZoL - #1476: Change sharesmb to use REGISTRY shares for better control by user/admin - #2790: Rewrite of nfs.c to keep options per host separated. - #3238: Allow "zfs unshare <proto> -a" much like "zfs share <proto> -a" (WIP)	2016-04-12 09:49:28 +02:00
Dietmar Maurer	acef550f8d	update sources to 0.6.5.6	2016-03-30 10:50:40 +02:00
Fabian Grünbichler	c7fd7e24f5	Update to zfs/spl 0.6.5.6	2016-03-30 10:47:25 +02:00
Thomas Lamprecht	d064c14aad	fix cherry-picking relevant 0.6.5.4 changes When cherry-picking range A..B the commit A won't get cherry picked, only the commits after A. To fix that use range A^..B as ^ selects the previous commit. This fixes the build of zfs with linux kernel version 4.4 as one compatibility change commit wasn't included. Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2016-02-04 18:20:51 +01:00
Dietmar Maurer	8d62a89482	update to 0.6.5.4	2016-01-14 11:28:08 +01:00
Dietmar Maurer	5a1f030de3	Prepare to tag zfs-0.6.5.3 So finally this is a full update to 0.6.5.3, but we skipped the sysv init related patch: zfs-import: Perform verbatim import using cache file We use systemd, so those updates are pointless.	2015-11-05 07:22:46 +01:00
Dietmar Maurer	bc3a2de1e1	include important patches from 0.6.5.3	2015-11-04 17:43:26 +01:00
Dietmar Maurer	944a4708cf	update to master/debian/jessie/0.6.5.2-2	2015-10-05 18:00:17 +02:00
Dietmar Maurer	3435683847	do not install sysv init scripts to avoid double startup with systemd	2015-09-29 11:55:27 +02:00
Dietmar Maurer	64d186b910	adopt fix-dh-installinit.patch for latest upstream changes	2015-09-24 13:11:56 +02:00
Dietmar Maurer	eb4bd3cde8	update pkg-zfs to master/debian/jessie/0.6.5.1-4	2015-09-24 12:47:22 +02:00
Dietmar Maurer	c6ed1ff858	update to 0.6.5.1	2015-09-21 10:05:21 +02:00
Dietmar Maurer	20bb0ecfa0	updates from upstream spl: snapshot/debian/jessie/0.6.4-8-8ac6ff zfs: snapshot/debian/jessie/0.6.4-24-6bec43	2015-08-24 06:27:18 +02:00
Dietmar Maurer	1c1a906890	avoid warnings with update-rc.d	2015-07-21 11:48:23 +02:00
Dietmar Maurer	787716f74d	update to update to 0.6.4.2	2015-07-21 11:28:52 +02:00
Dietmar Maurer	46e32ac3b7	fix upload (remove zfs-dbg package)	2015-04-14 10:40:56 +02:00
Dietmar Maurer	f5c66275b3	remove stale patches	2015-04-14 10:37:18 +02:00
Dietmar Maurer	e479455eaf	update to 0.6.4	2015-04-14 10:28:07 +02:00
Dietmar Maurer	10b48f6191	ignore zfs-import-scan errors zpool import return error if we have no zfs pools. We want to ignore that.	2015-03-31 17:54:03 +02:00
Dietmar Maurer	09b78d33bc	bump zfs package version to 0.6.3-pve2~jessie	2015-03-15 15:54:13 +01:00
Dietmar Maurer	2335fd5207	use systemd	2015-03-15 15:52:02 +01:00
Dietmar Maurer	9959b4fc3a	depend on sudo zfs bash completions use sudo	2015-03-02 08:15:34 +01:00
Dietmar Maurer	5ce963e7da	recompile for jessie	2015-02-28 16:27:35 +01:00
		`@@ -1 +0,0 @@`
			`0001-Revert-Remove-etc-hostid-missing-warning.patch`
		`@@ -1,2 +0,0 @@`
			`# Force the inclusion of Busybox in the initramfs.`
			`BUSYBOX=y`
		`@@ -1 +0,0 @@`
			`KERNEL=="zd*" SUBSYSTEM=="block" ACTION=="add\|change" PROGRAM="/lib/udev/zvol_id $tempnode" SYMLINK+="zvol/%c"`