* [pve-devel] [PATCH zfsonlinux 0/6] update zfs to 2.4.0
@ 2026-01-13 14:07 Stoiko Ivanov
2026-01-13 14:07 ` [pve-devel] [PATCH zfsonlinux 1/6] update submodule to 2.4.0 and refresh patches Stoiko Ivanov
` (5 more replies)
0 siblings, 6 replies; 7+ messages in thread
From: Stoiko Ivanov @ 2026-01-13 14:07 UTC (permalink / raw)
To: pve-devel
This patchset updates the submodule to the recently released version 2.4.0:
https://github.com/openzfs/zfs/releases/tag/zfs-2.4.0
from the changelog the following changes seem interesting relevant:
* using special devices for the ZIL (if no dedicated slog device is
configured)
* small blocks of zvols (in addtition to regular filesystem datasets) can
now be written to the special vdevs (this is guarded by the dataset
property sepcial_small_blocks)
* arc_summary and arcstat have been renamed to zarcsummary and zarcstat
respectively (the latter calls for adaptation of our system-reports for
PVE at least)
the patches for the soname bump of libzfs and libzpool, as well as the
adaptations to the debian folder follow the changes done in
debian-upstream:
https://salsa.debian.org/zfsonlinux-team/zfs.git
this was minimally tested on 2 VMs I have. (one running the new userspace
and new kernel modules, the other pinned to a kernel 6.14 with zfs 2.3).
This should fix https://bugzilla.proxmox.com/show_bug.cgi?id=7199
(we have a few independent reports of users running into hangs when
accessing snapshots through the controldir (.zfs/snap/<snapname>).
I'll check if the fixes for 7199 are easily backported to ZFS 2.3 as well.
Stoiko Ivanov (6):
update submodule to 2.4.0 and refresh patches
Bump SONAME to libzfs7 and libzpool7
d/: rename arcstat and arc_summary to zarcstat and zarcsummary
d/libzfs7linux: update usr-merge-related maintainer scripts after
trixie release (see: #1092598)
d/control: update usage of auto-generated fields
d/control: bump std-ver to 4.7.3 (no changes needed)
Makefile | 4 +-
debian/control | 26 +--
debian/copyright | 4 +-
debian/libzfs6linux.preinst | 16 --
.../{libzfs6linux.docs => libzfs7linux.docs} | 0
...nux.install.in => libzfs7linux.install.in} | 0
...errides => libzfs7linux.lintian-overrides} | 0
...zfs6linux.postrm => libzfs7linux.postinst} | 3 +-
...ibzpool6linux.docs => libzpool7linux.docs} | 0
...x.install.in => libzpool7linux.install.in} | 0
...rides => libzpool7linux.lintian-overrides} | 0
...META-and-DCH-consistency-in-autoconf.patch | 2 +-
.../0002-always-load-ZFS-module-on-boot.patch | 2 +-
...o-the-zed-binary-on-the-systemd-unit.patch | 2 +-
...ith-d-dev-disk-by-id-in-scan-service.patch | 2 +-
debian/patches/0005-Enable-zed-emails.patch | 2 +-
.../0006-dont-symlink-zed-scripts.patch | 2 +-
...md-unit-for-importing-specific-pools.patch | 6 +-
...-move-manpage-arcstat-1-to-arcstat-8.patch | 52 ------
...ten-bounds-for-noalloc-stat-availab.patch} | 4 +-
...17-d_set_d_op-is-no-longer-available.patch | 175 ------------------
.../patches/0011-Linux-6.17-compat-META.patch | 29 ---
debian/patches/series | 5 +-
debian/zfsutils-linux.install | 8 +-
debian/zfsutils-linux.links | 1 -
debian/zfsutils-linux.lintian-overrides | 4 +-
upstream | 2 +-
27 files changed, 39 insertions(+), 312 deletions(-)
delete mode 100644 debian/libzfs6linux.preinst
rename debian/{libzfs6linux.docs => libzfs7linux.docs} (100%)
rename debian/{libzfs6linux.install.in => libzfs7linux.install.in} (100%)
rename debian/{libzfs6linux.lintian-overrides => libzfs7linux.lintian-overrides} (100%)
rename debian/{libzfs6linux.postrm => libzfs7linux.postinst} (79%)
rename debian/{libzpool6linux.docs => libzpool7linux.docs} (100%)
rename debian/{libzpool6linux.install.in => libzpool7linux.install.in} (100%)
rename debian/{libzpool6linux.lintian-overrides => libzpool7linux.lintian-overrides} (100%)
delete mode 100644 debian/patches/0008-Patch-move-manpage-arcstat-1-to-arcstat-8.patch
rename debian/patches/{0009-zpool-status-tighten-bounds-for-noalloc-stat-availab.patch => 0008-zpool-status-tighten-bounds-for-noalloc-stat-availab.patch} (94%)
delete mode 100644 debian/patches/0010-Linux-6.17-d_set_d_op-is-no-longer-available.patch
delete mode 100644 debian/patches/0011-Linux-6.17-compat-META.patch
--
2.47.3
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 7+ messages in thread
* [pve-devel] [PATCH zfsonlinux 1/6] update submodule to 2.4.0 and refresh patches
2026-01-13 14:07 [pve-devel] [PATCH zfsonlinux 0/6] update zfs to 2.4.0 Stoiko Ivanov
@ 2026-01-13 14:07 ` Stoiko Ivanov
2026-01-13 14:07 ` [pve-devel] [PATCH zfsonlinux 2/6] Bump SONAME to libzfs7 and libzpool7 Stoiko Ivanov
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Stoiko Ivanov @ 2026-01-13 14:07 UTC (permalink / raw)
To: pve-devel
the patches for 6.17 compat are already in 2.4.0, and the remaining
patch which renamed arcstat(1) to arcstat(8) was dropped by
debian-upstream https://salsa.debian.org/zfsonlinux-team/zfs in:
68ed35d6d ("d/patches: remove applied patches in upstream")
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
...META-and-DCH-consistency-in-autoconf.patch | 2 +-
.../0002-always-load-ZFS-module-on-boot.patch | 2 +-
...o-the-zed-binary-on-the-systemd-unit.patch | 2 +-
...ith-d-dev-disk-by-id-in-scan-service.patch | 2 +-
debian/patches/0005-Enable-zed-emails.patch | 2 +-
.../0006-dont-symlink-zed-scripts.patch | 2 +-
...md-unit-for-importing-specific-pools.patch | 6 +-
...-move-manpage-arcstat-1-to-arcstat-8.patch | 52 ------
...ten-bounds-for-noalloc-stat-availab.patch} | 4 +-
...17-d_set_d_op-is-no-longer-available.patch | 175 ------------------
.../patches/0011-Linux-6.17-compat-META.patch | 29 ---
debian/patches/series | 5 +-
upstream | 2 +-
13 files changed, 13 insertions(+), 272 deletions(-)
delete mode 100644 debian/patches/0008-Patch-move-manpage-arcstat-1-to-arcstat-8.patch
rename debian/patches/{0009-zpool-status-tighten-bounds-for-noalloc-stat-availab.patch => 0008-zpool-status-tighten-bounds-for-noalloc-stat-availab.patch} (94%)
delete mode 100644 debian/patches/0010-Linux-6.17-d_set_d_op-is-no-longer-available.patch
delete mode 100644 debian/patches/0011-Linux-6.17-compat-META.patch
diff --git a/debian/patches/0001-Check-for-META-and-DCH-consistency-in-autoconf.patch b/debian/patches/0001-Check-for-META-and-DCH-consistency-in-autoconf.patch
index 504bb9987..41fa5b583 100644
--- a/debian/patches/0001-Check-for-META-and-DCH-consistency-in-autoconf.patch
+++ b/debian/patches/0001-Check-for-META-and-DCH-consistency-in-autoconf.patch
@@ -10,7 +10,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
1 file changed, 29 insertions(+), 5 deletions(-)
diff --git a/config/zfs-meta.m4 b/config/zfs-meta.m4
-index 20064a0fb..4d5f545ad 100644
+index 20064a0fb5957288640494bd6a640942796050b4..4d5f545adc23c3c97604b7a1ac47e9711c81e9fd 100644
--- a/config/zfs-meta.m4
+++ b/config/zfs-meta.m4
@@ -1,9 +1,10 @@
diff --git a/debian/patches/0002-always-load-ZFS-module-on-boot.patch b/debian/patches/0002-always-load-ZFS-module-on-boot.patch
index 6b1e068b1..87133b7f5 100644
--- a/debian/patches/0002-always-load-ZFS-module-on-boot.patch
+++ b/debian/patches/0002-always-load-ZFS-module-on-boot.patch
@@ -19,7 +19,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/etc/modules-load.d/zfs.conf b/etc/modules-load.d/zfs.conf
-index 44e1bb3ed..7509b03cb 100644
+index 44e1bb3ed906b18eaafb6376471380b669590357..7509b03cb7dd8f326db514841f3f90d47021caa7 100644
--- a/etc/modules-load.d/zfs.conf
+++ b/etc/modules-load.d/zfs.conf
@@ -1,3 +1,3 @@
diff --git a/debian/patches/0003-Fix-the-path-to-the-zed-binary-on-the-systemd-unit.patch b/debian/patches/0003-Fix-the-path-to-the-zed-binary-on-the-systemd-unit.patch
index fa365df58..51f3e4e24 100644
--- a/debian/patches/0003-Fix-the-path-to-the-zed-binary-on-the-systemd-unit.patch
+++ b/debian/patches/0003-Fix-the-path-to-the-zed-binary-on-the-systemd-unit.patch
@@ -13,7 +13,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/etc/systemd/system/zfs-zed.service.in b/etc/systemd/system/zfs-zed.service.in
-index be2fc6734..7606604ec 100644
+index be2fc67348f937b074554377f46d51ef81ef5105..7606604ec0251a1239e078dc15fd969a584bb843 100644
--- a/etc/systemd/system/zfs-zed.service.in
+++ b/etc/systemd/system/zfs-zed.service.in
@@ -5,7 +5,7 @@ ConditionPathIsDirectory=/sys/module/zfs
diff --git a/debian/patches/0004-import-with-d-dev-disk-by-id-in-scan-service.patch b/debian/patches/0004-import-with-d-dev-disk-by-id-in-scan-service.patch
index 7ea61c811..d551dc595 100644
--- a/debian/patches/0004-import-with-d-dev-disk-by-id-in-scan-service.patch
+++ b/debian/patches/0004-import-with-d-dev-disk-by-id-in-scan-service.patch
@@ -14,7 +14,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/etc/systemd/system/zfs-import-scan.service.in b/etc/systemd/system/zfs-import-scan.service.in
-index c5dd45d87..1c792edf0 100644
+index c5dd45d87e683bd78d0d09c506f5b3db179edf2e..1c792edf054271560ec482b0ed8eab8e7b900253 100644
--- a/etc/systemd/system/zfs-import-scan.service.in
+++ b/etc/systemd/system/zfs-import-scan.service.in
@@ -14,7 +14,7 @@ ConditionPathIsDirectory=/sys/module/zfs
diff --git a/debian/patches/0005-Enable-zed-emails.patch b/debian/patches/0005-Enable-zed-emails.patch
index 44b30d83f..87769ce10 100644
--- a/debian/patches/0005-Enable-zed-emails.patch
+++ b/debian/patches/0005-Enable-zed-emails.patch
@@ -13,7 +13,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmd/zed/zed.d/zed.rc b/cmd/zed/zed.d/zed.rc
-index af56147a9..47fb01631 100644
+index af56147a969b0bef63a9cd6b16b1b59c186298b0..47fb01631ec46980ba1ffbce5d2bb69a3e7150fc 100644
--- a/cmd/zed/zed.d/zed.rc
+++ b/cmd/zed/zed.d/zed.rc
@@ -41,7 +41,7 @@ ZED_EMAIL_ADDR="root"
diff --git a/debian/patches/0006-dont-symlink-zed-scripts.patch b/debian/patches/0006-dont-symlink-zed-scripts.patch
index 2591e8604..d017f18fc 100644
--- a/debian/patches/0006-dont-symlink-zed-scripts.patch
+++ b/debian/patches/0006-dont-symlink-zed-scripts.patch
@@ -32,7 +32,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmd/zed/zed.d/Makefile.am b/cmd/zed/zed.d/Makefile.am
-index 093a04c46..e5e735d00 100644
+index c0b161ecf2489ee2ba5988f51bda99ac0dd2f639..141116709dfbfb32f6b3da81b25d69499dc6e72c 100644
--- a/cmd/zed/zed.d/Makefile.am
+++ b/cmd/zed/zed.d/Makefile.am
@@ -50,7 +50,7 @@ zed-install-data-hook:
diff --git a/debian/patches/0007-Add-systemd-unit-for-importing-specific-pools.patch b/debian/patches/0007-Add-systemd-unit-for-importing-specific-pools.patch
index 0c18fe8e4..28477cbcd 100644
--- a/debian/patches/0007-Add-systemd-unit-for-importing-specific-pools.patch
+++ b/debian/patches/0007-Add-systemd-unit-for-importing-specific-pools.patch
@@ -23,7 +23,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
create mode 100644 etc/systemd/system/zfs-import@.service.in
diff --git a/etc/Makefile.am b/etc/Makefile.am
-index 808c729cd..88f85ca9b 100644
+index 808c729cd96838f4039a1e4476826a958414ce4f..88f85ca9bbebcc76e81adcad6d56c07b8661b09e 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -54,6 +54,7 @@ dist_systemdpreset_DATA = \
@@ -35,7 +35,7 @@ index 808c729cd..88f85ca9b 100644
%D%/systemd/system/zfs-mount.service \
%D%/systemd/system/zfs-mount@.service \
diff --git a/etc/systemd/system/50-zfs.preset b/etc/systemd/system/50-zfs.preset
-index e4056a92c..030611419 100644
+index e4056a92cd985380aa7346f4b291e4c3f1446fee..030611419816c83bcb86fc9c23d31855014eb914 100644
--- a/etc/systemd/system/50-zfs.preset
+++ b/etc/systemd/system/50-zfs.preset
@@ -1,6 +1,7 @@
@@ -48,7 +48,7 @@ index e4056a92c..030611419 100644
enable zfs-share.service
diff --git a/etc/systemd/system/zfs-import@.service.in b/etc/systemd/system/zfs-import@.service.in
new file mode 100644
-index 000000000..5bd19fb79
+index 0000000000000000000000000000000000000000..5bd19fb795e2b5554b3932e0b84b2668c2dcac51
--- /dev/null
+++ b/etc/systemd/system/zfs-import@.service.in
@@ -0,0 +1,18 @@
diff --git a/debian/patches/0008-Patch-move-manpage-arcstat-1-to-arcstat-8.patch b/debian/patches/0008-Patch-move-manpage-arcstat-1-to-arcstat-8.patch
deleted file mode 100644
index aa9d05667..000000000
--- a/debian/patches/0008-Patch-move-manpage-arcstat-1-to-arcstat-8.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Stoiko Ivanov <s.ivanov@proxmox.com>
-Date: Thu, 4 Feb 2021 19:01:12 +0100
-Subject: [PATCH] Patch: move manpage arcstat(1) to arcstat(8).
-
-Originally-By: Mo Zhou <cdluminate@gmail.com>
-Originally-By: Antonio Russo <aerusso@aerusso.net>
-
-Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
-Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
----
- man/Makefile.am | 2 +-
- man/{man1/arcstat.1 => man8/arcstat.8} | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
- rename man/{man1/arcstat.1 => man8/arcstat.8} (99%)
-
-diff --git a/man/Makefile.am b/man/Makefile.am
-index 6a7b2d3e4..11df2ebf5 100644
---- a/man/Makefile.am
-+++ b/man/Makefile.am
-@@ -2,7 +2,6 @@ dist_noinst_man_MANS = \
- %D%/man1/cstyle.1
-
- dist_man_MANS = \
-- %D%/man1/arcstat.1 \
- %D%/man1/raidz_test.1 \
- %D%/man1/test-runner.1 \
- %D%/man1/zhack.1 \
-@@ -22,6 +21,7 @@ dist_man_MANS = \
- %D%/man7/zpoolconcepts.7 \
- %D%/man7/zpoolprops.7 \
- \
-+ %D%/man8/arcstat.8 \
- %D%/man8/fsck.zfs.8 \
- %D%/man8/mount.zfs.8 \
- %D%/man8/vdev_id.8 \
-diff --git a/man/man1/arcstat.1 b/man/man8/arcstat.8
-similarity index 99%
-rename from man/man1/arcstat.1
-rename to man/man8/arcstat.8
-index f2474fbb7..5ab0018ec 100644
---- a/man/man1/arcstat.1
-+++ b/man/man8/arcstat.8
-@@ -14,7 +14,7 @@
- .\" Copyright (c) 2020 by AJ Jordan. All rights reserved.
- .\"
- .Dd December 23, 2022
--.Dt ARCSTAT 1
-+.Dt ARCSTAT 8
- .Os
- .
- .Sh NAME
diff --git a/debian/patches/0009-zpool-status-tighten-bounds-for-noalloc-stat-availab.patch b/debian/patches/0008-zpool-status-tighten-bounds-for-noalloc-stat-availab.patch
similarity index 94%
rename from debian/patches/0009-zpool-status-tighten-bounds-for-noalloc-stat-availab.patch
rename to debian/patches/0008-zpool-status-tighten-bounds-for-noalloc-stat-availab.patch
index 8ecc9a232..8c1cecaee 100644
--- a/debian/patches/0009-zpool-status-tighten-bounds-for-noalloc-stat-availab.patch
+++ b/debian/patches/0008-zpool-status-tighten-bounds-for-noalloc-stat-availab.patch
@@ -51,10 +51,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/cmd/zpool/zpool_main.c b/cmd/zpool/zpool_main.c
-index 51c3963dd..75ea14bae 100644
+index a4a372834718ed48255e9b7a2dd375be0b45bc64..c059dd75283dbf89dcd3959c44b2341f13aac820 100644
--- a/cmd/zpool/zpool_main.c
+++ b/cmd/zpool/zpool_main.c
-@@ -3117,7 +3117,8 @@ print_status_config(zpool_handle_t *zhp, status_cbdata_t *cb, const char *name,
+@@ -3112,7 +3112,8 @@ print_status_config(zpool_handle_t *zhp, status_cbdata_t *cb, const char *name,
if (vs->vs_scan_removing != 0) {
(void) printf(gettext(" (removing)"));
diff --git a/debian/patches/0010-Linux-6.17-d_set_d_op-is-no-longer-available.patch b/debian/patches/0010-Linux-6.17-d_set_d_op-is-no-longer-available.patch
deleted file mode 100644
index 1084fefca..000000000
--- a/debian/patches/0010-Linux-6.17-d_set_d_op-is-no-longer-available.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Rob Norris <robn@despairlabs.com>
-Date: Thu, 31 Jul 2025 13:12:43 +1000
-Subject: [PATCH] Linux 6.17: d_set_d_op() is no longer available
-
-We only have extremely narrow uses, so move it all into a single
-function that does only what we need, with and without d_set_d_op().
-
-Sponsored-by: https://despairlabs.com/sponsor/
-Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Reviewed-by: Tony Hutter <hutter2@llnl.gov>
-Signed-off-by: Rob Norris <robn@despairlabs.com>
-Closes #17621
-(cherry picked from commit 0df91abe821e52bc63c59f4fd0548835081dc3ad)
-Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
----
- config/kernel-dentry-operations.m4 | 10 +++-
- include/os/linux/kernel/linux/dcache_compat.h | 26 ---------
- module/os/linux/zfs/zpl_ctldir.c | 55 ++++++++++++++++---
- 3 files changed, 55 insertions(+), 36 deletions(-)
-
-diff --git a/config/kernel-dentry-operations.m4 b/config/kernel-dentry-operations.m4
-index aa5a9f2aff3927626bef3a8121716e6251dcc1ad..9d1bb3a74b1db03013eb951bea43d069707fe6ee 100644
---- a/config/kernel-dentry-operations.m4
-+++ b/config/kernel-dentry-operations.m4
-@@ -24,6 +24,9 @@ dnl #
- dnl # 2.6.38 API change
- dnl # Added d_set_d_op() helper function.
- dnl #
-+dnl # 6.17 API change
-+dnl # d_set_d_op() removed. No direct replacement.
-+dnl #
- AC_DEFUN([ZFS_AC_KERNEL_SRC_D_SET_D_OP], [
- ZFS_LINUX_TEST_SRC([d_set_d_op], [
- #include <linux/dcache.h>
-@@ -34,11 +37,12 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_D_SET_D_OP], [
-
- AC_DEFUN([ZFS_AC_KERNEL_D_SET_D_OP], [
- AC_MSG_CHECKING([whether d_set_d_op() is available])
-- ZFS_LINUX_TEST_RESULT_SYMBOL([d_set_d_op],
-- [d_set_d_op], [fs/dcache.c], [
-+ ZFS_LINUX_TEST_RESULT([d_set_d_op], [
- AC_MSG_RESULT(yes)
-+ AC_DEFINE(HAVE_D_SET_D_OP, 1,
-+ [Define if d_set_d_op() is available])
- ], [
-- ZFS_LINUX_TEST_ERROR([d_set_d_op])
-+ AC_MSG_RESULT(no)
- ])
- ])
-
-diff --git a/include/os/linux/kernel/linux/dcache_compat.h b/include/os/linux/kernel/linux/dcache_compat.h
-index 16e8a319a5f83f41588ec62477a0e4729ec030d7..152e5a606f0e273e364c855391c9d42aec738c20 100644
---- a/include/os/linux/kernel/linux/dcache_compat.h
-+++ b/include/os/linux/kernel/linux/dcache_compat.h
-@@ -60,32 +60,6 @@
- } while (0)
- #endif
-
--/*
-- * 2.6.30 API change,
-- * The const keyword was added to the 'struct dentry_operations' in
-- * the dentry structure. To handle this we define an appropriate
-- * dentry_operations_t typedef which can be used.
-- */
--typedef const struct dentry_operations dentry_operations_t;
--
--/*
-- * 2.6.38 API addition,
-- * Added d_clear_d_op() helper function which clears some flags and the
-- * registered dentry->d_op table. This is required because d_set_d_op()
-- * issues a warning when the dentry operations table is already set.
-- * For the .zfs control directory to work properly we must be able to
-- * override the default operations table and register custom .d_automount
-- * and .d_revalidate callbacks.
-- */
--static inline void
--d_clear_d_op(struct dentry *dentry)
--{
-- dentry->d_op = NULL;
-- dentry->d_flags &= ~(
-- DCACHE_OP_HASH | DCACHE_OP_COMPARE |
-- DCACHE_OP_REVALIDATE | DCACHE_OP_DELETE);
--}
--
- /*
- * Walk and invalidate all dentry aliases of an inode
- * unless it's a mountpoint
-diff --git a/module/os/linux/zfs/zpl_ctldir.c b/module/os/linux/zfs/zpl_ctldir.c
-index 48dae79a237393a278fee972a90f2242cac48ea7..81ac26cb0c93a8faf7e6ba1bfe53982ef06191de 100644
---- a/module/os/linux/zfs/zpl_ctldir.c
-+++ b/module/os/linux/zfs/zpl_ctldir.c
-@@ -202,7 +202,7 @@ zpl_snapdir_revalidate(struct dentry *dentry, unsigned int flags)
- return (!!dentry->d_inode);
- }
-
--static dentry_operations_t zpl_dops_snapdirs = {
-+static const struct dentry_operations zpl_dops_snapdirs = {
- /*
- * Auto mounting of snapshots is only supported for 2.6.37 and
- * newer kernels. Prior to this kernel the ops->follow_link()
-@@ -215,6 +215,51 @@ static dentry_operations_t zpl_dops_snapdirs = {
- .d_revalidate = zpl_snapdir_revalidate,
- };
-
-+/*
-+ * For the .zfs control directory to work properly we must be able to override
-+ * the default operations table and register custom .d_automount and
-+ * .d_revalidate callbacks.
-+ */
-+static void
-+set_snapdir_dentry_ops(struct dentry *dentry, unsigned int extraflags) {
-+ static const unsigned int op_flags =
-+ DCACHE_OP_HASH | DCACHE_OP_COMPARE |
-+ DCACHE_OP_REVALIDATE | DCACHE_OP_DELETE |
-+ DCACHE_OP_PRUNE | DCACHE_OP_WEAK_REVALIDATE | DCACHE_OP_REAL;
-+
-+#ifdef HAVE_D_SET_D_OP
-+ /*
-+ * d_set_d_op() will set the DCACHE_OP_ flags according to what it
-+ * finds in the passed dentry_operations, so we don't have to.
-+ *
-+ * We clear the flags and the old op table before calling d_set_d_op()
-+ * because issues a warning when the dentry operations table is already
-+ * set.
-+ */
-+ dentry->d_op = NULL;
-+ dentry->d_flags &= ~op_flags;
-+ d_set_d_op(dentry, &zpl_dops_snapdirs);
-+ dentry->d_flags |= extraflags;
-+#else
-+ /*
-+ * Since 6.17 there's no exported way to modify dentry ops, so we have
-+ * to reach in and do it ourselves. This should be safe for our very
-+ * narrow use case, which is to create or splice in an entry to give
-+ * access to a snapshot.
-+ *
-+ * We need to set the op flags directly. We hardcode
-+ * DCACHE_OP_REVALIDATE because that's the only operation we have; if
-+ * we ever extend zpl_dops_snapdirs we will need to update the op flags
-+ * to match.
-+ */
-+ spin_lock(&dentry->d_lock);
-+ dentry->d_op = &zpl_dops_snapdirs;
-+ dentry->d_flags &= ~op_flags;
-+ dentry->d_flags |= DCACHE_OP_REVALIDATE | extraflags;
-+ spin_unlock(&dentry->d_lock);
-+#endif
-+}
-+
- static struct dentry *
- zpl_snapdir_lookup(struct inode *dip, struct dentry *dentry,
- unsigned int flags)
-@@ -236,10 +281,7 @@ zpl_snapdir_lookup(struct inode *dip, struct dentry *dentry,
- return (ERR_PTR(error));
-
- ASSERT(error == 0 || ip == NULL);
-- d_clear_d_op(dentry);
-- d_set_d_op(dentry, &zpl_dops_snapdirs);
-- dentry->d_flags |= DCACHE_NEED_AUTOMOUNT;
--
-+ set_snapdir_dentry_ops(dentry, DCACHE_NEED_AUTOMOUNT);
- return (d_splice_alias(ip, dentry));
- }
-
-@@ -373,8 +415,7 @@ zpl_snapdir_mkdir(struct inode *dip, struct dentry *dentry, umode_t mode)
-
- error = -zfsctl_snapdir_mkdir(dip, dname(dentry), vap, &ip, cr, 0);
- if (error == 0) {
-- d_clear_d_op(dentry);
-- d_set_d_op(dentry, &zpl_dops_snapdirs);
-+ set_snapdir_dentry_ops(dentry, 0);
- d_instantiate(dentry, ip);
- }
-
diff --git a/debian/patches/0011-Linux-6.17-compat-META.patch b/debian/patches/0011-Linux-6.17-compat-META.patch
deleted file mode 100644
index d759e2a53..000000000
--- a/debian/patches/0011-Linux-6.17-compat-META.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Brian Behlendorf <behlendorf1@llnl.gov>
-Date: Fri, 26 Sep 2025 10:00:18 -0700
-Subject: [PATCH] Linux 6.17 compat: META
-
-Update the META file to reflect compatibility with the 6.17
-kernel.
-
-Reviewed-by: Alexander Motin <alexander.motin@TrueNAS.com>
-Reviewed-by: Rob Norris <robn@despairlabs.com>
-Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Closes #17789
-(cherry picked from commit 654a2ccc74fcc8fc97aae54e2ce1de647d587ae2)
-Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
----
- META | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/META b/META
-index f2c90626528b48f00c122a7ca7f208d7691eeac0..c96da9b726b1467111cd726f57914e4c635564af 100644
---- a/META
-+++ b/META
-@@ -6,5 +6,5 @@ Release: 1
- Release-Tags: relext
- License: CDDL
- Author: OpenZFS
--Linux-Maximum: 6.16
-+Linux-Maximum: 6.17
- Linux-Minimum: 4.18
diff --git a/debian/patches/series b/debian/patches/series
index 456eb94ee..e6637ed22 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,7 +5,4 @@
0005-Enable-zed-emails.patch
0006-dont-symlink-zed-scripts.patch
0007-Add-systemd-unit-for-importing-specific-pools.patch
-0008-Patch-move-manpage-arcstat-1-to-arcstat-8.patch
-0009-zpool-status-tighten-bounds-for-noalloc-stat-availab.patch
-0010-Linux-6.17-d_set_d_op-is-no-longer-available.patch
-0011-Linux-6.17-compat-META.patch
+0008-zpool-status-tighten-bounds-for-noalloc-stat-availab.patch
diff --git a/upstream b/upstream
index 34f96a15c..743334913 160000
--- a/upstream
+++ b/upstream
@@ -1 +1 @@
-Subproject commit 34f96a15c73eab27dd6ad17bb5f1263bf26e37d7
+Subproject commit 743334913e5a5f60baf287bcc6d8a23515b02ac5
--
2.47.3
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 7+ messages in thread
* [pve-devel] [PATCH zfsonlinux 2/6] Bump SONAME to libzfs7 and libzpool7
2026-01-13 14:07 [pve-devel] [PATCH zfsonlinux 0/6] update zfs to 2.4.0 Stoiko Ivanov
2026-01-13 14:07 ` [pve-devel] [PATCH zfsonlinux 1/6] update submodule to 2.4.0 and refresh patches Stoiko Ivanov
@ 2026-01-13 14:07 ` Stoiko Ivanov
2026-01-13 14:07 ` [pve-devel] [PATCH zfsonlinux 3/6] d/: rename arcstat and arc_summary to zarcstat and zarcsummary Stoiko Ivanov
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Stoiko Ivanov @ 2026-01-13 14:07 UTC (permalink / raw)
To: pve-devel
follows debian-upstream https://salsa.debian.org/zfsonlinux-team/zfs
2d9f5b6dc ("Bump SONAME to libzfs7 and libzpool7").
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
Makefile | 4 ++--
debian/control | 19 ++++++++++---------
.../{libzfs6linux.docs => libzfs7linux.docs} | 0
...nux.install.in => libzfs7linux.install.in} | 0
...errides => libzfs7linux.lintian-overrides} | 0
...ibzfs6linux.postrm => libzfs7linux.postrm} | 0
...zfs6linux.preinst => libzfs7linux.preinst} | 0
...ibzpool6linux.docs => libzpool7linux.docs} | 0
...x.install.in => libzpool7linux.install.in} | 0
...rides => libzpool7linux.lintian-overrides} | 0
10 files changed, 12 insertions(+), 11 deletions(-)
rename debian/{libzfs6linux.docs => libzfs7linux.docs} (100%)
rename debian/{libzfs6linux.install.in => libzfs7linux.install.in} (100%)
rename debian/{libzfs6linux.lintian-overrides => libzfs7linux.lintian-overrides} (100%)
rename debian/{libzfs6linux.postrm => libzfs7linux.postrm} (100%)
rename debian/{libzfs6linux.preinst => libzfs7linux.preinst} (100%)
rename debian/{libzpool6linux.docs => libzpool7linux.docs} (100%)
rename debian/{libzpool6linux.install.in => libzpool7linux.install.in} (100%)
rename debian/{libzpool6linux.lintian-overrides => libzpool7linux.lintian-overrides} (100%)
diff --git a/Makefile b/Makefile
index 4f27fca07..96857f5dc 100644
--- a/Makefile
+++ b/Makefile
@@ -12,9 +12,9 @@ ZFS_DEB1= libnvpair3linux_$(DEB_VERSION)_amd64.deb
ZFS_DEB_BINARY = \
libpam-zfs_$(DEB_VERSION)_amd64.deb \
libuutil3linux_$(DEB_VERSION)_amd64.deb \
-libzfs6linux_$(DEB_VERSION)_amd64.deb \
+libzfs7linux_$(DEB_VERSION)_amd64.deb \
libzfsbootenv1linux_$(DEB_VERSION)_amd64.deb \
-libzpool6linux_$(DEB_VERSION)_amd64.deb \
+libzpool7linux_$(DEB_VERSION)_amd64.deb \
zfs-test_$(DEB_VERSION)_amd64.deb \
zfsutils-linux_$(DEB_VERSION)_amd64.deb \
zfs-zed_$(DEB_VERSION)_amd64.deb
diff --git a/debian/control b/debian/control
index 9e70a51c4..de6770162 100644
--- a/debian/control
+++ b/debian/control
@@ -78,9 +78,9 @@ Depends: libblkid-dev,
libssl-dev | libssl1.0-dev,
libtirpc-dev,
libuutil3linux (= ${binary:Version}),
- libzfs6linux (= ${binary:Version}),
+ libzfs7linux (= ${binary:Version}),
libzfsbootenv1linux (= ${binary:Version}),
- libzpool6linux (= ${binary:Version}),
+ libzpool7linux (= ${binary:Version}),
zlib1g-dev,
${misc:Depends},
Provides: libnvpair-dev, libuutil-dev,
@@ -89,9 +89,9 @@ Description: OpenZFS filesystem development files for Linux
libraries of OpenZFS filesystem.
.
This package includes the development files of libnvpair3, libuutil3,
- libzpool6 and libzfs6, libzfsbootenv1.
+ libzpool7 and libzfs7, libzfsbootenv1.
-Package: libzfs6linux
+Package: libzfs7linux
Section: contrib/libs
Architecture: linux-any
Multi-Arch: same
@@ -99,8 +99,9 @@ Depends: ${misc:Depends}, ${shlibs:Depends},
# The libcurl4 is loaded through dlopen("libcurl.so.4").
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=988521
Recommends: libcurl4,
-Breaks: libzfs2, libzfs2linux, libzfs3linux, libzfs4, libzfs4linux,
-Replaces: libzfs2, libzfs2linux, libzfs3linux, libzfs4, libzfs4linux,
+# libzfs_core.so.3 is installed by libzfs7linux, so we need breaks/replaces
+Breaks: libzfs2, libzfs2linux, libzfs3linux, libzfs4, libzfs4linux, libzfs6linux,
+Replaces: libzfs2, libzfs2linux, libzfs3linux, libzfs4, libzfs4linux, libzfs6linux,
Description: OpenZFS filesystem library for Linux - general support
OpenZFS is a storage platform that encompasses the functionality of
traditional filesystems and volume managers. It supports data checksums,
@@ -122,13 +123,13 @@ Description: OpenZFS filesystem library for Linux
.
The zfsbootenv library provides support for modifying ZFS label information.
-Package: libzpool6linux
+Package: libzpool7linux
Section: contrib/libs
Architecture: linux-any
Multi-Arch: same
Depends: ${misc:Depends}, ${shlibs:Depends},
-Breaks: libzpool2, libzpool2linux, libzpool3linux, libzpool4, libzpool5linux,
-Replaces: libzpool2, libzpool2linux, libzpool3linux, libzpool4, libzpool5linux,
+Breaks: libzpool2, libzpool5
+Replaces: libzpool2, libzpool5
Description: OpenZFS pool library for Linux
OpenZFS is a storage platform that encompasses the functionality of
traditional filesystems and volume managers. It supports data checksums,
diff --git a/debian/libzfs6linux.docs b/debian/libzfs7linux.docs
similarity index 100%
rename from debian/libzfs6linux.docs
rename to debian/libzfs7linux.docs
diff --git a/debian/libzfs6linux.install.in b/debian/libzfs7linux.install.in
similarity index 100%
rename from debian/libzfs6linux.install.in
rename to debian/libzfs7linux.install.in
diff --git a/debian/libzfs6linux.lintian-overrides b/debian/libzfs7linux.lintian-overrides
similarity index 100%
rename from debian/libzfs6linux.lintian-overrides
rename to debian/libzfs7linux.lintian-overrides
diff --git a/debian/libzfs6linux.postrm b/debian/libzfs7linux.postrm
similarity index 100%
rename from debian/libzfs6linux.postrm
rename to debian/libzfs7linux.postrm
diff --git a/debian/libzfs6linux.preinst b/debian/libzfs7linux.preinst
similarity index 100%
rename from debian/libzfs6linux.preinst
rename to debian/libzfs7linux.preinst
diff --git a/debian/libzpool6linux.docs b/debian/libzpool7linux.docs
similarity index 100%
rename from debian/libzpool6linux.docs
rename to debian/libzpool7linux.docs
diff --git a/debian/libzpool6linux.install.in b/debian/libzpool7linux.install.in
similarity index 100%
rename from debian/libzpool6linux.install.in
rename to debian/libzpool7linux.install.in
diff --git a/debian/libzpool6linux.lintian-overrides b/debian/libzpool7linux.lintian-overrides
similarity index 100%
rename from debian/libzpool6linux.lintian-overrides
rename to debian/libzpool7linux.lintian-overrides
--
2.47.3
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 7+ messages in thread
* [pve-devel] [PATCH zfsonlinux 3/6] d/: rename arcstat and arc_summary to zarcstat and zarcsummary
2026-01-13 14:07 [pve-devel] [PATCH zfsonlinux 0/6] update zfs to 2.4.0 Stoiko Ivanov
2026-01-13 14:07 ` [pve-devel] [PATCH zfsonlinux 1/6] update submodule to 2.4.0 and refresh patches Stoiko Ivanov
2026-01-13 14:07 ` [pve-devel] [PATCH zfsonlinux 2/6] Bump SONAME to libzfs7 and libzpool7 Stoiko Ivanov
@ 2026-01-13 14:07 ` Stoiko Ivanov
2026-01-13 14:07 ` [pve-devel] [PATCH zfsonlinux 4/6] d/libzfs7linux: update usr-merge-related maintainer scripts after trixie release (see: #1092598) Stoiko Ivanov
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Stoiko Ivanov @ 2026-01-13 14:07 UTC (permalink / raw)
To: pve-devel
follows debian-upstream https://salsa.debian.org/zfsonlinux-team/zfs
519efec9d ("d/: rename arcstat and arc_summary to zarcstat and zarcsummary, no longer conflicts with nordugrid-arc-client")
and
5af292abd ("d/copyright: fix patterns according to filename changes")
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
debian/control | 2 +-
debian/copyright | 4 ++--
debian/zfsutils-linux.install | 8 ++++----
debian/zfsutils-linux.links | 1 -
debian/zfsutils-linux.lintian-overrides | 4 ++--
5 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/debian/control b/debian/control
index de6770162..8e3c23e37 100644
--- a/debian/control
+++ b/debian/control
@@ -215,7 +215,7 @@ Architecture: linux-any
Depends: python3, ${misc:Depends}, ${shlibs:Depends},
Recommends: zfs-zed,
Suggests: nfs-kernel-server, samba-common-bin (>= 3.0.23), zfs-initramfs,
-Conflicts: zfs, zfs-fuse, nordugrid-arc-client
+Conflicts: zfs, zfs-fuse
Provides: zfsutils,
Description: command-line tools to manage OpenZFS filesystems
OpenZFS is a storage platform that encompasses the functionality of
diff --git a/debian/copyright b/debian/copyright
index 71c85d53c..ef81e9e06 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -37,7 +37,7 @@ Copyright: 2011, 2013, Nexenta Systems, Inc.
2007, 2009, Sun Microsystems, Inc.
License: CDDL-1.0
-Files: cmd/arc_summary
+Files: cmd/zarcsummary
Copyright:
2010, 2011, Jason J. Hellenthal <jhell@DataIX.net>
2010, Martin Matuska <mm@FreeBSD.org>
@@ -45,7 +45,7 @@ Copyright:
2017, Scot W. Stevenson <scot.stevenson@gmail.com>
License: BSD-2-clause
-Files: cmd/arcstat.in
+Files: cmd/zarcstat.in
Source: http://github.com/mharsch/arcstat
Copyright:
2007, Oracle and/or its affiliates.
diff --git a/debian/zfsutils-linux.install b/debian/zfsutils-linux.install
index 5a5284027..22b403f8f 100644
--- a/debian/zfsutils-linux.install
+++ b/debian/zfsutils-linux.install
@@ -29,9 +29,9 @@ usr/lib/udev/
usr/lib/zfs-linux/zfs_prepare_disk
usr/lib/zfs-linux/zpool.d/
usr/lib/zfs-linux/zpool_influxdb
-usr/bin/arc_summary
-usr/bin/arcstat usr/sbin
-usr/bin/dbufstat usr/sbin
+usr/bin/zarcsummary
+usr/bin/zarcstat
+usr/bin/dbufstat
usr/sbin/fsck.zfs
usr/sbin/mount.zfs
usr/sbin/zdb
@@ -43,6 +43,7 @@ usr/sbin/zpool
usr/sbin/zstream
usr/sbin/zstreamdump
usr/share/bash-completion/completions
+usr/share/man/man1/zarcstat.1
usr/share/man/man1/zhack.1
usr/share/man/man1/zvol_wait.1
usr/share/man/man4/spl.4
@@ -54,7 +55,6 @@ usr/share/man/man7/zfsprops.7
usr/share/man/man7/zpool-features.7
usr/share/man/man7/zpoolconcepts.7
usr/share/man/man7/zpoolprops.7
-usr/share/man/man8/arcstat.8
usr/share/man/man8/fsck.zfs.8
usr/share/man/man8/mount.zfs.8
usr/share/man/man8/vdev_id.8
diff --git a/debian/zfsutils-linux.links b/debian/zfsutils-linux.links
index 3c3fc442b..bb2454916 100644
--- a/debian/zfsutils-linux.links
+++ b/debian/zfsutils-linux.links
@@ -1,6 +1,5 @@
usr/sbin/zfs usr/bin/zfs
usr/sbin/zpool usr/bin/zpool
usr/lib/zfs-linux/zpool_influxdb usr/bin/zpool_influxdb
-usr/bin/arc_summary usr/sbin/arc_summary
usr/bin/zilstat usr/sbin/zilstat
usr/bin/zvol_wait usr/sbin/zvol_wait
diff --git a/debian/zfsutils-linux.lintian-overrides b/debian/zfsutils-linux.lintian-overrides
index 3cc548e88..9cbdc4e76 100644
--- a/debian/zfsutils-linux.lintian-overrides
+++ b/debian/zfsutils-linux.lintian-overrides
@@ -1,7 +1,7 @@
spare-manual-page
systemd-service-file-refers-to-unusual-wantedby-target
-no-manual-page [usr/sbin/dbufstat]
-no-manual-page [usr/sbin/arc_summary]
+no-manual-page [usr/bin/dbufstat]
+no-manual-page [usr/bin/zarcsummary]
no-manual-page [usr/sbin/zilstat]
groff-message
appstream-metadata-missing-modalias-provide
--
2.47.3
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 7+ messages in thread
* [pve-devel] [PATCH zfsonlinux 4/6] d/libzfs7linux: update usr-merge-related maintainer scripts after trixie release (see: #1092598)
2026-01-13 14:07 [pve-devel] [PATCH zfsonlinux 0/6] update zfs to 2.4.0 Stoiko Ivanov
` (2 preceding siblings ...)
2026-01-13 14:07 ` [pve-devel] [PATCH zfsonlinux 3/6] d/: rename arcstat and arc_summary to zarcstat and zarcsummary Stoiko Ivanov
@ 2026-01-13 14:07 ` Stoiko Ivanov
2026-01-13 14:07 ` [pve-devel] [PATCH zfsonlinux 5/6] d/control: update usage of auto-generated fields Stoiko Ivanov
2026-01-13 14:07 ` [pve-devel] [PATCH zfsonlinux 6/6] d/control: bump std-ver to 4.7.3 (no changes needed) Stoiko Ivanov
5 siblings, 0 replies; 7+ messages in thread
From: Stoiko Ivanov @ 2026-01-13 14:07 UTC (permalink / raw)
To: pve-devel
clean cherry-pick from https://salsa.debian.org/zfsonlinux-team/zfs
Signed-off-by: Shengqi Chen <harry-chen@outlook.com>
(cherry picked from commit 3d8211b1b4d4f9f3d50d67cf41a27338effea360)
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
...libzfs7linux.postrm => libzfs7linux.postinst} | 3 ++-
debian/libzfs7linux.preinst | 16 ----------------
2 files changed, 2 insertions(+), 17 deletions(-)
rename debian/{libzfs7linux.postrm => libzfs7linux.postinst} (79%)
delete mode 100644 debian/libzfs7linux.preinst
diff --git a/debian/libzfs7linux.postrm b/debian/libzfs7linux.postinst
similarity index 79%
rename from debian/libzfs7linux.postrm
rename to debian/libzfs7linux.postinst
index ae6478653..14f9baec9 100644
--- a/debian/libzfs7linux.postrm
+++ b/debian/libzfs7linux.postinst
@@ -2,9 +2,10 @@
set -e
-if test "$1" = remove; then
+if test "$1" = configure; then
# DEP17 P1 M8. Clean up after libzfs6linux.preinst. This code should be
# removed once the diversions are deleted via postinst.
+ # see: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1092598
for lib in zfs_core.so.3 zfs_core.so.3.0.0; do
dpkg-divert --package libzfs6linux --no-rename --divert "/lib/#DEB_HOST_MULTIARCH#/lib$lib.usr-is-merged" --remove "/lib/#DEB_HOST_MULTIARCH#/lib$lib"
done
diff --git a/debian/libzfs7linux.preinst b/debian/libzfs7linux.preinst
deleted file mode 100644
index 6d1870785..000000000
--- a/debian/libzfs7linux.preinst
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if test "$1" = install -o "$1" = upgrade; then
- # DEP17 P1 M8: Divert aliased files to avoid their removal deleting the
- # moved ones. These diversions should be removed via postinst once
- # trixie is released.
- for lib in zfs_core.so.3 zfs_core.so.3.0.0; do
- dpkg-divert --package libzfs6linux --no-rename --divert "/lib/#DEB_HOST_MULTIARCH#/lib$lib.usr-is-merged" --add "/lib/#DEB_HOST_MULTIARCH#/lib$lib"
- done
-fi
-
-#DEBHELPER#
-
-exit 0
--
2.47.3
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 7+ messages in thread
* [pve-devel] [PATCH zfsonlinux 5/6] d/control: update usage of auto-generated fields
2026-01-13 14:07 [pve-devel] [PATCH zfsonlinux 0/6] update zfs to 2.4.0 Stoiko Ivanov
` (3 preceding siblings ...)
2026-01-13 14:07 ` [pve-devel] [PATCH zfsonlinux 4/6] d/libzfs7linux: update usr-merge-related maintainer scripts after trixie release (see: #1092598) Stoiko Ivanov
@ 2026-01-13 14:07 ` Stoiko Ivanov
2026-01-13 14:07 ` [pve-devel] [PATCH zfsonlinux 6/6] d/control: bump std-ver to 4.7.3 (no changes needed) Stoiko Ivanov
5 siblings, 0 replies; 7+ messages in thread
From: Stoiko Ivanov @ 2026-01-13 14:07 UTC (permalink / raw)
To: pve-devel
follows debian-upstream https://salsa.debian.org/zfsonlinux-team/zfs
0c994744d ("d/control: update usage of auto-generated fields")
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
debian/control | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index 8e3c23e37..e98a3e889 100644
--- a/debian/control
+++ b/debian/control
@@ -162,7 +162,8 @@ Package: pyzfs-doc
Section: contrib/doc
Architecture: all
Multi-Arch: foreign
-Depends: ${misc:Depends}, ${sphinxdoc:Built-Using}, ${sphinxdoc:Depends},
+Depends: ${misc:Depends}, ${sphinxdoc:Depends},
+Static-built-Using: ${sphinxdoc:Built-Using}
Recommends: python3-pyzfs,
Description: wrapper for libzfs_core C library (documentation)
libzfs_core is intended to be a stable interface for programmatic
--
2.47.3
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 7+ messages in thread
* [pve-devel] [PATCH zfsonlinux 6/6] d/control: bump std-ver to 4.7.3 (no changes needed)
2026-01-13 14:07 [pve-devel] [PATCH zfsonlinux 0/6] update zfs to 2.4.0 Stoiko Ivanov
` (4 preceding siblings ...)
2026-01-13 14:07 ` [pve-devel] [PATCH zfsonlinux 5/6] d/control: update usage of auto-generated fields Stoiko Ivanov
@ 2026-01-13 14:07 ` Stoiko Ivanov
5 siblings, 0 replies; 7+ messages in thread
From: Stoiko Ivanov @ 2026-01-13 14:07 UTC (permalink / raw)
To: pve-devel
follows debian-upstream https://salsa.debian.org/zfsonlinux-team/zfs
d32166789 ("d/control: bump std-ver to 4.7.3 (no changes needed)")
re-verified with:
https://www.debian.org/doc/debian-policy/upgrading-checklist.html
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
debian/control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index e98a3e889..513884849 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Build-Depends: debhelper-compat (= 13),
python3-sphinx,
uuid-dev,
zlib1g-dev,
-Standards-Version: 4.7.2
+Standards-Version: 4.7.3
Homepage: https://www.zfsonlinux.org/
Vcs-Git: https://git.proxmox.com/git/zfsonlinux.git
Vcs-Browser: https://git.proxmox.com/?p=zfsonlinux.git;a=summary
--
2.47.3
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2026-01-13 14:11 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-01-13 14:07 [pve-devel] [PATCH zfsonlinux 0/6] update zfs to 2.4.0 Stoiko Ivanov
2026-01-13 14:07 ` [pve-devel] [PATCH zfsonlinux 1/6] update submodule to 2.4.0 and refresh patches Stoiko Ivanov
2026-01-13 14:07 ` [pve-devel] [PATCH zfsonlinux 2/6] Bump SONAME to libzfs7 and libzpool7 Stoiko Ivanov
2026-01-13 14:07 ` [pve-devel] [PATCH zfsonlinux 3/6] d/: rename arcstat and arc_summary to zarcstat and zarcsummary Stoiko Ivanov
2026-01-13 14:07 ` [pve-devel] [PATCH zfsonlinux 4/6] d/libzfs7linux: update usr-merge-related maintainer scripts after trixie release (see: #1092598) Stoiko Ivanov
2026-01-13 14:07 ` [pve-devel] [PATCH zfsonlinux 5/6] d/control: update usage of auto-generated fields Stoiko Ivanov
2026-01-13 14:07 ` [pve-devel] [PATCH zfsonlinux 6/6] d/control: bump std-ver to 4.7.3 (no changes needed) Stoiko Ivanov
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.