get_vm_disk_number: follow up cleanup

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/PVE/Storage/Plugin.pm b/PVE/Storage/Plugin.pm
index aefc7f80cae6102d0aaff7765e743b0b36b26ede..8ae78e9e9fb09a6cda32edbf538be3ae9eef048b 100644 (file)
--- a/PVE/Storage/Plugin.pm
+++ b/PVE/Storage/Plugin.pm
@@ -528,13 +528,15 @@ sub create_base {
 my $get_vm_disk_number = sub {
     my ($disk_name, $scfg, $vmid, $suffix) = @_;
 
+    my $disk_regex = qr/(vm|base)-$vmid-disk-(\d+)$suffix/;
+
     my $type = $scfg->{type};
     my $def = { %{$defaultData->{plugindata}->{$type}} };
-    my $valid_formats = $def->{format}[0];
 
-    my $disk_regex = qr/(vm|base)-$vmid-disk-(\d+)$suffix/;
-    $disk_regex = qr/(vm|base|subvol|basevol)-$vmid-disk-(\d+)/
-       if $valid_formats->{subvol};
+    my $valid = $def->{format}[0];
+    if ($valid->{subvol}) {
+       $disk_regex = qr/(vm|base|subvol|basevol)-$vmid-disk-(\d+)/;
+    }
 
     if ($disk_name =~ m/$disk_regex/) {
        return $2;