Add file name length check omitted by Linux VFS. Backport kernel compatibility fixes to older versions in all situations possible without new patches.

(Portage version: 2.1.11.31/cvs/Linux x86_64, unsigned Manifest commit)

11 files changed, 101 insertions, 398 deletions

diff --git a/sys-fs/zfs-kmod/ChangeLog b/sys-fs/zfs-kmod/ChangeLog
index ebfe6f5acc1f..38513fe84abf 100644
--- a/sys-fs/zfs-kmod/ChangeLog
+++ b/sys-fs/zfs-kmod/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for sys-fs/zfs-kmod
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/ChangeLog,v 1.18 2013/02/06 01:46:26 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/ChangeLog,v 1.19 2013/02/11 23:36:17 ryao Exp $
+
+*zfs-kmod-0.6.0_rc12-r2 (11 Feb 2013)
+*zfs-kmod-0.6.0_rc14-r2 (11 Feb 2013)
+*zfs-kmod-0.6.0_rc10-r1 (11 Feb 2013)
+*zfs-kmod-0.6.0_rc11-r2 (11 Feb 2013)
+*zfs-kmod-0.6.0_rc13-r3 (11 Feb 2013)
+
+  11 Feb 2013; Richard Yao <ryao@gentoo.org>
+  +files/zfs-kmod-0.6.0_rc14-vfs-name-length-compatibility.patch,
+  +zfs-kmod-0.6.0_rc10-r1.ebuild, +zfs-kmod-0.6.0_rc11-r2.ebuild,
+  +zfs-kmod-0.6.0_rc12-r2.ebuild, +zfs-kmod-0.6.0_rc13-r3.ebuild,
+  +zfs-kmod-0.6.0_rc14-r2.ebuild, -zfs-kmod-0.6.0_rc10.ebuild,
+  -zfs-kmod-0.6.0_rc11-r1.ebuild, -zfs-kmod-0.6.0_rc11.ebuild,
+  -zfs-kmod-0.6.0_rc12-r1.ebuild, -zfs-kmod-0.6.0_rc12.ebuild,
+  -zfs-kmod-0.6.0_rc13-r1.ebuild, -zfs-kmod-0.6.0_rc13-r2.ebuild,
+  -zfs-kmod-0.6.0_rc13.ebuild, -zfs-kmod-0.6.0_rc14-r1.ebuild:
+  Add file name length check omitted by Linux VFS. Backport kernel compatibility
+  fixes to older versions in all situations possible without new patches.
 
 *zfs-kmod-0.6.0_rc14-r1 (06 Feb 2013)
 
diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-vfs-name-length-compatibility.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-vfs-name-length-compatibility.patch
new file mode 100644
index 000000000000..5f9f6525e73c
--- /dev/null
+++ b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-vfs-name-length-compatibility.patch
@@ -0,0 +1,36 @@
+From 7f235381a0e501df55ebe2de10b69124e928d175 Mon Sep 17 00:00:00 2001
+From: Brian Behlendorf <behlendorf1@llnl.gov>
+Date: Mon, 11 Feb 2013 12:55:24 -0800
+Subject: [PATCH] Add explicit MAXNAMELEN check
+
+It turns out that the Linux VFS doesn't strictly handle all cases
+where a component path name exceeds MAXNAMELEN.  It does however
+appear to correctly handle MAXPATHLEN for us.
+
+The right way to handle this appears to be to add an explicit
+check to the zpl_lookup() function.  Several in-tree filesystems
+handle this case the same way.
+
+Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
+Issue #1279
+---
+ module/zfs/zpl_inode.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/module/zfs/zpl_inode.c b/module/zfs/zpl_inode.c
+index e406288..8c8ec24 100644
+--- a/module/zfs/zpl_inode.c
++++ b/module/zfs/zpl_inode.c
+@@ -41,6 +41,9 @@
+ 	struct inode *ip;
+ 	int error;
+ 
++	if (dlen(dentry) > ZFS_MAXNAMELEN)
++		return ERR_PTR(-ENAMETOOLONG);
++
+ 	crhold(cr);
+ 	error = -zfs_lookup(dir, dname(dentry), &ip, 0, cr, NULL, NULL);
+ 	ASSERT3S(error, <=, 0);
+-- 
+1.7.10
+
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc10.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc10-r1.ebuild
index f6cf83536912..5c78fbe241c9 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc10.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.0_rc10.ebuild,v 1.7 2013/02/06 01:46:26 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc10-r1.ebuild,v 1.1 2013/02/11 23:36:17 ryao Exp $
 
 EAPI="4"
 
