Numerous backports from HEAD: Linux 3.17 support, Gentoo Prefix Support, a Linux 3.12+ shrinker regression fix, send/recv reliability/performance fixes, deadlock fixes, fixes for excessive CPU time in zfs_iput_taskq fix (important for SELinux), fix for xattr=sa corruption, fix for possible space leak during async_destroy, and many more.

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0xBEE84C64

3 files changed, 171 insertions, 15 deletions

diff --git a/sys-fs/zfs-kmod/ChangeLog b/sys-fs/zfs-kmod/ChangeLog
index d6b1c3411d58..b3116d4e43e2 100644
--- a/sys-fs/zfs-kmod/ChangeLog
+++ b/sys-fs/zfs-kmod/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-fs/zfs-kmod
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/ChangeLog,v 1.55 2014/12/01 05:30:02 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/ChangeLog,v 1.56 2014/12/01 07:02:33 ryao Exp $
+
+*zfs-kmod-0.6.3-r1 (01 Dec 2014)
+
+  01 Dec 2014; Richard Yao <ryao@gentoo.org> +zfs-kmod-0.6.3-r1.ebuild:
+  Numerous backports from HEAD: Linux 3.17 support, Gentoo Prefix Support, a
+  Linux 3.12+ shrinker regression fix, send/recv reliability/performance fixes,
+  deadlock fixes, fixes for excessive CPU time in zfs_iput_taskq fix (important
+  for SELinux), fix for xattr=sa corruption, fix for possible space leak during
+  async_destroy, and many more.
 
   01 Dec 2014; Richard Yao <ryao@gentoo.org> zfs-kmod-0.6.3.ebuild,
   zfs-kmod-9999.ebuild:
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 973017f57cb0..e3d24e91127a 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -27,6 +27,7 @@ DIST zfs-0.6.0-rc13.tar.gz 1490582 SHA256 3e689fc0704237c7d755c65e34ed214a262535
 DIST zfs-0.6.0-rc14.tar.gz 1527612 SHA256 5eae8ef790b26e0dd7c801cc0a235a631ad91d67f148a444d912dbeb24b9a12d SHA512 ad38544ced150ce500c78507782e53a8534815b819e5b9aefda6d670fb7905e31a42cdb4d45164700df48673ea7c42bd1d29a60f1f00e25271b3906de9212d15 WHIRLPOOL cfd4de541eb6c18ee4df8950883525d1b1887e0d9c5f840d97353a5d716ed639f1ab3dc0fe4d8368a890564f10053026bcc738b6066c4488647f1b83be54288d
 DIST zfs-0.6.1.tar.gz 1535521 SHA256 42ed127f74af0ecafc14800a5d2b766655f5ea821098aba92446c1c447093fad SHA512 ef583639f15a5b2e4582760bb013ab5091abc15bae17884d811afec707aff337248102a22fb9fb6f62f99cb3477a8ae82edfdcfdfb962276f593173a5dfe5871 WHIRLPOOL a6791fc2d384e03073abc850f99ba761afd18073337264d8a7bc08b4ddc6fff52df5ce11addc9a3ac7cdfdd9ce9bd779208e515cda631ec19de05fbf9f92307b
 DIST zfs-0.6.2.tar.gz 1558656 SHA256 91b844bf7a42df22d7533e8004289270b7859b8fcbca3bff8087a79b131318b4 SHA512 008f9decdea3e92f6d74f5369ec9df5776b15efbb9f2bc01012999b71e1f2bc5b46b310a329b60545907dcc78773ec79eb6d21aca49d911f33299fd0a36e1a4b WHIRLPOOL 587279866b6ffa2bfebc91f00cb28de85f7f186426a0292f44c6cde7ca3a51c1911fc0ee431c25c3ee0866174522f90ce04b54de4aa3dc0829ba3a719e47af58
