From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id A89F66D2CA for ; Mon, 27 Sep 2021 20:07:53 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9BBE724DB0 for ; Mon, 27 Sep 2021 20:07:23 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 06C0A24D9D for ; Mon, 27 Sep 2021 20:07:22 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id D0DAE44B0C for ; Mon, 27 Sep 2021 20:07:21 +0200 (CEST) From: Stoiko Ivanov To: pve-devel@lists.proxmox.com Date: Mon, 27 Sep 2021 20:07:04 +0200 Message-Id: <20210927180706.3090234-2-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210927180706.3090234-1-s.ivanov@proxmox.com> References: <20210927180706.3090234-1-s.ivanov@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.394 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH zfsonlinux 1/3] update submodule and patches to ZFS 2.1.1-staging X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Sep 2021 18:07:53 -0000 Signed-off-by: Stoiko Ivanov --- ...ith-d-dev-disk-by-id-in-scan-service.patch | 6 +- .../0006-dont-symlink-zed-scripts.patch | 5 +- .../patches/0007-Use-installed-python3.patch | 4 +- ...-move-manpage-arcstat-1-to-arcstat-8.patch | 61 +++++++++---------- upstream | 2 +- 5 files changed, 38 insertions(+), 40 deletions(-) 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 46b03fd4..822409d6 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,15 +14,15 @@ 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 f0317e23e..9a5e9cb17 100644 +index d3c083f7e..b1c8c7b9d 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 [Service] Type=oneshot RemainAfterExit=yes --ExecStart=@sbindir@/zpool import -aN -o cachefile=none -+ExecStart=@sbindir@/zpool import -aN -d /dev/disk/by-id -o cachefile=none +-ExecStart=@sbindir@/zpool import -aN -o cachefile=none $ZPOOL_IMPORT_OPTS ++ExecStart=@sbindir@/zpool import -aN -d /dev/disk/by-id -o cachefile=none $ZPOOL_IMPORT_OPTS [Install] WantedBy=zfs-import.target diff --git a/debian/patches/0006-dont-symlink-zed-scripts.patch b/debian/patches/0006-dont-symlink-zed-scripts.patch index 078f6d6d..60fe5507 100644 --- a/debian/patches/0006-dont-symlink-zed-scripts.patch +++ b/debian/patches/0006-dont-symlink-zed-scripts.patch @@ -16,10 +16,10 @@ Forwarded: no need 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/zed/zed.d/Makefile.am b/cmd/zed/zed.d/Makefile.am -index 8b2d0c200..118c96547 100644 +index 2c8173b3e..ad39292e4 100644 --- a/cmd/zed/zed.d/Makefile.am +++ b/cmd/zed/zed.d/Makefile.am -@@ -48,6 +48,6 @@ install-data-hook: +@@ -49,7 +49,7 @@ install-data-hook: for f in $(zedconfdefaults); do \ test -f "$(DESTDIR)$(zedconfdir)/$${f}" -o \ -L "$(DESTDIR)$(zedconfdir)/$${f}" || \ @@ -27,3 +27,4 @@ index 8b2d0c200..118c96547 100644 + echo "$${f}" >> "$(DESTDIR)$(zedexecdir)/DEFAULT-ENABLED" ; \ done chmod 0600 "$(DESTDIR)$(zedconfdir)/zed.rc" + diff --git a/debian/patches/0007-Use-installed-python3.patch b/debian/patches/0007-Use-installed-python3.patch index 789ce2ad..33188d49 100644 --- a/debian/patches/0007-Use-installed-python3.patch +++ b/debian/patches/0007-Use-installed-python3.patch @@ -28,11 +28,11 @@ 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 f89cb3b31..375d483f7 100755 +index 1fd21cbf7..791dd25d5 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 - # ZoL issue #7432 + # OpenZFS issue #7432 log_must zfs set compression=on xattr=sa $TESTPOOL/$TESTFS2 log_must touch /$TESTPOOL/$TESTFS2/attrs -log_must eval "python -c 'print \"a\" * 4096' | \ diff --git a/debian/patches/0009-Patch-move-manpage-arcstat-1-to-arcstat-8.patch b/debian/patches/0009-Patch-move-manpage-arcstat-1-to-arcstat-8.patch index 917a1815..6b0453b6 100644 --- a/debian/patches/0009-Patch-move-manpage-arcstat-1-to-arcstat-8.patch +++ b/debian/patches/0009-Patch-move-manpage-arcstat-1-to-arcstat-8.patch @@ -8,47 +8,44 @@ Originally-By: Antonio Russo Signed-off-by: Stoiko Ivanov --- - man/man1/Makefile.am | 2 +- - man/man8/Makefile.am | 1 + + man/Makefile.am | 2 +- man/{man1/arcstat.1 => man8/arcstat.8} | 2 +- - 3 files changed, 3 insertions(+), 2 deletions(-) + 2 files changed, 2 insertions(+), 2 deletions(-) rename man/{man1/arcstat.1 => man8/arcstat.8} (99%) -diff --git a/man/man1/Makefile.am b/man/man1/Makefile.am -index 8d7457a3e..101af7b6c 100644 ---- a/man/man1/Makefile.am -+++ b/man/man1/Makefile.am -@@ -1,4 +1,4 @@ --dist_man_MANS = zhack.1 ztest.1 raidz_test.1 zvol_wait.1 arcstat.1 -+dist_man_MANS = zhack.1 ztest.1 raidz_test.1 zvol_wait.1 - EXTRA_DIST = cstyle.1 - - if BUILD_LINUX -diff --git a/man/man8/Makefile.am b/man/man8/Makefile.am -index 07f6aefa6..a757b1c62 100644 ---- a/man/man8/Makefile.am -+++ b/man/man8/Makefile.am -@@ -1,6 +1,7 @@ - include $(top_srcdir)/config/Substfiles.am - - dist_man_MANS = \ -+ arcstat.8 \ - fsck.zfs.8 \ - mount.zfs.8 \ - vdev_id.8 \ +diff --git a/man/Makefile.am b/man/Makefile.am +index 8ab1b7572..8b3dbe633 100644 +--- a/man/Makefile.am ++++ b/man/Makefile.am +@@ -8,7 +8,6 @@ dist_man_MANS = \ + man1/ztest.1 \ + man1/raidz_test.1 \ + man1/zvol_wait.1 \ +- man1/arcstat.1 \ + \ + man5/vdev_id.conf.5 \ + \ +@@ -21,6 +20,7 @@ dist_man_MANS = \ + man7/zpoolconcepts.7 \ + man7/zpoolprops.7 \ + \ ++ man8/arcstat.8 \ + man8/fsck.zfs.8 \ + man8/mount.zfs.8 \ + 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 ca508b49c..0aa81849a 100644 +index a69cd8937..dfe9c971b 100644 --- a/man/man1/arcstat.1 +++ b/man/man8/arcstat.8 @@ -13,7 +13,7 @@ - .\" Copyright (c) 2015 by Delphix. All rights reserved. .\" Copyright (c) 2020 by AJ Jordan. All rights reserved. .\" --.TH ARCSTAT 1 "Oct 20, 2020" OpenZFS -+.TH ARCSTAT 8 "Oct 20, 2020" OpenZFS - .SH NAME - arcstat \- report ZFS ARC and L2ARC statistics - .SH SYNOPSIS + .Dd May 26, 2021 +-.Dt ARCSTAT 1 ++.Dt ARCSTAT 8 + .Os + . + .Sh NAME diff --git a/upstream b/upstream index e9353bc2..71c60985 160000 --- a/upstream +++ b/upstream @@ -1 +1 @@ -Subproject commit e9353bc2ef27c300281574453e0cf5189a375680 +Subproject commit 71c6098526c6d5fbfa84a58cefe6cdc403488d8c -- 2.30.2