* [pve-devel] [PATCH zfsonlinux 1/2] update submodule and patches to ZFS 2.1.2
2021-12-23 16:22 [pve-devel] [PATCH zfsonlinux/kernel] update ZFS to 2.1.2 Stoiko Ivanov
@ 2021-12-23 16:22 ` Stoiko Ivanov
2021-12-23 16:22 ` [pve-devel] [PATCH zfsonlinux 2/2] d/rules: allow abigail to fail Stoiko Ivanov
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Stoiko Ivanov @ 2021-12-23 16:22 UTC (permalink / raw)
To: pve-devel
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
debian/patches/0005-Enable-zed-emails.patch | 2 +-
debian/patches/0007-Use-installed-python3.patch | 6 +++---
upstream | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/debian/patches/0005-Enable-zed-emails.patch b/debian/patches/0005-Enable-zed-emails.patch
index e837d7e9..f605a356 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, 2 insertions(+), 2 deletions(-)
diff --git a/cmd/zed/zed.d/zed.rc b/cmd/zed/zed.d/zed.rc
-index df560f921..4ce7af744 100644
+index 1c278b2ef..41c075c09 100644
--- a/cmd/zed/zed.d/zed.rc
+++ b/cmd/zed/zed.d/zed.rc
@@ -15,7 +15,7 @@
diff --git a/debian/patches/0007-Use-installed-python3.patch b/debian/patches/0007-Use-installed-python3.patch
index 33188d49..69e5dd78 100644
--- a/debian/patches/0007-Use-installed-python3.patch
+++ b/debian/patches/0007-Use-installed-python3.patch
@@ -28,7 +28,7 @@ index 3788543b0..c7ee4ae9a 100755
typeset -i cnt=0
diff --git a/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh b/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh
-index 1fd21cbf7..791dd25d5 100755
+index 370f5382e..661fbe85d 100755
--- a/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh
+++ b/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh
@@ -87,7 +87,7 @@ log_must xattrtest -f 10 -x 3 -s 32768 -r -k -p /$TESTPOOL/$TESTFS2/xattrsadir
@@ -41,10 +41,10 @@ index 1fd21cbf7..791dd25d5 100755
log_must zfs set compression=off xattr=on $TESTPOOL/$TESTFS2
diff --git a/tests/zfs-tests/tests/functional/rsend/send_realloc_dnode_size.ksh b/tests/zfs-tests/tests/functional/rsend/send_realloc_dnode_size.ksh
-index 394fe95bb..43560aac5 100755
+index 551ed15db..bd30488ea 100755
--- a/tests/zfs-tests/tests/functional/rsend/send_realloc_dnode_size.ksh
+++ b/tests/zfs-tests/tests/functional/rsend/send_realloc_dnode_size.ksh
-@@ -93,7 +93,7 @@ log_must zfs snapshot $POOL/fs@c
+@@ -88,7 +88,7 @@ log_must zfs snapshot $POOL/fs@c
# 4. Create an empty file and add xattrs to it to exercise reclaiming a
# dnode that requires more than 1 slot for its bonus buffer (Zol #7433)
log_must zfs set compression=on xattr=sa $POOL/fs
diff --git a/upstream b/upstream
index 71c60985..af88d47f 160000
--- a/upstream
+++ b/upstream
@@ -1 +1 @@
-Subproject commit 71c6098526c6d5fbfa84a58cefe6cdc403488d8c
+Subproject commit af88d47f1ee86fae4abcfe0dabca67ea3c94d377
--
2.30.2
^ permalink raw reply [flat|nested] 5+ messages in thread* [pve-devel] [PATCH zfsonlinux 2/2] d/rules: allow abigail to fail
2021-12-23 16:22 [pve-devel] [PATCH zfsonlinux/kernel] update ZFS to 2.1.2 Stoiko Ivanov
2021-12-23 16:22 ` [pve-devel] [PATCH zfsonlinux 1/2] update submodule and patches to ZFS 2.1.2 Stoiko Ivanov
@ 2021-12-23 16:22 ` Stoiko Ivanov
2021-12-23 16:22 ` [pve-devel] [PATCH pve-kernel 1/2] patches: add Author information to disable-split-btf.patch Stoiko Ivanov
2021-12-23 16:22 ` [pve-devel] [PATCH pve-kernel 2/2] drop -ERESTARTSYS handling in blkdev_get_by_dev patch Stoiko Ivanov
3 siblings, 0 replies; 5+ messages in thread
From: Stoiko Ivanov @ 2021-12-23 16:22 UTC (permalink / raw)
To: pve-devel
From: Aron Xu <aron@debian.org>
(cherry picked from debian upstream [0]
commit 5ae98b5499022c2c127d546a7b5aeb906f6f2a6b)
[0] https://salsa.debian.org/zfsonlinux-team/zfs
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
debian/rules | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/rules b/debian/rules
index 826bdc98..e5bb4a56 100755
--- a/debian/rules
+++ b/debian/rules
@@ -50,7 +50,7 @@ override_dh_auto_test:
override_dh_auto_test:
ifeq (amd64,$(DEB_HOST_ARCH))
# Upstream provides an ABI guarantee that we validate here
- $(MAKE) checkabi
+ -$(MAKE) checkabi
endif
# The dh_auto_test rule is disabled because
--
2.30.2
^ permalink raw reply [flat|nested] 5+ messages in thread
* [pve-devel] [PATCH pve-kernel 1/2] patches: add Author information to disable-split-btf.patch
2021-12-23 16:22 [pve-devel] [PATCH zfsonlinux/kernel] update ZFS to 2.1.2 Stoiko Ivanov
2021-12-23 16:22 ` [pve-devel] [PATCH zfsonlinux 1/2] update submodule and patches to ZFS 2.1.2 Stoiko Ivanov
2021-12-23 16:22 ` [pve-devel] [PATCH zfsonlinux 2/2] d/rules: allow abigail to fail Stoiko Ivanov
@ 2021-12-23 16:22 ` Stoiko Ivanov
2021-12-23 16:22 ` [pve-devel] [PATCH pve-kernel 2/2] drop -ERESTARTSYS handling in blkdev_get_by_dev patch Stoiko Ivanov
3 siblings, 0 replies; 5+ messages in thread
From: Stoiko Ivanov @ 2021-12-23 16:22 UTC (permalink / raw)
To: pve-devel
else it is not easily applied with git am (as used by
debian/scripts/import-patchqueue)
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
...Config-disable-module-BTF-debug-info.patch | 23 +++++++++++++++++++
patches/kernel/0009-disable-split-btf.patch | 13 -----------
2 files changed, 23 insertions(+), 13 deletions(-)
create mode 100644 patches/kernel/0009-KConfig-disable-module-BTF-debug-info.patch
delete mode 100644 patches/kernel/0009-disable-split-btf.patch
diff --git a/patches/kernel/0009-KConfig-disable-module-BTF-debug-info.patch b/patches/kernel/0009-KConfig-disable-module-BTF-debug-info.patch
new file mode 100644
index 0000000..5ae57a5
--- /dev/null
+++ b/patches/kernel/0009-KConfig-disable-module-BTF-debug-info.patch
@@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
+Date: Wed, 22 Dec 2021 16:26:22 +0100
+Subject: [PATCH] KConfig: disable module BTF debug info
+
+Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
+---
+ lib/Kconfig.debug | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
+index 2a9b6dcdac4f..ecc18910a6b2 100644
+--- a/lib/Kconfig.debug
++++ b/lib/Kconfig.debug
+@@ -325,7 +325,7 @@ config PAHOLE_HAS_SPLIT_BTF
+ def_bool $(success, test `$(PAHOLE) --version | sed -E 's/v([0-9]+)\.([0-9]+)/\1\2/'` -ge "119")
+
+ config DEBUG_INFO_BTF_MODULES
+- def_bool y
++ def_bool n
+ depends on DEBUG_INFO_BTF && MODULES && PAHOLE_HAS_SPLIT_BTF
+ help
+ Generate compact split BTF type information for kernel modules.
diff --git a/patches/kernel/0009-disable-split-btf.patch b/patches/kernel/0009-disable-split-btf.patch
deleted file mode 100644
index 3f3a498..0000000
--- a/patches/kernel/0009-disable-split-btf.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
-index 25dc20175bba..7ff51a3f65e6 100644
---- a/lib/Kconfig.debug
-+++ b/lib/Kconfig.debug
-@@ -314,7 +314,7 @@ config PAHOLE_HAS_SPLIT_BTF
- def_bool $(success, test `$(PAHOLE) --version | sed -E 's/v([0-9]+)\.([0-9]+)/\1\2/'` -ge "119")
-
- config DEBUG_INFO_BTF_MODULES
-- def_bool y
-+ def_bool n
- depends on DEBUG_INFO_BTF && MODULES && PAHOLE_HAS_SPLIT_BTF
- help
- Generate compact split BTF type information for kernel modules.
--
2.30.2
^ permalink raw reply [flat|nested] 5+ messages in thread
* [pve-devel] [PATCH pve-kernel 2/2] drop -ERESTARTSYS handling in blkdev_get_by_dev patch
2021-12-23 16:22 [pve-devel] [PATCH zfsonlinux/kernel] update ZFS to 2.1.2 Stoiko Ivanov
` (2 preceding siblings ...)
2021-12-23 16:22 ` [pve-devel] [PATCH pve-kernel 1/2] patches: add Author information to disable-split-btf.patch Stoiko Ivanov
@ 2021-12-23 16:22 ` Stoiko Ivanov
3 siblings, 0 replies; 5+ messages in thread
From: Stoiko Ivanov @ 2021-12-23 16:22 UTC (permalink / raw)
To: pve-devel
ZFS 2.1.2 handles this internally
(commit 16da688f2518526389e6bff8370684a1a2a1469c)
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
...onfig-disable-module-BTF-debug-info.patch} | 0
...ove-the-ERESTARTSYS-handling-in-blkd.patch | 40 -------------------
2 files changed, 40 deletions(-)
rename patches/kernel/{0009-KConfig-disable-module-BTF-debug-info.patch => 0008-KConfig-disable-module-BTF-debug-info.patch} (100%)
delete mode 100644 patches/kernel/0008-Revert-block-remove-the-ERESTARTSYS-handling-in-blkd.patch
diff --git a/patches/kernel/0009-KConfig-disable-module-BTF-debug-info.patch b/patches/kernel/0008-KConfig-disable-module-BTF-debug-info.patch
similarity index 100%
rename from patches/kernel/0009-KConfig-disable-module-BTF-debug-info.patch
rename to patches/kernel/0008-KConfig-disable-module-BTF-debug-info.patch
diff --git a/patches/kernel/0008-Revert-block-remove-the-ERESTARTSYS-handling-in-blkd.patch b/patches/kernel/0008-Revert-block-remove-the-ERESTARTSYS-handling-in-blkd.patch
deleted file mode 100644
index 6c51c6e..0000000
--- a/patches/kernel/0008-Revert-block-remove-the-ERESTARTSYS-handling-in-blkd.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Thomas Lamprecht <t.lamprecht@proxmox.com>
-Date: Tue, 9 Nov 2021 12:01:12 +0100
-Subject: [PATCH] Revert "block: remove the -ERESTARTSYS handling in
- blkdev_get_by_dev"
-
-This reverts commit a8ed1a0607cfa5478ff6009539f44790c4d0956d.
-
-It breaks ZFS sometimes:
-https://github.com/openzfs/zfs/issues/12301#issuecomment-873303739
-
-Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
----
- block/bdev.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/block/bdev.c b/block/bdev.c
-index 485a258b0ab3..f93165f05987 100644
---- a/block/bdev.c
-+++ b/block/bdev.c
-@@ -800,6 +800,10 @@ struct block_device *blkdev_get_by_dev(dev_t dev, fmode_t mode, void *holder)
- if (ret)
- return ERR_PTR(ret);
-
-+ /*
-+ * If we lost a race with 'disk' being deleted, try again. See md.c.
-+ */
-+retry:
- bdev = blkdev_get_no_open(dev);
- if (!bdev)
- return ERR_PTR(-ENXIO);
-@@ -852,6 +856,8 @@ struct block_device *blkdev_get_by_dev(dev_t dev, fmode_t mode, void *holder)
- disk_unblock_events(disk);
- put_blkdev:
- blkdev_put_no_open(bdev);
-+ if (ret == -ERESTARTSYS)
-+ goto retry;
- return ERR_PTR(ret);
- }
- EXPORT_SYMBOL(blkdev_get_by_dev);
--
2.30.2
^ permalink raw reply [flat|nested] 5+ messages in thread