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 8557C8654A for ; Thu, 23 Dec 2021 17:23:21 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6E6FF242C5 for ; Thu, 23 Dec 2021 17:22:51 +0100 (CET) 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 BA90C242AA for ; Thu, 23 Dec 2021 17:22:48 +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 52B4546ACE for ; Thu, 23 Dec 2021 17:22:48 +0100 (CET) From: Stoiko Ivanov To: pve-devel@lists.proxmox.com Date: Thu, 23 Dec 2021 17:22:24 +0100 Message-Id: <20211223162224.1120203-5-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211223162224.1120203-1-s.ivanov@proxmox.com> References: <20211223162224.1120203-1-s.ivanov@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.268 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 pve-kernel 2/2] drop -ERESTARTSYS handling in blkdev_get_by_dev patch 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: Thu, 23 Dec 2021 16:23:21 -0000 ZFS 2.1.2 handles this internally (commit 16da688f2518526389e6bff8370684a1a2a1469c) Signed-off-by: Stoiko Ivanov --- ...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 -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 ---- - 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