+DIST zfs-0.6.3-patches-r1.tar.xz 87852 SHA256 71b5286f77cb6a6c2b97cee406dfd4788f7b40b6675c4a56fc630a47e90d5280 SHA512 e2fa573c7b30a3811e9e1596d35b65f5d013ed5bac43e364b44ffab734398a3294979c152a80ec9a722611cc7c971aec217d8e1a37cc9240a3fa2dddb5b90e3b WHIRLPOOL f2da02d5c7d2385e7de1e858c31d299632ca864d422f0c94e5d3b8674d24beeb073ad2600698350306a9e70dbeef390f0e513d19c126502fceec18795c203d50
 DIST zfs-0.6.3.tar.gz 1665270 SHA256 00caeae63cc724d3dd741aeb36fd2dc03d2158794bd6a5e925cdc8d7e5d3da8c SHA512 8c7741f5f227eb031d79fe87bf7d60e790a098fa6caede462d556c97d798832f97f5a377cbb74fc99b8d198e5f3cc1a3491f69fcdaa0408933dbadd132013416 WHIRLPOOL db9791da12c441c89667b194154b209f5aa69ea46d5327cfcde0b3a910cf1f0e5ca448909824e45b31252a1907280b711fb6ba04eb313d09de0ffbf5e6e304fe
 DIST zfs-kmod-0.6.2-p2.tar.xz 28636 SHA256 12882463a38a5a57cf2bb3c14c5783f9511f6dc7b163a47575f2f3dcc24f26f6 SHA512 5792660ae8f5013d12e70d608e9cffa92a8c4089a88a5e78728ee88204b3f970d452d5b0b3874e02be49ebbc139e07139be7b5a86ca40bc8b23cb11a7198a9a8 WHIRLPOOL 0e4c57b363cdd3d736efbd1355567b18e22439bd3b20ef40b27f6b97ad4570c7cc99a11b196ac25359d1966c1a70e178f4fd1687b60450f148ccda47b07282a9
 DIST zfs-kmod-0.6.2-p3.tar.xz 45988 SHA256 4af06d1472f5d24e01d147b6fec5c78fbbd9739d1259bd3fbf57af66c99b9bcb SHA512 eddf67c0aa49d42f663f98dc721bac75e8d0521df5ae174cd6aeee0a935a71b49e06961404eb6c71a09cd239358868a2fe49de4f1d26776948f8fe7fc943165c WHIRLPOOL 5634a92f6f322f67edef95ad121b0b1699e520ca8beb05b3385dc7e20198dd45d337731bf7df69d1b1c552ed0b78d54b15bc9c9e76b694ae4c8d360892b9d764
@@ -37,24 +38,25 @@ EBUILD zfs-kmod-0.6.1-r2.ebuild 4247 SHA256 99332fddd683857632399b83bda56e2018da
 EBUILD zfs-kmod-0.6.2-r3.ebuild 3414 SHA256 9c26a3f82a0002084d4b96082cc589eb52046e6793691f07ca9d6651e9a0b5aa SHA512 1431b2204e791e71dc75ff6929deedf0201858a428b1008397ccaf329d09df4dfe32b0a820fd5de2f45b896b3558a6da901b3e7633cc0f78bf3b99cb9d5ccd1c WHIRLPOOL 45bdaf81d82bcfd464171a88e726d8158f31408daa68317b04fc57af896fd729d6505dd6906abbd7c0cced0eaf06d47d3b457b0f6051c3bee25297c7aca97490
 EBUILD zfs-kmod-0.6.2-r4.ebuild 3414 SHA256 abfd3a39d1bafe288474f2fd93191ea5261562d5f9829ec1fa3fa85aab7cc08e SHA512 cfa0ad4bb57d90ed53912736245ec7478d8cead7e943294b862c71191b869b311f1afb252ecdbf98856f65c16738ef65701f542d85eca5988ece486fcb84861b WHIRLPOOL 7ea56465d15cc5d9240cd637c2fad4083f2001fd1163617291d1dc968d43d5630479e3ffdd60db655a66f1441649ba5a1d79b5551dab98d3b70bed41848c0367
 EBUILD zfs-kmod-0.6.2-r5.ebuild 3414 SHA256 e1351abb1a3ac482eee2d253271cb4364462aef43d6135fbc6f61e487d358441 SHA512 586a58fd1b0e6289d9e90ce134a4ea90d7280c2313f8ac0d2d1d8c30d698685ae7c90089671e438a2ce4ddeb9144c2edb73f35014e8f84e693f5524b77dd1d2e WHIRLPOOL 0baa387212abba6fb03770f4a4d9cd299171b0420a6fdac107aee76033fa3a0de928c2ade5cf16a09b480df2b3fdd4f46dc0ccf5bb8e0c767fb21e4a6cdbefd4
