[pve-devel] [PATCH v3 storage 1/3] rbd: path: don't build the entire path if we don't use it
Wolfgang Bumiller
w.bumiller at proxmox.com
Mon Jul 11 13:55:47 CEST 2016
---
No changes to v2
PVE/Storage/RBDPlugin.pm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/PVE/Storage/RBDPlugin.pm b/PVE/Storage/RBDPlugin.pm
index 2ef7573..ced9af0 100644
--- a/PVE/Storage/RBDPlugin.pm
+++ b/PVE/Storage/RBDPlugin.pm
@@ -299,10 +299,12 @@ sub path {
my ($vtype, $name, $vmid) = $class->parse_volname($volname);
$name .= '@'.$snapname if $snapname;
+ my $pool = $scfg->{pool} ? $scfg->{pool} : 'rbd';
+ return ("/dev/rbd/$pool/$name", $vmid, $vtype) if $scfg->{krbd};
+
my $monhost = $scfg->{monhost};
$monhost =~ s/:/\\:/g;
- my $pool = $scfg->{pool} ? $scfg->{pool} : 'rbd';
my $username = $scfg->{username} ? $scfg->{username} : 'admin';
my $path = "rbd:$pool/$name:mon_host=$monhost";
@@ -314,8 +316,6 @@ sub path {
$path .= ":auth_supported=none";
}
- $path = "/dev/rbd/$pool/$name" if $scfg->{krbd};
-
return ($path, $vmid, $vtype);
}
--
2.1.4
More information about the pve-devel
mailing list