From 8e0b77bbc4870c029fa79007f3753862e1b55383 Mon Sep 17 00:00:00 2001 From: Stoiko Ivanov Date: Fri, 2 Dec 2022 17:32:51 +0100 Subject: [PATCH] update zfs submodule to 2.1.7 and refresh patches Signed-off-by: Stoiko Ivanov --- ...ith-d-dev-disk-by-id-in-scan-service.patch | 2 +- ...md-unit-for-importing-specific-pools.patch | 2 +- ...-guard-access-to-l2arc-MFU-MRU-stats.patch | 2 +- ...ramfs-use-mount.zfs-instead-of-mount.patch | 74 ------------------- .../0013-etc-mask-zfs-load-key.service.patch | 37 ---------- ...ould-have-its-argument-list-marked-v.patch | 40 ---------- debian/patches/series | 3 - upstream | 2 +- 8 files changed, 4 insertions(+), 158 deletions(-) delete mode 100644 debian/patches/0012-initramfs-use-mount.zfs-instead-of-mount.patch delete mode 100644 debian/patches/0013-etc-mask-zfs-load-key.service.patch delete mode 100644 debian/patches/0014-kcfpool_alloc-should-have-its-argument-list-marked-v.patch 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 822409d..5990a67 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 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 d3c083f7e..b1c8c7b9d 100644 +index 598ef501b..e4f3a70c1 100644 --- a/etc/systemd/system/zfs-import-scan.service.in +++ b/etc/systemd/system/zfs-import-scan.service.in @@ -13,7 +13,7 @@ ConditionPathIsDirectory=/sys/module/zfs diff --git a/debian/patches/0008-Add-systemd-unit-for-importing-specific-pools.patch b/debian/patches/0008-Add-systemd-unit-for-importing-specific-pools.patch index 4e7c288..e724b2f 100644 --- a/debian/patches/0008-Add-systemd-unit-for-importing-specific-pools.patch +++ b/debian/patches/0008-Add-systemd-unit-for-importing-specific-pools.patch @@ -31,7 +31,7 @@ index e4056a92c..030611419 100644 enable zfs-mount.service enable zfs-share.service diff --git a/etc/systemd/system/Makefile.am b/etc/systemd/system/Makefile.am -index 5e65e1db4..8e6baeb68 100644 +index 35f833de5..af3ae597c 100644 --- a/etc/systemd/system/Makefile.am +++ b/etc/systemd/system/Makefile.am @@ -7,6 +7,7 @@ systemdunit_DATA = \ diff --git a/debian/patches/0011-arc-stat-summary-guard-access-to-l2arc-MFU-MRU-stats.patch b/debian/patches/0011-arc-stat-summary-guard-access-to-l2arc-MFU-MRU-stats.patch index 0747a1e..020186c 100644 --- a/debian/patches/0011-arc-stat-summary-guard-access-to-l2arc-MFU-MRU-stats.patch +++ b/debian/patches/0011-arc-stat-summary-guard-access-to-l2arc-MFU-MRU-stats.patch @@ -26,7 +26,7 @@ Signed-off-by: Stoiko Ivanov 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/cmd/arc_summary/arc_summary3 b/cmd/arc_summary/arc_summary3 -index 7b28012ed..fe6a6d9e2 100755 +index 301c485b3..ac46f5843 100755 --- a/cmd/arc_summary/arc_summary3 +++ b/cmd/arc_summary/arc_summary3 @@ -617,13 +617,13 @@ def section_arc(kstats_dict): diff --git a/debian/patches/0012-initramfs-use-mount.zfs-instead-of-mount.patch b/debian/patches/0012-initramfs-use-mount.zfs-instead-of-mount.patch deleted file mode 100644 index 84b9c7d..0000000 --- a/debian/patches/0012-initramfs-use-mount.zfs-instead-of-mount.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Damian Szuberski -Date: Tue, 12 Apr 2022 00:51:23 +0200 -Subject: [PATCH] initramfs: use `mount.zfs` instead of `mount` - -A followup to d7a67402a85252e163aa8a9b69e7eda499db8c61 - -For `mount -t zfs -o opts ds mp` command line -some implementations of `mount(8)`, e. g. Busybox in Debian -work as follows: - -``` -newfstatat(AT_FDCWD, "ds", 0x7fff826f4ab0, 0) = -1 -mount("ds", "mp", "zfs", MS_SILENT, NULL) = 0 -``` - -The logic above skips completely `mount.zfs` and prevents us -from reading filesystem properties and applying mount options. - -For comparison, the coreutils `mount(8)` implementation does: - -``` -openat(AT_FDCWD, "/proc/filesystems", O_RDONLY|O_CLOEXEC) = 3 -// figure out that zfs is a `nodev` filesystem and look for a helper -newfstatat(AT_FDCWD, "/sbin/mount.zfs" ...) = 0 -execve("/sbin/mount.zfs" ...) = 0 -``` - -Using `mount.zfs` in initramfs would help circumvent deficiencies -of some of `mount(8)` implementations. `mount -t zfs` translates -to `mount.zfs` invocation, except for cases when explicitly disabled -by `-i`. - -Reviewed-by: Brian Behlendorf -Signed-off-by: szubersk -Closes #13305 -(cherry picked from commit 35d81a75a8c13e011e19fd12cf553d9c5849386e) -(cherry picked from commit 4d22befde60087cbc6174122863353903df1d935) -Signed-off-by: Stoiko Ivanov ---- - contrib/initramfs/scripts/zfs | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/contrib/initramfs/scripts/zfs b/contrib/initramfs/scripts/zfs -index 814547b6f..9169adf5f 100644 ---- a/contrib/initramfs/scripts/zfs -+++ b/contrib/initramfs/scripts/zfs -@@ -326,7 +326,7 @@ mount_fs() - - # Need the _original_ datasets mountpoint! - mountpoint=$(get_fs_value "$fs" mountpoint) -- ZFS_CMD="mount -o zfsutil -t zfs" -+ ZFS_CMD="mount.zfs -o zfsutil" - if [ "$mountpoint" = "legacy" ] || [ "$mountpoint" = "none" ]; then - # Can't use the mountpoint property. Might be one of our - # clones. Check the 'org.zol:mountpoint' property set in -@@ -349,7 +349,7 @@ mount_fs() - # If it's not a legacy filesystem, it can only be a - # native one... - if [ "$mountpoint" = "legacy" ]; then -- ZFS_CMD="mount -t zfs" -+ ZFS_CMD="mount.zfs" - fi - fi - -@@ -915,7 +915,7 @@ mountroot() - echo " not specified on the kernel command line." - echo "" - echo "Manually mount the root filesystem on $rootmnt and then exit." -- echo "Hint: Try: mount -o zfsutil -t zfs ${ZFS_RPOOL-rpool}/ROOT/system $rootmnt" -+ echo "Hint: Try: mount.zfs -o zfsutil ${ZFS_RPOOL-rpool}/ROOT/system $rootmnt" - shell - fi - diff --git a/debian/patches/0013-etc-mask-zfs-load-key.service.patch b/debian/patches/0013-etc-mask-zfs-load-key.service.patch deleted file mode 100644 index c8bb20d..0000000 --- a/debian/patches/0013-etc-mask-zfs-load-key.service.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= -Date: Thu, 13 Oct 2022 00:29:21 +0200 -Subject: [PATCH] etc: mask zfs-load-key.service -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Otherwise, systemd-sysv-generator will generate a service equivalent -that breaks the boot: under systemd this is covered by -zfs-mount-generator - -We already do this for zfs-import.service, and other init scripts are -suppressed automatically by the "actual" .service files - -Fixes: commit f04b97620059d08b37d9e80ada397e742bb2f311 ("Add init script - to load keys") -Reviewed-by: George Melikov -Reviewed-by: Brian Behlendorf -Signed-off-by: Ahelenia Ziemiańska -Closes #14010 -Closes #14019 -(cherry picked from commit 8cf59e97c4fc7b70723313953ceb0f777ca3bcdf) -Signed-off-by: Stoiko Ivanov ---- - etc/systemd/system/Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/etc/systemd/system/Makefile.am b/etc/systemd/system/Makefile.am -index 8e6baeb68..af3ae597c 100644 ---- a/etc/systemd/system/Makefile.am -+++ b/etc/systemd/system/Makefile.am -@@ -23,3 +23,4 @@ SUBSTFILES += $(systemdpreset_DATA) $(systemdunit_DATA) - install-data-hook: - $(MKDIR_P) "$(DESTDIR)$(systemdunitdir)" - ln -sf /dev/null "$(DESTDIR)$(systemdunitdir)/zfs-import.service" -+ ln -sf /dev/null "$(DESTDIR)$(systemdunitdir)/zfs-load-key.service" diff --git a/debian/patches/0014-kcfpool_alloc-should-have-its-argument-list-marked-v.patch b/debian/patches/0014-kcfpool_alloc-should-have-its-argument-list-marked-v.patch deleted file mode 100644 index 2bc6be0..0000000 --- a/debian/patches/0014-kcfpool_alloc-should-have-its-argument-list-marked-v.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Richard Yao -Date: Wed, 12 Oct 2022 18:47:39 -0400 -Subject: [PATCH] kcfpool_alloc() should have its argument list marked void - -This error occurred when building on Gentoo with debugging enabled: - -zfs-kmod-2.1.6/work/zfs-2.1.6/module/icp/core/kcf_sched.c:1277:14: -error: a function declaration without a prototype is deprecated -in all versions of C [-Werror,-Wstrict-prototypes] - kcfpool_alloc() - ^ - void -1 error generated. - -This function is not present in master. - -Reviewed-by: Brian Behlendorf -Reviewed-by: Tony Hutter -Signed-off-by: Richard Yao -Closes #14023 -(cherry picked from commit b0bc882395ed37f60cf9612250cb99b1322cd458) -Signed-off-by: Stoiko Ivanov ---- - module/icp/core/kcf_sched.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/module/icp/core/kcf_sched.c b/module/icp/core/kcf_sched.c -index 81fd15f8e..fa44a4dbf 100644 ---- a/module/icp/core/kcf_sched.c -+++ b/module/icp/core/kcf_sched.c -@@ -1274,7 +1274,7 @@ kcf_aop_done(kcf_areq_node_t *areq, int error) - * Allocate the thread pool and initialize all the fields. - */ - static void --kcfpool_alloc() -+kcfpool_alloc(void) - { - kcfpool = kmem_alloc(sizeof (kcf_pool_t), KM_SLEEP); - diff --git a/debian/patches/series b/debian/patches/series index b436743..d2770d3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -9,6 +9,3 @@ 0009-Patch-move-manpage-arcstat-1-to-arcstat-8.patch 0010-arcstat-Fix-integer-division-with-python3.patch 0011-arc-stat-summary-guard-access-to-l2arc-MFU-MRU-stats.patch -0012-initramfs-use-mount.zfs-instead-of-mount.patch -0013-etc-mask-zfs-load-key.service.patch -0014-kcfpool_alloc-should-have-its-argument-list-marked-v.patch diff --git a/upstream b/upstream index 6a6bd49..21bd766 160000 --- a/upstream +++ b/upstream @@ -1 +1 @@ -Subproject commit 6a6bd493988c75331deab06e5352a9bed035a87d +Subproject commit 21bd7661334cd865d17934bebbcaf8d3356279ee