[packages/zfs] - updated to 2.4.1
qboosh
qboosh at pld-linux.org
Sat Feb 28 18:31:59 CET 2026
commit 6c9925d6b87d073ccc097a41d720703ef95fe824
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Feb 28 18:31:57 2026 +0100
- updated to 2.4.1
...replace-i_state-access-with-inode_state_r.patch | 102 ---------------------
...handle-werror-with-CONFIG_OBJTOOL_WERROR-.patch | 42 ---------
0003-Linux-6.19-compat-META.patch | 30 ------
zfs.spec | 12 +--
4 files changed, 3 insertions(+), 183 deletions(-)
---
diff --git a/zfs.spec b/zfs.spec
index 8656d9c..6681c65 100644
--- a/zfs.spec
+++ b/zfs.spec
@@ -24,22 +24,19 @@ exit 1
%define _duplicate_files_terminate_build 0
-%define rel 2
+%define rel 1
%define pname zfs
Summary: Native Linux port of the ZFS filesystem
Summary(pl.UTF-8): Natywny linuksowy port systemu plików ZFS
Name: %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
-Version: 2.4.0
+Version: 2.4.1
Release: %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
License: CDDL
Group: Applications/System
Source0: https://github.com/openzfs/zfs/releases/download/zfs-%{version}/%{pname}-%{version}.tar.gz
-# Source0-md5: 083322c0a7db7d09153c85af0219a70a
+# Source0-md5: a1168e562f4ed00b74d2a16e86473684
Patch0: initdir.patch
Patch1: pld.patch
-Patch2: 0001-Linux-6.19-replace-i_state-access-with-inode_state_r.patch
-Patch3: 0002-Linux-6.19-handle-werror-with-CONFIG_OBJTOOL_WERROR-.patch
-Patch4: 0003-Linux-6.19-compat-META.patch
URL: https://zfsonlinux.org/
BuildRequires: autoconf >= 2.50
BuildRequires: automake
@@ -268,9 +265,6 @@ p=`pwd`\
%setup -q -n %{pname}-%{version}
%patch -P0 -p1
%patch -P1 -p1
-%patch -P2 -p1
-%patch -P3 -p1
-%patch -P4 -p1
%{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+python3(\s|$),#!%{__python3}\1,' \
cmd/zarcsummary
diff --git a/0001-Linux-6.19-replace-i_state-access-with-inode_state_r.patch b/0001-Linux-6.19-replace-i_state-access-with-inode_state_r.patch
deleted file mode 100644
index ca62590..0000000
--- a/0001-Linux-6.19-replace-i_state-access-with-inode_state_r.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From 3c8665cb5d62c42d6ef74e269f146ae17c440229 Mon Sep 17 00:00:00 2001
-From: Rob Norris <robn at despairlabs.com>
-Date: Mon, 1 Dec 2025 16:05:27 +1100
-Subject: [PATCH 01/73] Linux 6.19: replace i_state access with
- inode_state_read_once()
-
-Sponsored-by: https://despairlabs.com/sponsor/
-Reviewed-by: Tony Hutter <hutter2 at llnl.gov>
-Reviewed-by: Brian Behlendorf <behlendorf1 at llnl.gov>
-Signed-off-by: Rob Norris <robn at despairlabs.com>
-Closes #18053
----
- config/kernel-inode-state.m4 | 23 ++++++++++++++++++++++
- config/kernel.m4 | 2 ++
- include/os/linux/kernel/linux/vfs_compat.h | 8 ++++++++
- module/os/linux/zfs/zfs_vnops_os.c | 3 ++-
- 4 files changed, 35 insertions(+), 1 deletion(-)
- create mode 100644 config/kernel-inode-state.m4
-
-diff --git a/config/kernel-inode-state.m4 b/config/kernel-inode-state.m4
-new file mode 100644
-index 000000000..02ec1380a
---- /dev/null
-+++ b/config/kernel-inode-state.m4
-@@ -0,0 +1,23 @@
-+dnl #
-+dnl # 6.19 API change. inode->i_state no longer accessible directly; helper
-+dnl # functions exist.
-+dnl #
-+AC_DEFUN([ZFS_AC_KERNEL_SRC_INODE_STATE_READ_ONCE], [
-+ ZFS_LINUX_TEST_SRC([inode_state_read_once], [
-+ #include <linux/fs.h>
-+ ], [
-+ struct inode i = {};
-+ inode_state_read_once(&i);
-+ ],[])
-+])
-+
-+AC_DEFUN([ZFS_AC_KERNEL_INODE_STATE_READ_ONCE], [
-+ AC_MSG_CHECKING([whether inode_state_read_once() exists])
-+ ZFS_LINUX_TEST_RESULT([inode_state_read_once], [
-+ AC_MSG_RESULT(yes)
-+ AC_DEFINE(HAVE_INODE_STATE_READ_ONCE, 1,
-+ [inode_state_read_once() exists])
-+ ],[
-+ AC_MSG_RESULT(no)
-+ ])
-+])
-diff --git a/config/kernel.m4 b/config/kernel.m4
-index f095c8f20..eb2e827d5 100644
---- a/config/kernel.m4
-+++ b/config/kernel.m4
-@@ -59,6 +59,7 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_SRC], [
- ZFS_AC_KERNEL_SRC_ACL
- ZFS_AC_KERNEL_SRC_INODE_SETATTR
- ZFS_AC_KERNEL_SRC_INODE_GETATTR
-+ ZFS_AC_KERNEL_SRC_INODE_STATE_READ_ONCE
- ZFS_AC_KERNEL_SRC_SHOW_OPTIONS
- ZFS_AC_KERNEL_SRC_SHRINKER
- ZFS_AC_KERNEL_SRC_MKDIR
-@@ -181,6 +182,7 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_RESULT], [
- ZFS_AC_KERNEL_ACL
- ZFS_AC_KERNEL_INODE_SETATTR
- ZFS_AC_KERNEL_INODE_GETATTR
-+ ZFS_AC_KERNEL_INODE_STATE_READ_ONCE
- ZFS_AC_KERNEL_SHOW_OPTIONS
- ZFS_AC_KERNEL_SHRINKER
- ZFS_AC_KERNEL_MKDIR
-diff --git a/include/os/linux/kernel/linux/vfs_compat.h b/include/os/linux/kernel/linux/vfs_compat.h
-index d9dc904bc..24219637d 100644
---- a/include/os/linux/kernel/linux/vfs_compat.h
-+++ b/include/os/linux/kernel/linux/vfs_compat.h
-@@ -269,4 +269,12 @@ zpl_is_32bit_api(void)
- #define generic_drop_inode(ip) inode_generic_drop(ip)
- #endif
-
-+#ifndef HAVE_INODE_STATE_READ_ONCE
-+/*
-+ * 6.19 API change. We should no longer access i_state directly. If the new
-+ * helper function doesn't exist, define our own.
-+ */
-+#define inode_state_read_once(ip) READ_ONCE(ip->i_state)
-+#endif
-+
- #endif /* _ZFS_VFS_H */
-diff --git a/module/os/linux/zfs/zfs_vnops_os.c b/module/os/linux/zfs/zfs_vnops_os.c
-index a788e3fd4..da09faba1 100644
---- a/module/os/linux/zfs/zfs_vnops_os.c
-+++ b/module/os/linux/zfs/zfs_vnops_os.c
-@@ -3513,7 +3513,8 @@ zfs_link(znode_t *tdzp, znode_t *szp, char *name, cred_t *cr,
- boolean_t is_tmpfile = 0;
- uint64_t txg;
-
-- is_tmpfile = (sip->i_nlink == 0 && (sip->i_state & I_LINKABLE));
-+ is_tmpfile = (sip->i_nlink == 0 &&
-+ (inode_state_read_once(sip) & I_LINKABLE));
-
- ASSERT(S_ISDIR(ZTOI(tdzp)->i_mode));
-
---
-2.53.0
-
diff --git a/0002-Linux-6.19-handle-werror-with-CONFIG_OBJTOOL_WERROR-.patch b/0002-Linux-6.19-handle-werror-with-CONFIG_OBJTOOL_WERROR-.patch
deleted file mode 100644
index 0187ee3..0000000
--- a/0002-Linux-6.19-handle-werror-with-CONFIG_OBJTOOL_WERROR-.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 13601e2d24960c4503c69ff3efc159b3a2353c46 Mon Sep 17 00:00:00 2001
-From: John Cabaj <john.cabaj at canonical.com>
-Date: Mon, 2 Feb 2026 12:19:18 -0600
-Subject: [PATCH 36/72] Linux 6.19: handle --werror with
- CONFIG_OBJTOOL_WERROR=y
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Linux upstream commit 56754f0f46f6: "objtool: Rename
---Werror to --werror" did just that, so we should check for
-either "--Werror" or "--werror", else the build will fail
-
-Reviewed-by: Brian Behlendorf <behlendorf1 at llnl.gov>
-Reviewed-by: Attila Fülöp <attila at fueloep.org>
-Reviewed-by: Tony Hutter <hutter2 at llnl.gov>
-Signed-off-by: John Cabaj <john.cabaj at canonical.com>
-Closes #18152
----
- scripts/objtool-wrapper.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/scripts/objtool-wrapper.in b/scripts/objtool-wrapper.in
-index 0451f8718..0cea6e2f6 100644
---- a/scripts/objtool-wrapper.in
-+++ b/scripts/objtool-wrapper.in
-@@ -22,10 +22,10 @@
- # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- # IN THE SOFTWARE.
-
--# Filter out objtools '--Werror' flag.
-+# Filter out objtools '--Werror or --werror' flag.
-
- objtool="@abs_objtool_binary@"
--args=$(echo "$*" | sed s/--Werror//)
-+args=$(echo "$*" | sed 's/--Werror\|--werror//')
-
- if [ -z "$objtool" ]; then
- echo "$(basename "$0"): No objtool binary configured" 1>&2
---
-2.53.0
-
diff --git a/0003-Linux-6.19-compat-META.patch b/0003-Linux-6.19-compat-META.patch
deleted file mode 100644
index 26500fd..0000000
--- a/0003-Linux-6.19-compat-META.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From fdd70565cb205a617cd0803c11e0f0b07af567e2 Mon Sep 17 00:00:00 2001
-From: Tony Hutter <hutter2 at llnl.gov>
-Date: Wed, 11 Feb 2026 09:37:02 -0800
-Subject: [PATCH 66/72] Linux 6.19 compat: META
-
-Update the META file to reflect compatibility with the 6.19
-kernel.
-
-Reviewed-by: Rob Norris <robn at despairlabs.com>
-Reviewed-by: Brian Behlendorf <behlendorf1 at llnl.gov>
-Signed-off-by: Tony Hutter <hutter2 at llnl.gov>
-Closes #18197
----
- META | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/META b/META
-index 828d0c49e..260bd7e40 100644
---- a/META
-+++ b/META
-@@ -6,5 +6,5 @@ Release: 1
- Release-Tags: relext
- License: CDDL
- Author: OpenZFS
--Linux-Maximum: 6.18
-+Linux-Maximum: 6.19
- Linux-Minimum: 4.18
---
-2.53.0
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/zfs.git/commitdiff/6c9925d6b87d073ccc097a41d720703ef95fe824
More information about the pld-cvs-commit
mailing list