[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/files/, sys-fs/zfs-kmod/

["Georgy Yakovlev" <gyakovlev@gentoo.org>]

commit:     ee070d0d2ea651c3f6cf50c335f5e98317d060ca
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 24 21:01:01 2023 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Tue Jan 24 21:03:40 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee070d0d

sys-fs/zfs-kmod: revbump 2.1.8, revert 0156253

Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 sys-fs/zfs-kmod/files/2.1.8-gang-revert.patch              | 14 ++++++++++++++
 .../{zfs-kmod-2.1.8.ebuild => zfs-kmod-2.1.8-r1.ebuild}    |  5 +++++
 2 files changed, 19 insertions(+)

diff --git a/sys-fs/zfs-kmod/files/2.1.8-gang-revert.patch b/sys-fs/zfs-kmod/files/2.1.8-gang-revert.patch
new file mode 100644
index 000000000000..13ab0575f4c8
--- /dev/null
+++ b/sys-fs/zfs-kmod/files/2.1.8-gang-revert.patch
@@ -0,0 +1,14 @@
+@gyakovlev:
+revert: https://github.com/openzfs/zfs/commit/0156253d29a303bdcca3e535958e754d8f086e33
+due to: https://github.com/openzfs/zfs/issues/14413
+--- b/module/zfs/zio.c
++++ a/module/zfs/zio.c
+@@ -2827,7 +2827,7 @@
+ 	 * have a third copy.
+ 	 */
+ 	gbh_copies = MIN(copies + 1, spa_max_replication(spa));
++	if (gio->io_prop.zp_encrypt && gbh_copies >= SPA_DVAS_PER_BP)
+-	if (BP_IS_ENCRYPTED(bp) && gbh_copies >= SPA_DVAS_PER_BP)
+ 		gbh_copies = SPA_DVAS_PER_BP - 1;
+ 
+ 	int flags = METASLAB_HINTBP_FAVOR | METASLAB_GANG_HEADER;

diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.8.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.1.8-r1.ebuild
similarity index 98%
rename from sys-fs/zfs-kmod/zfs-kmod-2.1.8.ebuild
rename to sys-fs/zfs-kmod/zfs-kmod-2.1.8-r1.ebuild
index ac514d696c4f..4213efde8be1 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.8.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.8-r1.ebuild
@@ -60,6 +60,11 @@ RESTRICT="debug? ( strip ) test"
 
 DOCS=( AUTHORS COPYRIGHT META README.md )
 
+PATCHES=(
+	# https://github.com/openzfs/zfs/issues/14413
+	"${FILESDIR}/${PV}-gang-revert.patch"
+)
+
 pkg_pretend() {
 	use rootfs || return 0