From: Wolfgang Bumiller <w.bumiller@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH storage 1/4] fix find_free_disk_name invocations
Date: Wed, 9 Jun 2021 15:18:46 +0200 [thread overview]
Message-ID: <20210609131852.167416-3-w.bumiller@proxmox.com> (raw)
In-Reply-To: <20210609131852.167416-1-w.bumiller@proxmox.com>
The interface takes the storeid now, not the image dir.
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
---
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
next prev parent reply other threads:[~2021-06-09 13:18 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-09 13:18 [pve-devel] [PATCH multiple] btrfs, file system for the brave Wolfgang Bumiller
2021-06-09 13:18 ` [pve-devel] [PATCH common] Syscalls/Tools: add renameat2 Wolfgang Bumiller
2021-06-15 12:35 ` [pve-devel] applied: " Thomas Lamprecht
2021-06-09 13:18 ` Wolfgang Bumiller [this message]
2021-06-15 12:36 ` [pve-devel] applied: [PATCH storage 1/4] fix find_free_disk_name invocations Thomas Lamprecht
2021-06-09 13:18 ` [pve-devel] [PATCH storage 2/4] add BTRFS storage plugin Wolfgang Bumiller
2021-06-10 12:40 ` Fabian Grünbichler
2021-06-10 12:59 ` Wolfgang Bumiller
2021-06-11 12:11 ` Fabian Ebner
2021-06-09 13:18 ` [pve-devel] [PATCH storage 3/4] update import/export storage API Wolfgang Bumiller
2021-06-10 12:30 ` Fabian Grünbichler
2021-06-09 13:18 ` [pve-devel] [PATCH storage 4/4] btrfs: add 'btrfs' import/export format Wolfgang Bumiller
2021-06-09 13:18 ` [pve-devel] [PATCH container 1/2] migration: fix snapshots boolean accounting Wolfgang Bumiller
2021-06-09 13:18 ` [pve-devel] [PATCH container 2/2] enable btrfs support via subvolumes Wolfgang Bumiller
2021-06-10 12:35 ` Fabian Grünbichler
2021-06-09 13:18 ` [pve-devel] [PATCH qemu-server] allow migrating raw btrfs volumes Wolfgang Bumiller
2021-06-10 12:35 ` Fabian Grünbichler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210609131852.167416-3-w.bumiller@proxmox.com \
--to=w.bumiller@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal