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 6C6F370F4E for ; Wed, 9 Jun 2021 15:18:58 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6A8642505C for ; Wed, 9 Jun 2021 15:18:58 +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 A67DF25051 for ; Wed, 9 Jun 2021 15:18:57 +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 8032046742 for ; Wed, 9 Jun 2021 15:18:57 +0200 (CEST) From: Wolfgang Bumiller To: pve-devel@lists.proxmox.com Date: Wed, 9 Jun 2021 15:18:46 +0200 Message-Id: <20210609131852.167416-3-w.bumiller@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210609131852.167416-1-w.bumiller@proxmox.com> References: <20210609131852.167416-1-w.bumiller@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.938 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. [glusterfsplugin.pm, plugin.pm] Subject: [pve-devel] [PATCH storage 1/4] fix find_free_disk_name invocations 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, 09 Jun 2021 13:18:58 -0000 The interface takes the storeid now, not the image dir. Signed-off-by: Wolfgang Bumiller --- PVE/Storage/GlusterfsPlugin.pm | 4 ++-- PVE/Storage/Plugin.pm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/PVE/Storage/GlusterfsPlugin.pm b/PVE/Storage/GlusterfsPlugin.pm index 5ec2f42..599bca2 100644 --- a/PVE/Storage/GlusterfsPlugin.pm +++ b/PVE/Storage/GlusterfsPlugin.pm @@ -215,7 +215,7 @@ sub clone_image { mkpath $imagedir; - my $name = $class->find_free_diskname($imagedir, $scfg, $vmid, "qcow2", 1); + my $name = $class->find_free_diskname($storeid, $scfg, $vmid, "qcow2", 1); warn "clone $volname: $vtype, $name, $vmid to $name (base=../$basevmid/$basename)\n"; @@ -243,7 +243,7 @@ sub alloc_image { mkpath $imagedir; - $name = $class->find_free_diskname($imagedir, $scfg, $vmid, $fmt, 1) if !$name; + $name = $class->find_free_diskname($storeid, $scfg, $vmid, $fmt, 1) if !$name; my (undef, $tmpfmt) = parse_name_dir($name); diff --git a/PVE/Storage/Plugin.pm b/PVE/Storage/Plugin.pm index 4a10a1f..318d13a 100644 --- a/PVE/Storage/Plugin.pm +++ b/PVE/Storage/Plugin.pm @@ -695,7 +695,7 @@ sub clone_image { mkpath $imagedir; - my $name = $class->find_free_diskname($imagedir, $scfg, $vmid, "qcow2", 1); + my $name = $class->find_free_diskname($storeid, $scfg, $vmid, "qcow2", 1); warn "clone $volname: $vtype, $name, $vmid to $name (base=../$basevmid/$basename)\n"; @@ -727,7 +727,7 @@ sub alloc_image { mkpath $imagedir; - $name = $class->find_free_diskname($imagedir, $scfg, $vmid, $fmt, 1) if !$name; + $name = $class->find_free_diskname($storeid, $scfg, $vmid, $fmt, 1) if !$name; my (undef, $tmpfmt) = parse_name_dir($name); -- 2.30.2