@@ -57,7 +57,7 @@ pkg_setup() {
 	kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required"
 
 	[ ${PV} != "9999" ] && \
-		{ kernel_is le 3 5 || die "Linux 3.5 is the latest supported version."; }
+		{ kernel_is le 3 6 || die "Linux 3.6 is the latest supported version."; }
 
 	check_extra_config
 }
@@ -69,6 +69,20 @@ src_prepare() {
 		epatch "${FILESDIR}/${PN}-0.6.0_rc9-remove-pfmalloc-1-of-3.patch"
 		epatch "${FILESDIR}/${PN}-0.6.0_rc9-remove-pfmalloc-2-of-3.patch"
 		epatch "${FILESDIR}/${PN}-0.6.0_rc9-remove-pfmalloc-3-of-3.patch"
+
+		# Handle missing name length check in Linux VFS
+		epatch "${FILESDIR}/${PN}-0.6.0_rc14-vfs-name-length-compatibility.patch"
+
+		# Linux 3.6 Support
+		epatch "${FILESDIR}/${PN}-0.6.0_rc11-linux-3.6-compat-0-elevator-change.patch"
+		epatch "${FILESDIR}/${PN}-0.6.0_rc11-linux-3.6-compat-1.patch"
+		epatch "${FILESDIR}/${PN}-0.6.0_rc11-linux-3.6-compat-2.patch"
+		epatch "${FILESDIR}/${PN}-0.6.0_rc11-linux-3.6-compat-3.patch"
+		epatch "${FILESDIR}/${PN}-0.6.0_rc11-linux-3.6-compat-4.patch"
+		epatch "${FILESDIR}/${PN}-0.6.0_rc11-linux-3.6-compat-5.patch"
+
+		# Cast constant for 32-bit compatibility
+		epatch "${FILESDIR}/${PN}-0.6.0_rc14-cast-const-for-32bit-compatibility.patch"
 	fi
 
 	autotools-utils_src_prepare
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc11-r1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc11-r2.ebuild
index 3911ca9c4ed8..ec90268b29d4 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc11-r1.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc11-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.0_rc11-r1.ebuild,v 1.3 2013/02/06 01:46:26 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc11-r2.ebuild,v 1.1 2013/02/11 23:36:17 ryao Exp $
 
 EAPI="4"
 
@@ -78,6 +78,12 @@ src_prepare() {
 		epatch "${FILESDIR}/${P}-linux-3.6-compat-3.patch"
 		epatch "${FILESDIR}/${P}-linux-3.6-compat-4.patch"
 		epatch "${FILESDIR}/${P}-linux-3.6-compat-5.patch"
+
+		# Cast constant for 32-bit compatibility
+		epatch "${FILESDIR}/${PN}-0.6.0_rc14-cast-const-for-32bit-compatibility.patch"
+
+		# Handle missing name length check in Linux VFS
+		epatch "${FILESDIR}/${PN}-0.6.0_rc14-vfs-name-length-compatibility.patch"
 	fi
 
 	autotools-utils_src_prepare
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc11.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc11.ebuild
deleted file mode 100644
index 3369d4e9cd68..000000000000
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc11.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2013 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.0_rc11.ebuild,v 1.3 2013/02/06 01:46:26 ryao Exp $
-
-EAPI="4"
-
-AT_M4DIR="config"
-AUTOTOOLS_AUTORECONF="1"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-inherit bash-completion-r1 flag-o-matic linux-mod toolchain-funcs autotools-utils
-
-if [ ${PV} == "9999" ] ; then
-	inherit git-2
-	EGIT_REPO_URI="git://github.com/zfsonlinux/zfs.git"
-else
-	inherit eutils versionator
-	MY_PV=$(replace_version_separator 3 '-')
-	SRC_URI="https://github.com/downloads/zfsonlinux/zfs/zfs-${MY_PV}.tar.gz"
-	S="${WORKDIR}/zfs-${MY_PV}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="CDDL"
-SLOT="0"
-IUSE="custom-cflags debug +rootfs"
-RESTRICT="test"
-
-DEPEND="
-	=sys-kernel/spl-${PV}*
-	virtual/awk
-"
-
-RDEPEND="${DEPEND}
-	!sys-fs/zfs-fuse
-"
-
-pkg_setup() {
-	CONFIG_CHECK="!DEBUG_LOCK_ALLOC
-		BLK_DEV_LOOP
-		EFI_PARTITION
-		IOSCHED_NOOP
-		MODULES
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		ZLIB_DEFLATE
-		ZLIB_INFLATE
-	"
-
-	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 5 || die "Linux 3.5 is the latest supported version."; }
-
-	check_extra_config
-}
-
-src_prepare() {
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	use custom-cflags || strip-flags
-	set_arch_to_kernel
-	local myeconfargs=(
-		--bindir="${EPREFIX}/bin"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=kernel
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		$(use_enable debug)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	use x86 && ewarn "32-bit kernels are unsupported by ZFSOnLinux upstream. Do not file bug reports."
-
-}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc12-r1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc12-r2.ebuild
index b0934e129fa8..18e2919087df 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc12-r1.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc12-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.0_rc12-r1.ebuild,v 1.2 2013/02/06 01:46:26 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc12-r2.ebuild,v 1.1 2013/02/11 23:36:17 ryao Exp $
 
 EAPI="4"
 
@@ -57,15 +57,25 @@ pkg_setup() {
 	kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required"
 
 	[ ${PV} != "9999" ] && \
-		{ kernel_is le 3 7 || die "Linux 3.7 is the latest supported version."; }
+		{ kernel_is le 3 8 || die "Linux 3.8 is the latest supported version."; }
 
 	check_extra_config
 }
 
 src_prepare() {
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/${PN}-${MY_PV}-patches"
+	if [ ${PV} != "9999" ]
+	then
+		# Apply patch set
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		epatch "${WORKDIR}/${PN}-${MY_PV}-patches"
+
+		# Cast constant for 32-bit compatibility
+		epatch "${FILESDIR}/${PN}-0.6.0_rc14-cast-const-for-32bit-compatibility.patch"
+
+		# Handle missing name length check in Linux VFS
+		epatch "${FILESDIR}/${PN}-0.6.0_rc14-vfs-name-length-compatibility.patch"
+	fi
 
 	autotools-utils_src_prepare
 }
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc12.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc12.ebuild
deleted file mode 100644
index b5b07cf94f3a..000000000000
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc12.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2013 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.0_rc12.ebuild,v 1.3 2013/02/06 01:46:26 ryao Exp $
-
-EAPI="4"
-
-AT_M4DIR="config"
-AUTOTOOLS_AUTORECONF="1"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-inherit bash-completion-r1 flag-o-matic linux-mod toolchain-funcs autotools-utils
-
-if [ ${PV} == "9999" ] ; then
-	inherit git-2
-	EGIT_REPO_URI="git://github.com/zfsonlinux/zfs.git"
-else
-	inherit eutils versionator
-	MY_PV=$(replace_version_separator 3 '-')
-	SRC_URI="https://github.com/downloads/zfsonlinux/zfs/zfs-${MY_PV}.tar.gz"
-	S="${WORKDIR}/zfs-${MY_PV}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="CDDL"
-SLOT="0"
-IUSE="custom-cflags debug +rootfs"
-RESTRICT="test"
-
-DEPEND="
-	=sys-kernel/spl-${PV}*
-	virtual/awk
-"
-
-RDEPEND="${DEPEND}
-	!sys-fs/zfs-fuse
-"
-
-pkg_setup() {
-	CONFIG_CHECK="!DEBUG_LOCK_ALLOC
-		BLK_DEV_LOOP
-		EFI_PARTITION
-		IOSCHED_NOOP
-		MODULES
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		ZLIB_DEFLATE
-		ZLIB_INFLATE
-	"
-
-	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 6 || die "Linux 3.6 is the latest supported version."; }
-
-	check_extra_config
-}
-
-src_prepare() {
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	use custom-cflags || strip-flags
-	set_arch_to_kernel
-	local myeconfargs=(
-		--bindir="${EPREFIX}/bin"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=kernel
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		$(use_enable debug)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	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
-
-}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13-r1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13-r1.ebuild
deleted file mode 100644
index 2479d9f723b8..000000000000
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2013 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.0_rc13-r1.ebuild,v 1.3 2013/02/06 01:46:26 ryao Exp $
-
-EAPI="4"
-
-AT_M4DIR="config"
-AUTOTOOLS_AUTORECONF="1"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-inherit bash-completion-r1 flag-o-matic linux-mod toolchain-funcs autotools-utils
-
-if [ ${PV} == "9999" ] ; then
-	inherit git-2
-	EGIT_REPO_URI="git://github.com/zfsonlinux/zfs.git"
-else
-	inherit eutils versionator
-	MY_PV=$(replace_version_separator 3 '-')
-	SRC_URI="https://github.com/zfsonlinux/zfs/archive/zfs-${MY_PV}.tar.gz"
-	S="${WORKDIR}/zfs-zfs-${MY_PV}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="CDDL"
-SLOT="0"
-IUSE="custom-cflags debug +rootfs"
-RESTRICT="test"
-
-DEPEND="
-	=sys-kernel/spl-${PV}*
-	virtual/awk
-"
-
-RDEPEND="${DEPEND}
-	!sys-fs/zfs-fuse
-"
-
-pkg_setup() {
-	CONFIG_CHECK="!DEBUG_LOCK_ALLOC
-		BLK_DEV_LOOP
-		EFI_PARTITION
-		IOSCHED_NOOP
-		MODULES
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		ZLIB_DEFLATE
-		ZLIB_INFLATE
-	"
-
-	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 8 || die "Linux 3.8 is the latest supported version."; }
-
-	check_extra_config
-}
-
-src_prepare() {
-	if [ ${PV} != "9999" ]
-	then
-		# Fix regression where snapshots are not visible
-		epatch "${FILESDIR}/${P}-fix-invisible-snapshots.patch"
-
-		# Fix deadlock involving concurrent `zfs destroy` and `zfs list` commands
-		epatch "${FILESDIR}/${P}-fix-recursive-reader.patch"
-
-		# Fix USE=debug build failure involving GCC 4.7
-		epatch "${FILESDIR}/${P}-gcc-4.7-compat.patch"
-	fi
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	use custom-cflags || strip-flags
-	set_arch_to_kernel
-	local myeconfargs=(
-		--bindir="${EPREFIX}/bin"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=kernel
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		$(use_enable debug)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	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
-
-}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13-r2.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13-r3.ebuild
index e02d5c64772c..5d5d25d81b7b 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13-r2.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.0_rc13-r2.ebuild,v 1.2 2013/02/06 01:46:26 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13-r3.ebuild,v 1.1 2013/02/11 23:36:17 ryao Exp $
 
 EAPI="4"
 
@@ -72,6 +72,12 @@ src_prepare() {
 
 		# Fix USE=debug build failure involving GCC 4.7
 		epatch "${FILESDIR}/${P}-gcc-4.7-compat.patch"
+
+		# Cast constant for 32-bit compatibility
+		epatch "${FILESDIR}/${PN}-0.6.0_rc14-cast-const-for-32bit-compatibility.patch"
+
+		# Handle missing name length check in Linux VFS
+		epatch "${FILESDIR}/${PN}-0.6.0_rc14-vfs-name-length-compatibility.patch"
 	fi
 	autotools-utils_src_prepare
 }
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13.ebuild
deleted file mode 100644
index 867b8060a78f..000000000000
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc13.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2013 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.0_rc13.ebuild,v 1.2 2013/02/06 01:46:26 ryao Exp $
-
-EAPI="4"
-
-AT_M4DIR="config"
-AUTOTOOLS_AUTORECONF="1"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-inherit bash-completion-r1 flag-o-matic linux-mod toolchain-funcs autotools-utils
-
-if [ ${PV} == "9999" ] ; then
-	inherit git-2
-	EGIT_REPO_URI="git://github.com/zfsonlinux/zfs.git"
-else
-	inherit eutils versionator
-	MY_PV=$(replace_version_separator 3 '-')
-	SRC_URI="https://github.com/zfsonlinux/zfs/archive/zfs-${MY_PV}.tar.gz"
-	S="${WORKDIR}/zfs-zfs-${MY_PV}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="CDDL"
-SLOT="0"
-IUSE="custom-cflags debug +rootfs"
-RESTRICT="test"
-
-DEPEND="
-	=sys-kernel/spl-${PV}*
-	virtual/awk
-"
-
-RDEPEND="${DEPEND}
-	!sys-fs/zfs-fuse
-"
-
-pkg_setup() {
-	CONFIG_CHECK="!DEBUG_LOCK_ALLOC
-		BLK_DEV_LOOP
-		EFI_PARTITION
-		IOSCHED_NOOP
-		MODULES
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		ZLIB_DEFLATE
-		ZLIB_INFLATE
-	"
-
-	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 7 || die "Linux 3.7 is the latest supported version."; }
-
-	check_extra_config
-}
-
-src_prepare() {
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	use custom-cflags || strip-flags
-	set_arch_to_kernel
-	local myeconfargs=(
-		--bindir="${EPREFIX}/bin"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=kernel
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		$(use_enable debug)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	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
-
-}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc14-r1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc14-r2.ebuild
index 90facf83aee5..30b7431277eb 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc14-r1.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc14-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.0_rc14-r1.ebuild,v 1.1 2013/02/06 01:46:26 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.0_rc14-r2.ebuild,v 1.1 2013/02/11 23:36:17 ryao Exp $
 
 EAPI="4"