summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger <mmk@levelnine.at>2022-04-18 09:07:06 +0200
committerSam James <sam@gentoo.org>2022-04-18 08:15:37 +0100
commit8102a2df6ce57d8c3a0d4b45e5d05627ca8bd10a (patch)
tree4dcacb07310cc144727ac25a0ea3a8bd67d7a3e2 /sys-fs/zfs-kmod
parentsci-geosciences/grass: fix patch (diff)
downloadgentoo-8102a2df6ce57d8c3a0d4b45e5d05627ca8bd10a.tar.gz
gentoo-8102a2df6ce57d8c3a0d4b45e5d05627ca8bd10a.tar.bz2
gentoo-8102a2df6ce57d8c3a0d4b45e5d05627ca8bd10a.zip
sys-fs/zfs-kmod: remove unused patch
Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/25080 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sys-fs/zfs-kmod')
-rw-r--r--sys-fs/zfs-kmod/files/2.1.3-werror.patch30
1 files changed, 0 insertions, 30 deletions
diff --git a/sys-fs/zfs-kmod/files/2.1.3-werror.patch b/sys-fs/zfs-kmod/files/2.1.3-werror.patch
deleted file mode 100644
index b4aba47d8324..000000000000
--- a/sys-fs/zfs-kmod/files/2.1.3-werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://bugs.gentoo.org/835646
-https://github.com/openzfs/zfs/commit/7b215d93bcc0a72d7020ccc050c64f39aa7f2be8.patch
-
-From: Ryan Moeller <freqlabs@FreeBSD.org>
-Date: Thu, 17 Mar 2022 13:18:23 -0400
-Subject: [PATCH] Fix module build with -Werror
-
-This is a direct commit to zfs-2.1-release to fix release builds that
-error out on an unused variable. The issue is avoided on master by a
-huge series of commits that change how the ASSERT macros work, but that
-is not feasible to backport.
-
-Reviewed-by: Tony Hutter <hutter2@llnl.gov>
-Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Reviewed-by: Igor Kozhukhov <igor@dilos.org>
-Signed-off-by: Ryan Moeller <freqlabs@FreeBSD.org>
-Closes #13194
-Closes #13196
---- a/module/zfs/arc.c
-+++ b/module/zfs/arc.c
-@@ -1205,7 +1205,7 @@ static void
- hdr_l2only_dest(void *vbuf, void *unused)
- {
- (void) unused;
-- arc_buf_hdr_t *hdr = vbuf;
-+ arc_buf_hdr_t *hdr __maybe_unused = vbuf;
-
- ASSERT(HDR_EMPTY(hdr));
- arc_space_return(HDR_L2ONLY_SIZE, ARC_SPACE_L2HDRS);
-