From c27fe64810682f2a124dc38a975f3e34782db1b1 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Fri, 9 Apr 2021 14:19:48 +0200 Subject: [PATCH] rbd: make volume param for get_rbd_path to allow further use Signed-off-by: Thomas Lamprecht --- PVE/Storage/RBDPlugin.pm | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/PVE/Storage/RBDPlugin.pm b/PVE/Storage/RBDPlugin.pm index 5c9c073..42641e2 100644 --- a/PVE/Storage/RBDPlugin.pm +++ b/PVE/Storage/RBDPlugin.pm @@ -24,11 +24,10 @@ my $get_parent_image_name = sub { my sub get_rbd_path { my ($scfg, $volume) = @_; - my $pool = $scfg->{pool} ? $scfg->{pool} : 'rbd'; - my $namespace = $scfg->{namespace}; - - return "${pool}/${namespace}/${volume}" if defined($namespace); - return "${pool}/${volume}"; + my $path = $scfg->{pool} ? $scfg->{pool} : 'rbd'; + $path .= "/$scfg->{namespace}" if defined($scfg->{namespace}); + $path .= "/$volume" if defined($volume); + return $path; }; my $build_cmd = sub { @@ -540,10 +539,7 @@ sub list_images { $cache->{rbd} = rbd_ls($scfg, $storeid) if !$cache->{rbd}; - my $pool = $scfg->{pool} ? $scfg->{pool} : 'rbd'; - $pool .= "/$scfg->{namespace}" if defined($scfg->{namespace}); - - my $dat = $cache->{rbd}->{$pool}; + my $dat = $cache->{rbd}->{get_rbd_path($scfg)}; return [] if !$dat; # nothing found my $res = [];