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

harmonize list_images code

Browse Source
This commit is contained in:
Fabian Grünbichler
2016-09-15 13:17:46 +02:00
committed by Dietmar Maurer
parent 17fb7e4215
commit 1b83c3d9c7
2 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
PVE/Storage/RBDPlugin.pm
View File

@ -498,19 +498,18 @@ sub list_images {
my $owner = $info->{vmid}; my $owner = $info->{vmid};
if ($parent && $parent =~ m/^(base-\d+-\S+)\@__base__$/) { if ($parent && $parent =~ m/^(base-\d+-\S+)\@__base__$/) {
$volname = "$1/$volname"; $info->{volid} = "$storeid:$1/$volname";
} else {
$info->{volid} = "$storeid:$volname";
} }
my $volid = "$storeid:$volname";
if ($vollist) { if ($vollist) {
my $found = grep { $_ eq $volid } @$vollist; my $found = grep { $_ eq $info->{volid} } @$vollist;
next if !$found; next if !$found;
} else { } else {
next if defined ($vmid) && ($owner ne $vmid); next if defined ($vmid) && ($owner ne $vmid);
} }
$info->{volid} = $volid;
$info->{format} = 'raw'; $info->{format} = 'raw';
push @$res, $info; push @$res, $info;

19
PVE/Storage/ZFSPoolPlugin.pm
View File

@ -248,27 +248,26 @@ sub list_images {
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 $volid = undef; my $volname = $info->{name};
if ($parent && $parent =~ m/^(\S+)@(\S+)$/) { my $parent = $info->{parent};
my $owner = $info->{vmid};
if ($parent && $parent =~ m/^(\S+)\@__base__$/) {
my ($basename) = ($1); my ($basename) = ($1);
$volid = "$storeid:$basename/$volname"; $info->{volid} = "$storeid:$basename/$volname";
} else { } else {
$volid = "$storeid:$volname"; $info->{volid} = "$storeid:$volname";
} }
my $owner = $dat->{$volname}->{vmid};
if ($vollist) { if ($vollist) {
my $found = grep { $_ eq $volid } @$vollist; my $found = grep { $_ eq $info->{volid} } @$vollist;
next if !$found; next if !$found;
} else { } else {
next if defined ($vmid) && ($owner ne $vmid); next if defined ($vmid) && ($owner ne $vmid);
} }
my $info = $dat->{$volname};
$info->{volid} = $volid;
push @$res, $info; push @$res, $info;
} }
} }