Compare commits
5 Commits
81d11761c3
...
6c9ff9b992
| Author | SHA1 | Date | |
|---|---|---|---|
| 6c9ff9b992 | |||
| b48cfd2b15 | |||
| a5e0251015 | |||
| 838cd1d173 | |||
| 5f4f0445f4 |
Vendored
+15
@@ -1,3 +1,18 @@
|
||||
zfs-linux (2.2.3-pve1) bookworm; urgency=medium
|
||||
|
||||
* update to new ZFS upstream 2.2.3 release
|
||||
|
||||
* fix #5288: correctly handle zvols with more than 15 partitions in udev
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Mon, 11 Mar 2024 13:42:50 +0100
|
||||
|
||||
zfs-linux (2.2.2-pve2) bookworm; urgency=medium
|
||||
|
||||
* fix #5101: ensure datasets that have sharenfs enabled are not unexported
|
||||
after a `zfs mount -a` call.
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Mon, 19 Feb 2024 16:56:37 +0100
|
||||
|
||||
zfs-linux (2.2.2-pve1) bookworm; urgency=medium
|
||||
|
||||
* update to new ZFS upstream 2.2.2 release, as we have all important fixes
|
||||
|
||||
+1
-1
@@ -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 78dc1afc7..41d5539ea 100644
|
||||
index bc269b155..e6d4b1703 100644
|
||||
--- a/cmd/zed/zed.d/zed.rc
|
||||
+++ b/cmd/zed/zed.d/zed.rc
|
||||
@@ -41,7 +41,7 @@ ZED_EMAIL_ADDR="root"
|
||||
|
||||
+2
-2
@@ -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 5507f9d3f..98970abfe 100644
|
||||
index 69bf9649a..fd42ce7c1 100644
|
||||
--- a/cmd/zpool/zpool_main.c
|
||||
+++ b/cmd/zpool/zpool_main.c
|
||||
@@ -2478,7 +2478,8 @@ print_status_config(zpool_handle_t *zhp, status_cbdata_t *cb, const char *name,
|
||||
@@ -2616,7 +2616,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)"));
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
|
||||
Date: Wed, 6 Mar 2024 10:39:06 +0100
|
||||
Subject: [PATCH] udev: correctly handle partition #16 and later
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
If a zvol has more than 15 partitions, the minor device number exhausts
|
||||
the slot count reserved for partitions next to the zvol itself. As a
|
||||
result, the minor number cannot be used to determine the partition
|
||||
number for the higher partition, and doing so results in wrong named
|
||||
symlinks being generated by udev.
|
||||
|
||||
Since the partition number is encoded in the block device name anyway,
|
||||
let's just extract it from there instead.
|
||||
|
||||
Fixes: #15904
|
||||
|
||||
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
|
||||
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
|
||||
---
|
||||
udev/zvol_id.c | 9 +++++----
|
||||
1 file changed, 5 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/udev/zvol_id.c b/udev/zvol_id.c
|
||||
index 5960b9787..609349594 100644
|
||||
--- a/udev/zvol_id.c
|
||||
+++ b/udev/zvol_id.c
|
||||
@@ -51,7 +51,7 @@ const char *__asan_default_options(void) {
|
||||
int
|
||||
main(int argc, const char *const *argv)
|
||||
{
|
||||
- if (argc != 2) {
|
||||
+ if (argc != 2 || strncmp(argv[1], "/dev/zd", 7) != 0) {
|
||||
fprintf(stderr, "usage: %s /dev/zdX\n", argv[0]);
|
||||
return (1);
|
||||
}
|
||||
@@ -72,9 +72,10 @@ main(int argc, const char *const *argv)
|
||||
return (1);
|
||||
}
|
||||
|
||||
- unsigned int dev_part = minor(sb.st_rdev) % ZVOL_MINORS;
|
||||
- if (dev_part != 0)
|
||||
- sprintf(zvol_name + strlen(zvol_name), "-part%u", dev_part);
|
||||
+ const char *dev_part = strrchr(dev_name, 'p');
|
||||
+ if (dev_part != NULL) {
|
||||
+ sprintf(zvol_name + strlen(zvol_name), "-part%s", dev_part + 1);
|
||||
+ }
|
||||
|
||||
for (size_t i = 0; i < strlen(zvol_name); ++i)
|
||||
if (isblank(zvol_name[i]))
|
||||
Vendored
+1
@@ -9,3 +9,4 @@
|
||||
0009-arc-stat-summary-guard-access-to-l2arc-MFU-MRU-stats.patch
|
||||
0010-Fix-nfs_truncate_shares-without-etc-exports.d.patch
|
||||
0011-zpool-status-tighten-bounds-for-noalloc-stat-availab.patch
|
||||
0012-udev-correctly-handle-partition-16-and-later.patch
|
||||
|
||||
+1
-1
Submodule upstream updated: 494aaaed89...c883088df8
Reference in New Issue
Block a user