Skip to content

Commit ae04aac

Browse files
committed
zfs: fix build on Linux 6.17
- Backport patches to fix Linux 6.17 support. - Track patches at AOSC-Tracking/zfs @ aosc/zfs-2.3.4 (HEAD: 8f6e411afba8af3402b033e39f00e2268ca42606).
1 parent cdfc2e0 commit ae04aac

7 files changed

+69
-5
lines changed

app-admin/zfs/autobuild/patches/0001-Block-manual-building-in-the-DKMS-source-tree.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
From 07a246d720e7616eaab55e1df7dad370081ca1d6 Mon Sep 17 00:00:00 2001
22
From: Shengqi Chen <[email protected]>
33
Date: Tue, 16 Jul 2024 15:28:03 +0800
4-
Subject: [PATCH 1/4] Block manual building in the DKMS source tree.
4+
Subject: [PATCH 1/6] Block manual building in the DKMS source tree.
55

66
To avoid messing up future DKMS builds and the zfs installation, block manual building of the DKMS source tree.
77

app-admin/zfs/autobuild/patches/0002-Enable-zed-emails.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
From 9a3173b4b9f110c6f1e0f3dbe2342ebfc40bf071 Mon Sep 17 00:00:00 2001
22
From: Richard Laager <[email protected]>
33
Date: Tue, 16 Jul 2024 15:30:50 +0800
4-
Subject: [PATCH 2/4] Enable zed emails
4+
Subject: [PATCH 2/6] Enable zed emails
55

66
The OpenZFS event daemon monitors pools. This patch enables the email sending function by default (if zed is installed). This is consistent with the default behavior of mdadm.
77

app-admin/zfs/autobuild/patches/0003-Explicitly-load-the-ZFS-module-via-systemd-service.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
From 8a273632de0894f26db01d0c47c6764e4767668c Mon Sep 17 00:00:00 2001
22
From: Ubuntu Developers <[email protected]>
33
Date: Tue, 16 Jul 2024 15:35:34 +0800
4-
Subject: [PATCH 3/4] Explicitly load the ZFS module via systemd service
4+
Subject: [PATCH 3/6] Explicitly load the ZFS module via systemd service
55

66
See: https://salsa.debian.org/zfsonlinux-team/zfs/-/blob/0b542b085ec0a4070392bd01921cfaa7ce1bad87/debian/patches/2100-zfs-load-module.patch
77
---

app-admin/zfs/autobuild/patches/0004-Force-libtool-to-produce-verbose-output.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
From 0b995bd3d0b0c5408d6ba2a6620885813734b146 Mon Sep 17 00:00:00 2001
22
From: Mo Zhou <[email protected]>
33
Date: Tue, 16 Jul 2024 15:37:19 +0800
4-
Subject: [PATCH 4/4] Force libtool to produce verbose output
4+
Subject: [PATCH 4/6] Force libtool to produce verbose output
55

66
See: https://salsa.debian.org/zfsonlinux-team/zfs/-/blob/0b542b085ec0a4070392bd01921cfaa7ce1bad87/debian/patches/force-verbose-rules.patch
77
---
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
From 1dd95b6b7b9d5ed5fd78fe570f1ba33fbe8042fe Mon Sep 17 00:00:00 2001
2+
From: Rob Norris <[email protected]>
3+
Date: Thu, 11 Sep 2025 01:59:57 +1000
4+
Subject: [PATCH 5/6] linux/rw_destroy: assert no holders before destroying
5+
6+
While rw_destroy() may do nothing on Linux, we still want to make sure
7+
that we don't have any holders outstanding like we do for mutexes.
8+
9+
Sponsored-by: Klara, Inc.
10+
Sponsored-by: Wasabi Technology, Inc.
11+
Reviewed-by: Brian Behlendorf <[email protected]>
12+
Reviewed-by: Alexander Motin <[email protected]>
13+
Signed-off-by: Rob Norris <[email protected]>
14+
Closes #17718
15+
---
16+
include/os/linux/spl/sys/rwlock.h | 2 +-
17+
1 file changed, 1 insertion(+), 1 deletion(-)
18+
19+
diff --git a/include/os/linux/spl/sys/rwlock.h b/include/os/linux/spl/sys/rwlock.h
20+
index 563e0a196..c883836c2 100644
21+
--- a/include/os/linux/spl/sys/rwlock.h
22+
+++ b/include/os/linux/spl/sys/rwlock.h
23+
@@ -130,7 +130,7 @@ RW_READ_HELD(krwlock_t *rwp)
24+
/*
25+
* The Linux rwsem implementation does not require a matching destroy.
26+
*/
27+
-#define rw_destroy(rwp) ((void) 0)
28+
+#define rw_destroy(rwp) ASSERT(!(RW_LOCK_HELD(rwp)))
29+
30+
/*
31+
* Upgrading a rwsem from a reader to a writer is not supported by the
32+
--
33+
2.51.0
34+
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
From 8f6e411afba8af3402b033e39f00e2268ca42606 Mon Sep 17 00:00:00 2001
2+
From: Brian Behlendorf <[email protected]>
3+
Date: Fri, 26 Sep 2025 10:00:18 -0700
4+
Subject: [PATCH 6/6] Linux 6.17 compat: META
5+
6+
Update the META file to reflect compatibility with the 6.17
7+
kernel.
8+
9+
Reviewed-by: Alexander Motin <[email protected]>
10+
Reviewed-by: Rob Norris <[email protected]>
11+
Signed-off-by: Brian Behlendorf <[email protected]>
12+
Closes #17789
13+
---
14+
META | 2 +-
15+
1 file changed, 1 insertion(+), 1 deletion(-)
16+
17+
diff --git a/META b/META
18+
index f2c906265..c96da9b72 100644
19+
--- a/META
20+
+++ b/META
21+
@@ -6,5 +6,5 @@ Release: 1
22+
Release-Tags: relext
23+
License: CDDL
24+
Author: OpenZFS
25+
-Linux-Maximum: 6.16
26+
+Linux-Maximum: 6.17
27+
Linux-Minimum: 4.18
28+
--
29+
2.51.0
30+

app-admin/zfs/spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
VER=2.3.4
2-
REL=1
2+
REL=2
33
SRCS="tbl::https://github.com/openzfs/zfs/releases/download/zfs-$VER/zfs-$VER.tar.gz"
44
CHKSUMS="sha256::9ec397cf360133161a1180035f3e7d6962186ed2b3457953a28d45aa883fa495"
55
CHKUPDATE="anitya::id=11706"

0 commit comments

Comments
 (0)