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

rbd: list images: early return to avoid indentation

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht
2021-04-09 13:51:15 +02:00
parent a3cad0b50d
commit ed7ea5a352
1 changed files with 23 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
PVE/Storage/RBDPlugin.pm
View File

@ -539,39 +539,36 @@ sub list_images {
my ($class, $storeid, $scfg, $vmid, $vollist, $cache) = @_; my ($class, $storeid, $scfg, $vmid, $vollist, $cache) = @_;
$cache->{rbd} = rbd_ls($scfg, $storeid) if !$cache->{rbd}; $cache->{rbd} = rbd_ls($scfg, $storeid) if !$cache->{rbd};
my $pool = $scfg->{pool} ? $scfg->{pool} : 'rbd'; my $pool = $scfg->{pool} ? $scfg->{pool} : 'rbd';
$pool .= "/$scfg->{namespace}" if defined($scfg->{namespace}); $pool .= "/$scfg->{namespace}" if defined($scfg->{namespace});
my $dat = $cache->{rbd}->{$pool};
return [] if !$dat; # nothing found
my $res = []; my $res = [];
for my $image (sort keys %$dat) {
my $info = $dat->{$image};
my ($volname, $parent, $owner) = $info->@{'name', 'parent', 'vmid'};
if (my $dat = $cache->{rbd}->{$pool}) { if ($parent && $parent =~ m/^(base-\d+-\S+)\@__base__$/) {
for my $image (sort keys %$dat) { $info->{volid} = "$storeid:$1/$volname";
} else {
my $info = $dat->{$image}; $info->{volid} = "$storeid:$volname";
my $volname = $info->{name};
my $parent = $info->{parent};
my $owner = $info->{vmid};
if ($parent && $parent =~ m/^(base-\d+-\S+)\@__base__$/) {
$info->{volid} = "$storeid:$1/$volname";
} else {
$info->{volid} = "$storeid:$volname";
}
if ($vollist) {
my $found = grep { $_ eq $info->{volid} } @$vollist;
next if !$found;
} else {
next if defined ($vmid) && ($owner ne $vmid);
}
$info->{format} = 'raw';
push @$res, $info;
} }
if ($vollist) {
my $found = grep { $_ eq $info->{volid} } @$vollist;
next if !$found;
} else {
next if defined ($vmid) && ($owner ne $vmid);
}
$info->{format} = 'raw';
push @$res, $info;
} }
return $res; return $res;
} }