From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 89CF515800F for ; Tue, 24 Jan 2023 21:04:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B48F3E084A; Tue, 24 Jan 2023 21:04:08 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 96EAAE084A for ; Tue, 24 Jan 2023 21:04:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 887A0340D68 for ; Tue, 24 Jan 2023 21:04:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6760A85B for ; Tue, 24 Jan 2023 21:04:05 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1674594220.ee070d0d2ea651c3f6cf50c335f5e98317d060ca.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/files/, sys-fs/zfs-kmod/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/zfs-kmod/files/2.1.8-gang-revert.patch sys-fs/zfs-kmod/zfs-kmod-2.1.8-r1.ebuild sys-fs/zfs-kmod/zfs-kmod-2.1.8.ebuild X-VCS-Directories: sys-fs/zfs-kmod/files/ sys-fs/zfs-kmod/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: ee070d0d2ea651c3f6cf50c335f5e98317d060ca X-VCS-Branch: master Date: Tue, 24 Jan 2023 21:04:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c5c23ba7-c53b-40b9-92d4-e3285bac483b X-Archives-Hash: 9e3875a42c4bcd7c34269145c94f7df4 commit: ee070d0d2ea651c3f6cf50c335f5e98317d060ca Author: Georgy Yakovlev gentoo org> AuthorDate: Tue Jan 24 21:01:01 2023 +0000 Commit: Georgy Yakovlev gentoo 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 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