rbd: drop get_kernel_device_path
it only redirected to get_rbd_dev_path with the same signature and both are private subs.. Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
@ -646,11 +646,6 @@ sub deactivate_storage {
|
|||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
my sub get_kernel_device_path {
|
|
||||||
my ($scfg, $storeid, $name) = @_;
|
|
||||||
return get_rbd_dev_path($scfg, $storeid, $name);
|
|
||||||
};
|
|
||||||
|
|
||||||
sub map_volume {
|
sub map_volume {
|
||||||
my ($class, $storeid, $scfg, $volname, $snapname) = @_;
|
my ($class, $storeid, $scfg, $volname, $snapname) = @_;
|
||||||
|
|
||||||
@ -659,7 +654,7 @@ sub map_volume {
|
|||||||
my $name = $img_name;
|
my $name = $img_name;
|
||||||
$name .= '@'.$snapname if $snapname;
|
$name .= '@'.$snapname if $snapname;
|
||||||
|
|
||||||
my $kerneldev = get_kernel_device_path($scfg, $storeid, $name);
|
my $kerneldev = get_rbd_dev_path($scfg, $storeid, $name);
|
||||||
|
|
||||||
return $kerneldev if -b $kerneldev; # already mapped
|
return $kerneldev if -b $kerneldev; # already mapped
|
||||||
|
|
||||||
@ -678,7 +673,7 @@ sub unmap_volume {
|
|||||||
my ($vtype, $name, $vmid) = $class->parse_volname($volname);
|
my ($vtype, $name, $vmid) = $class->parse_volname($volname);
|
||||||
$name .= '@'.$snapname if $snapname;
|
$name .= '@'.$snapname if $snapname;
|
||||||
|
|
||||||
my $kerneldev = get_kernel_device_path($scfg, $storeid, $name);
|
my $kerneldev = get_rbd_dev_path($scfg, $storeid, $name);
|
||||||
|
|
||||||
if (-b $kerneldev) {
|
if (-b $kerneldev) {
|
||||||
my $cmd = $rbd_cmd->($scfg, $storeid, 'unmap', $kerneldev);
|
my $cmd = $rbd_cmd->($scfg, $storeid, 'unmap', $kerneldev);
|
||||||
|
|||||||
Reference in New Issue
Block a user