diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-03-24 23:59:54 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-03-24 23:59:54 +0000 |
| commit | 401101f9c8077911929d3f2b60a37098460a5d89 (patch) | |
| tree | c2bef4719f6787550f0916aeaa8f4f403a9296af /sys-fs/zfs-kmod/files | |
| parent | 4cbcc855382a06088e2f016f62cafdbcb7e40665 (diff) | |
gentoo resync : 25.03.2022
Diffstat (limited to 'sys-fs/zfs-kmod/files')
| -rw-r--r-- | sys-fs/zfs-kmod/files/2.1.3-werror.patch | 30 |
1 files changed, 30 insertions, 0 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 new file mode 100644 index 000000000000..b4aba47d8324 --- /dev/null +++ b/sys-fs/zfs-kmod/files/2.1.3-werror.patch @@ -0,0 +1,30 @@ +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); + |