+EBUILD zfs-kmod-0.6.3-r1.ebuild 3887 SHA256 50939e69b08563e63110a77381cf85f92f7f9b3e3c8d1a647beeb16dfd823d67 SHA512 3324b67e80cc8e659ea4cbcb91b6d48e0ceafd20750c1f9fc2ad2700be6a5a439e526bb7b672ccf04b8889459952a953f3f8bf09068e9ea63b2233a0d4005e27 WHIRLPOOL e991bcdd73c74308e7062ae3f13e0dab2674767123c2066cb14f21506f11f7135942e3c8cfc10b38686c47d6b0b0e3a31a3d2cebd3dfeb58f2c57e4611824723
 EBUILD zfs-kmod-0.6.3.ebuild 3734 SHA256 58d2c0a1e46649cec42a0f225dde78e7666f3659170265353bce47ea6ff86fe9 SHA512 ad1ef62bf16d61a55a8cc9672ab6b3baa3f74ca68579b1458a4e0b1858b3e29d371e5289fa21443dca6305d2049c0984f63673806969bec256db8b31c56309c0 WHIRLPOOL 391374c76d95bfac3e4117ec5bc44aa13239cae2d6bbf5f8932593324288dd2abfb1cff0e84cf772173bc462fab4829f9e6402542c55a5462f7caef3d11d605b
 EBUILD zfs-kmod-9999.ebuild 3712 SHA256 0ad8ede2c6b11aa023f9cb39166fcccd6b67937568f09bf991e7a33b38a1d45c SHA512 12b53e87f412668df4b0cb3ea803d40a024f6183609ed9c6d6d2cec4325bf982b670ce7c7fb9cd0a1277135fe00132b05e6c2f720bcf2fe51aca48ec0012bf83 WHIRLPOOL 93c4ebc1eddf03ddb37cffa03d708f58f4aae76a4186b3f0422cc9eac0bbd653e92d427ccefbb0a7ab236369f1a38dd6df724c22999be26f2dadf30cbd723dbc
-MISC ChangeLog 15730 SHA256 41227aa4ede8e024dbccf53e2968e930fe791c66012b8b8e177c1a231c5e9320 SHA512 9a04549e9f24ad09955f994391a59242af4a1a370e6351d1b40c2e0d6e0d2f3ff22bb8b6977a9beccb453214473fde1f0cee7eee941b6dc7c3dea5725863bd22 WHIRLPOOL f407c4f08fefbc9b44f408b5130f9b900fa56c82ad6b662ad5fe089439d69825f17c7a21e5808376f19233045fab05e253acd3ddf0667575996a578cd8521dbc
+MISC ChangeLog 16186 SHA256 237f33ee9ffba49466b1819f52cd19c1f36f32e0f153346e7d36f1cc91a14260 SHA512 17e78aa6c0dc7472e03a966b4cf84fb26919216d3cfe570e5ffff225088c2f9173c33bd8acf43c904a4afe248343e2757467c13fcbb468c1024d9b54ff27e563 WHIRLPOOL 2ed380472254292a6b9b0d6bfe2c9ee8f21047c68a82872fafefd8b22cbc54c8c71ef820781f9d3734016f995ae02ca8ff6009861d6f2158e19d27f8db80a0d6
 MISC metadata.xml 346 SHA256 e4506ca3f73e0a7799675ddb48b546ce6e3754e912f77d7d32aefac860b3fb82 SHA512 13885781ec432fcaa913c6365b6101b899ba5cf72573b29eb56a0d567466f15edf43de61fd1cab357149c5ed2b73c8277d69a88589f5f3d8f9ae3ef671f9ad8a WHIRLPOOL 319e314874a770ba6ef2687056bb97d6aaf081b0014cf1f0d08c39d70f24adabd19f0b4b3ce61c00fb72dade7589c9821c4730508967e32ea32a2101f74a35d8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUe/0SAAoJECDuEZm+6Exk3UsP/A/AWH37ObFGECripFsGjkaV
