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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 389866973E for ; Fri, 12 Feb 2021 18:29:42 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2461B29640 for ; Fri, 12 Feb 2021 18:29:12 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 0CB5029635 for ; Fri, 12 Feb 2021 18:29:07 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id CF83444D95 for ; Fri, 12 Feb 2021 18:29:06 +0100 (CET) From: Stoiko Ivanov To: pve-devel@lists.proxmox.com Date: Fri, 12 Feb 2021 18:28:31 +0100 Message-Id: <20210212172831.26521-1-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.187 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_NUMSUBJECT 0.5 Subject ends in numbers excluding current years RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [service.in] Subject: [pve-devel] [PATCH zfsonlinux] update submodule and patches to zfs-2.0.3 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: Fri, 12 Feb 2021 17:29:42 -0000 Signed-off-by: Stoiko Ivanov --- did a quick test on my zfs storage-replication testcluster: * both systems failed to import their zfs pools upon boot (I'm quite sure it's related to upstream commit 642d86af0d91b2bf88d5ea34cb6888b03c39c459) * both systems were used for running the zfs testsuite - so probably don't really represent a clean production-ready state * importing the pool worked after a manual import (consistently, even after reboots) * did not have similiar issues on 4 other systems I tested this on ...ith-d-dev-disk-by-id-in-scan-service.patch | 2 +- .../0010-Set-file-mode-during-zfs_write.patch | 39 ------------------- debian/patches/series | 1 - upstream | 2 +- 4 files changed, 2 insertions(+), 42 deletions(-) delete mode 100644 debian/patches/0010-Set-file-mode-during-zfs_write.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 12dfde85..46b03fd4 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 6520f3246..1718f98a2 100644 +index f0317e23e..9a5e9cb17 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/0010-Set-file-mode-during-zfs_write.patch b/debian/patches/0010-Set-file-mode-during-zfs_write.patch deleted file mode 100644 index c164d13a..00000000 --- a/debian/patches/0010-Set-file-mode-during-zfs_write.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Antonio Russo -Date: Mon, 8 Feb 2021 10:15:05 -0700 -Subject: [PATCH] Set file mode during zfs_write - -3d40b65 refactored zfs_vnops.c, which shared much code verbatim between -Linux and BSD. After a successful write, the suid/sgid bits are reset, -and the mode to be written is stored in newmode. On Linux, this was -propagated to both the in-memory inode and znode, which is then updated -with sa_update. - -3d40b65 accidentally removed the initialization of newmode, which -happened to occur on the same line as the inode update (which has been -moved out of the function). - -The uninitialized newmode can be saved to disk, leading to a crash on -stat() of that file, in addition to a merely incorrect file mode. - -Reviewed-by: Ryan Moeller -Reviewed-by: Brian Behlendorf -Signed-off-by: Antonio Russo -Closes #11474 -Closes #11576 ---- - module/zfs/zfs_vnops.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/module/zfs/zfs_vnops.c b/module/zfs/zfs_vnops.c -index 17ea788f3..e54488882 100644 ---- a/module/zfs/zfs_vnops.c -+++ b/module/zfs/zfs_vnops.c -@@ -528,6 +528,7 @@ zfs_write(znode_t *zp, uio_t *uio, int ioflag, cred_t *cr) - ((zp->z_mode & S_ISUID) != 0 && uid == 0)) != 0) { - uint64_t newmode; - zp->z_mode &= ~(S_ISUID | S_ISGID); -+ newmode = zp->z_mode; - (void) sa_update(zp->z_sa_hdl, SA_ZPL_MODE(zfsvfs), - (void *)&newmode, sizeof (uint64_t), tx); - } diff --git a/debian/patches/series b/debian/patches/series index bd60b69f..91b8a3b1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,4 +7,3 @@ 0007-Use-installed-python3.patch 0008-Add-systemd-unit-for-importing-specific-pools.patch 0009-Patch-move-manpage-arcstat-1-to-arcstat-8.patch -0010-Set-file-mode-during-zfs_write.patch diff --git a/upstream b/upstream index d022406a..9f5f8662 160000 --- a/upstream +++ b/upstream @@ -1 +1 @@ -Subproject commit d022406a1499279167362f9c36280e1f847204e2 +Subproject commit 9f5f86626620c52ad1bebf27d17cece6a28d39a0 -- 2.20.1