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 4DAFD728D7 for ; Wed, 16 Jun 2021 09:27:08 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 45FEEE81C for ; Wed, 16 Jun 2021 09:27:07 +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 C99E7E7AD for ; Wed, 16 Jun 2021 09:27:04 +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 A3FEC43677 for ; Wed, 16 Jun 2021 09:27:04 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Wed, 16 Jun 2021 09:26:59 +0200 Message-Id: <20210616072700.54289-8-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210616072700.54289-1-f.ebner@proxmox.com> References: <20210616072700.54289-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.757 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [cephfsplugin.pm] Subject: [pve-devel] [PATCH v2 storage 4/5] cephfs: revert safe-guard check for Luminous 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: Wed, 16 Jun 2021 07:27:08 -0000 It's necessary to be on Nautilus before upgrading to 7.x, so the check is no longer needed. See commit e54c3e334760491954bc42f3585a8b5b136d4b1d. It didn't cleanly revert, because there were cleanups made afterwards. Signed-off-by: Fabian Ebner --- New in v2. PVE/Storage/CephFSPlugin.pm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/PVE/Storage/CephFSPlugin.pm b/PVE/Storage/CephFSPlugin.pm index 480dc57..da64080 100644 --- a/PVE/Storage/CephFSPlugin.pm +++ b/PVE/Storage/CephFSPlugin.pm @@ -98,10 +98,7 @@ sub cephfs_mount { } else { push @opts, "name=$cmd_option->{userid}"; push @opts, "secretfile=$secretfile" if defined($secretfile); - - # FIXME: remove version check in PVE 7.0, only needed for Luminous -> Nautilus - my ($subversions) = PVE::CephConfig::local_ceph_version(); - push @opts, "conf=$configfile" if defined($configfile) && @$subversions[0] > 12; + push @opts, "conf=$configfile" if defined($configfile); } push @opts, $scfg->{options} if $scfg->{options}; -- 2.30.2