-zX2/vmFKd4hR+96WPx44qressdpw3arCmzpN45kA4ugCacUcWpQsmwBgJdznkH19
-ODdbM+HfPFsCYb3+KYqwPhrOqNa+Ud7WnOlLteasK3GV7P6gTD0bnNc4g6Na4VsM
-cGyln+rovmvMfaYjCX2cLcwk6aUDQuCYUcuXx7a3N0jhwIjbZgLkALpDjpi3fcm3
-act12PnBfvgPHGAztgGhcP9FU+tzmkZNHyAioDXI8xLiQzk2GBJCDjKbzS/HDLR+
-mBvAP+JBd/+Z0o8lt4g5YzzrZz6TbzXf0mgVbYPVSme3ejlEXVCgpyew/5m3iLu4
-1Tp8g0Yd4uCA2xjh2lWtZgFE36DN7cawAyZ10XtHY5Emhufq7Yczdu4hfzX9CIDx
-XtTpBfERIVo3kbrLDnQuD0sQgGT1n3DNejzrDt6KEyn9E7aeCDQTfaJNUV9GB14b
-de7QCa5BOQG5CjiAHH79x/vZ/3dv2BaHl8Kki41fD4GE8MPkcLPv+NWa+xAbz3SR
-/1rAiKP9tzUkiaEXY5qLLxEvVbi9ylHDh+uJPIPy0tB/v25j9aWMOAHmxpYrdM7g
-7n6pec5ygfRM/vUMT/WwQpMQlqn2zObAaMODnp/LbqG2aLHJhc57o9+D/pnGdWw2
-uZ89i1Oa0/9qo/sRVEP9
-=N2Ul
+iQIcBAEBCAAGBQJUfBK5AAoJECDuEZm+6Exk2SoP/iFHEa64PuJx9oIYR4d1tyIW
+GZL+wzm7+8CGdp4oBbE9DyCBdtkoID11ahbtg8X00V2XOWHLNjjKFbsDAaP0zjlz
+lWteh4YmmoYF6yfv2SK0ys1WpBqXug6Bj+yvdoK7qUTspdI185vYgX4J9JCe0434
+4iItRz1xFdb0bIC+D+FkYUZVl6/4L4E9IU/FtJlC+TuYgMOT6ijhZWqwpu6zxXNR
+eE8LAm/LViOLLa6suPtiY2j+fe7IPZ7eXUnODIiDdWyr+QoFhXVqJQuEnz7R60dn
+TBvCMI/FK5t5YH8BwILr1WxDskwEP4wJ1Opi13FTK1HIo4U/SzJvV02iRDUrERPy
+MBWMgT1JfybKjXFmXUiLwz5eUComxbfAr5c01Pmx82NXshYnwE9wvycK/pJewEJH
+znTj9yKblSqHoGMek1Ia0WWtR5ceoP5JLHeNe14lKs3Y7tfrhWd1NxRQeM2U9Wxx
+wvwV/hVHC01DjoZ+OEQMTLxXdWGCj1VtmkLdV2dbHmr7fXwmZ96W/azKcqhkmWvh
+rvquuWJwqLeTVPgAbqnalvYjm/GJTX7a/1/j0JS1CqSE4o+K0w0bk6MwQZT6D6uG
+zJFkKuJQ8R3IQt+iB7TIj0aY9cn8bbUSw1vt8L8MawW3NC6FTENQ6dRC5Hx3yz+m
+OxIhRVmOQ2ItPzqQB7ER
+=0b7K
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.3-r1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.3-r1.ebuild
new file mode 100644
index 000000000000..3b48f7408b9f
--- /dev/null
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.3-r1.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.3-r1.ebuild,v 1.1 2014/12/01 07:02:33 ryao Exp $
+
+EAPI="4"
+
+AT_M4DIR="config"
+AUTOTOOLS_AUTORECONF="1"
+AUTOTOOLS_IN_SOURCE_BUILD="1"
+
+inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
+
+if [ ${PV} == "9999" ] ; then
+	inherit git-2
+	EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git"
+else
+	inherit eutils versionator
+	SRC_URI="https://github.com/zfsonlinux/zfs/archive/zfs-${PV}.tar.gz
+		http://dev.gentoo.org/~ryao/dist/zfs-${PV}-patches-${PR}.tar.xz"
+	S="${WORKDIR}/zfs-zfs-${PV}"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
+HOMEPAGE="http://zfsonlinux.org/"
+
+LICENSE="CDDL debug? ( GPL-2+ )"
+SLOT="0"
+IUSE="custom-cflags debug +rootfs"
+RESTRICT="debug? ( strip ) test"
+
+DEPEND="
+	=sys-kernel/spl-${PV}*
+	dev-lang/perl
+	virtual/awk
+"
+
+RDEPEND="${DEPEND}
+	!sys-fs/zfs-fuse
+"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	CONFIG_CHECK="!DEBUG_LOCK_ALLOC
+		BLK_DEV_LOOP
+		EFI_PARTITION
+		IOSCHED_NOOP
+		MODULES
+		!PAX_KERNEXEC_PLUGIN_METHOD_OR
+		!PAX_RANDKSTACK
+		!PAX_USERCOPY_SLABS
+		ZLIB_DEFLATE
+		ZLIB_INFLATE
+	"
+
+	use debug && CONFIG_CHECK="${CONFIG_CHECK}
+		FRAME_POINTER
+		DEBUG_INFO
+		!DEBUG_INFO_REDUCED
+	"
+
+	use rootfs && \
+		CONFIG_CHECK="${CONFIG_CHECK}
+			BLK_DEV_INITRD
+			DEVTMPFS
+	"
+
+	kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required"
+
+	[ ${PV} != "9999" ] && \
+		{ kernel_is le 3 17 || die "Linux 3.17 is the latest supported version."; }
+
+	check_extra_config
+}
+
+src_prepare() {
+	if [ ${PV} != "9999" ]
+	then
+		# Apply patch set
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		epatch "${WORKDIR}/zfs-${PV}-patches"
+	fi
+
+	# Remove GPLv2-licensed ZPIOS unless we are debugging
+	use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in"
+
+	# Set module revision number
+	[ ${PV} != "9999" ] && \
+		{ sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; }
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local SPL_PATH="$(basename $(echo "${EROOT}usr/src/spl-"*))"
+	use custom-cflags || strip-flags
+	filter-ldflags -Wl,*
+
+	set_arch_to_kernel
+	local myeconfargs=(${myeconfargs}
+		--bindir="${EPREFIX}/bin"
+		--sbindir="${EPREFIX}/sbin"
+		--with-config=kernel
+		--with-linux="${KV_DIR}"
+		--with-linux-obj="${KV_OUT_DIR}"
+		--with-spl="${EROOT}usr/src/${SPL_PATH}"
+		--with-spl-obj="${EROOT}usr/src/${SPL_PATH}/${KV_FULL}"
+		$(use_enable debug)
+	)
+
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}"
+	dodoc AUTHORS COPYRIGHT DISCLAIMER README.markdown
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	# Remove old modules
+	if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/zfs" ]
+	then
+		ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/zfs"
+		ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/zfs"
+		ewarn "Automatically removing old modules to avoid problems."
+		rm -r "${EROOT}lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules"
+		rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon"
+	fi
+
+	if use x86 || use arm
+	then
+		ewarn "32-bit kernels will likely require increasing vmalloc to"
+		ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
+	fi
+
+	ewarn "This version of ZFSOnLinux includes support for features flags."
+	ewarn "If you upgrade your pools to make use of feature flags, you will lose"
+	ewarn "the ability to import them using older versions of ZFSOnLinux."
+	ewarn "Any new pools will be created with feature flag support and will"
+	ewarn "not be compatible with older versions of ZFSOnLinux. To create a new"
+	ewarn "pool that is backward compatible, use zpool create -o version=28 ..."
+}