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

rbd_unittobytes: use a local var instead of a sub

Browse Source
This commit is contained in:
Dietmar Maurer
2016-09-01 06:24:51 +02:00
parent 134172255f
commit e7ac2d5cf6
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
PVE/Storage/RBDPlugin.pm
View File

@ -10,13 +10,11 @@ use PVE::JSONSchema qw(get_standard_option);
use base qw(PVE::Storage::Plugin); use base qw(PVE::Storage::Plugin);
sub rbd_unittobytes { my $rbd_unittobytes = {
{ "M" => 1024*1024,
"M" => 1024*1024, "G" => 1024*1024*1024,
"G" => 1024*1024*1024, "T" => 1024*1024*1024*1024,
"T" => 1024*1024*1024*1024, };
}
}
my $add_pool_to_disk = sub { my $add_pool_to_disk = sub {
my ($scfg, $disk) = @_; my ($scfg, $disk) = @_;
@ -189,7 +187,7 @@ sub rbd_ls {
$list->{$pool}->{$image} = { $list->{$pool}->{$image} = {
name => $image, name => $image,
size => $size*rbd_unittobytes()->{$unit}, size => $size*$rbd_unittobytes->{$unit},
parent => $parent, parent => $parent,
vmid => $owner vmid => $owner
}; };
@ -226,7 +224,7 @@ sub rbd_volume_info {
my $line = shift; my $line = shift;
if ($line =~ m/size (\d+) (M|G|T)B in (\d+) objects/) { if ($line =~ m/size (\d+) (M|G|T)B in (\d+) objects/) {
$size = $1 * rbd_unittobytes()->{$2} if ($1); $size = $1 * $rbd_unittobytes->{$2} if ($1);
} elsif ($line =~ m/parent:\s(\S+)\/(\S+)/) { } elsif ($line =~ m/parent:\s(\S+)\/(\S+)/) {
$parent = $2; $parent = $2;
} elsif ($line =~ m/format:\s(\d+)/) { } elsif ($line =~ m/format:\s(\d+)/) {