From ed7ea5a352e408b6e6cab6bca650038dfb4d68ad Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Fri, 9 Apr 2021 13:51:15 +0200 Subject: [PATCH] rbd: list images: early return to avoid indentation Signed-off-by: Thomas Lamprecht --- PVE/Storage/RBDPlugin.pm | 47 +++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 25 deletions(-) diff --git a/PVE/Storage/RBDPlugin.pm b/PVE/Storage/RBDPlugin.pm index 8c4ce45..5c9c073 100644 --- a/PVE/Storage/RBDPlugin.pm +++ b/PVE/Storage/RBDPlugin.pm @@ -539,39 +539,36 @@ sub list_images { my ($class, $storeid, $scfg, $vmid, $vollist, $cache) = @_; $cache->{rbd} = rbd_ls($scfg, $storeid) if !$cache->{rbd}; + my $pool = $scfg->{pool} ? $scfg->{pool} : 'rbd'; $pool .= "/$scfg->{namespace}" if defined($scfg->{namespace}); - my $res = []; - - if (my $dat = $cache->{rbd}->{$pool}) { - for my $image (sort keys %$dat) { - - my $info = $dat->{$image}; + my $dat = $cache->{rbd}->{$pool}; + return [] if !$dat; # nothing found - 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"; - } + my $res = []; + for my $image (sort keys %$dat) { + my $info = $dat->{$image}; + my ($volname, $parent, $owner) = $info->@{'name', 'parent', '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); - } + if ($vollist) { + my $found = grep { $_ eq $info->{volid} } @$vollist; + next if !$found; + } else { + next if defined ($vmid) && ($owner ne $vmid); + } - $info->{format} = 'raw'; + $info->{format} = 'raw'; - push @$res, $info; - } + push @$res, $info; } - + return $res; } -- 2.39.2