Skip to content

Commit a5e0251

Browse files
Stoiko IvanovThomasLamprecht
authored andcommitted
update zfs submodule to 2.2.3 and refresh patches
mostly support for newer kernel-versions, and fixes for the BRT bugs discovered with 2.2.0 (BRT remains disabled by default). The update contains a fix for CVE-2020-24370 in lua (which is present in ZFS for channel-programs, which we do not use) - see: openzfs/zfs#15847 for more details. One patch from Stefan Lendl was backported and is now in the ZFS 2.2 branch. Signed-off-by: Stoiko Ivanov <[email protected]>
1 parent 838cd1d commit a5e0251

5 files changed

+4
-136
lines changed

debian/patches/0005-Enable-zed-emails.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Signed-off-by: Thomas Lamprecht <[email protected]>
1313
1 file changed, 1 insertion(+), 1 deletion(-)
1414

1515
diff --git a/cmd/zed/zed.d/zed.rc b/cmd/zed/zed.d/zed.rc
16-
index 78dc1afc7..41d5539ea 100644
16+
index bc269b155..e6d4b1703 100644
1717
--- a/cmd/zed/zed.d/zed.rc
1818
+++ b/cmd/zed/zed.d/zed.rc
1919
@@ -41,7 +41,7 @@ ZED_EMAIL_ADDR="root"

debian/patches/0011-zpool-status-tighten-bounds-for-noalloc-stat-availab.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ Signed-off-by: Thomas Lamprecht <[email protected]>
5151
1 file changed, 2 insertions(+), 1 deletion(-)
5252

5353
diff --git a/cmd/zpool/zpool_main.c b/cmd/zpool/zpool_main.c
54-
index 5507f9d3f..98970abfe 100644
54+
index 69bf9649a..fd42ce7c1 100644
5555
--- a/cmd/zpool/zpool_main.c
5656
+++ b/cmd/zpool/zpool_main.c
57-
@@ -2478,7 +2478,8 @@ print_status_config(zpool_handle_t *zhp, status_cbdata_t *cb, const char *name,
57+
@@ -2616,7 +2616,8 @@ print_status_config(zpool_handle_t *zhp, status_cbdata_t *cb, const char *name,
5858

5959
if (vs->vs_scan_removing != 0) {
6060
(void) printf(gettext(" (removing)"));

debian/patches/0012-fix-mount-do-not-truncate-shares-not-zfs-mount.patch

Lines changed: 0 additions & 131 deletions
This file was deleted.

debian/patches/series

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,3 @@
99
0009-arc-stat-summary-guard-access-to-l2arc-MFU-MRU-stats.patch
1010
0010-Fix-nfs_truncate_shares-without-etc-exports.d.patch
1111
0011-zpool-status-tighten-bounds-for-noalloc-stat-availab.patch
12-
0012-fix-mount-do-not-truncate-shares-not-zfs-mount.patch

upstream

0 commit comments

Comments
 (0)