yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

code cleanup

Browse Source
This commit is contained in:
Dietmar Maurer
2016-09-14 11:31:10 +02:00
parent 3718e83ab5
commit cfd58f1fcc
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
PVE/Storage/RBDPlugin.pm
View File

@ -491,8 +491,11 @@ sub list_images {
if (my $dat = $cache->{rbd}->{$pool}) { if (my $dat = $cache->{rbd}->{$pool}) {
foreach my $image (keys %$dat) { foreach my $image (keys %$dat) {
my $volname = $dat->{$image}->{name}; my $info = $dat->{$image};
my $parent = $dat->{$image}->{parent};
my $volname = $info->{name};
my $parent = $info->{parent};
my $owner = $info->{vmid};
if ($parent && $parent =~ m/^(base-\d+-\S+)\@__base__$/) { if ($parent && $parent =~ m/^(base-\d+-\S+)\@__base__$/) {
$volname = "$1/$volname"; $volname = "$1/$volname";
@ -500,7 +503,6 @@ sub list_images {
my $volid = "$storeid:$volname"; my $volid = "$storeid:$volname";
my $owner = $dat->{$image}->{vmid};
if ($vollist) { if ($vollist) {
my $found = grep { $_ eq $volid } @$vollist; my $found = grep { $_ eq $volid } @$vollist;
next if !$found; next if !$found;
@ -508,7 +510,6 @@ sub list_images {
next if defined ($vmid) && ($owner ne $vmid); next if defined ($vmid) && ($owner ne $vmid);
} }
my $info = $dat->{$image};
$info->{volid} = $volid; $info->{volid} = $volid;
$info->{format} = 'raw'; $info->{format} = 'raw';