diskmanage: rename check_unused to assert_disk_unused

to have a clear method name for this. check_XYZ suggests also that we
return true if the check was OK, but we don't.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/PVE/API2/Disks/Directory.pm b/PVE/API2/Disks/Directory.pm
index 27009f5021b42d877cd28dffb882ca1de6c0306d..a1e1afe135adec929a7325df9229378b69e28a47 100644 (file)
--- a/PVE/API2/Disks/Directory.pm
+++ b/PVE/API2/Disks/Directory.pm
@@ -201,7 +201,7 @@ __PACKAGE__->register_method ({
        my $type = $param->{filesystem} // 'ext4';
 
        $dev = PVE::Diskmanage::verify_blockdev_path($dev);
-       PVE::Diskmanage::check_unused($dev);
+       PVE::Diskmanage::assert_disk_unused($dev);
        PVE::Storage::assert_sid_unused($name) if $param->{add_storage};
 
        my $worker = sub {

diff --git a/PVE/API2/Disks/LVM.pm b/PVE/API2/Disks/LVM.pm
index 7f8c3190dd568490af0b16c90c12d24b49a8c068..569e9d1afae9b94f3ac200ae1fc74d88bfe0746f 100644 (file)
--- a/PVE/API2/Disks/LVM.pm
+++ b/PVE/API2/Disks/LVM.pm
@@ -149,7 +149,7 @@ __PACKAGE__->register_method ({
        my $node = $param->{node};
 
        $dev = PVE::Diskmanage::verify_blockdev_path($dev);
-       PVE::Diskmanage::check_unused($dev);
+       PVE::Diskmanage::assert_disk_unused($dev);
        PVE::Storage::assert_sid_unused($name) if $param->{add_storage};
 
        my $worker = sub {

diff --git a/PVE/API2/Disks/LVMThin.pm b/PVE/API2/Disks/LVMThin.pm
index 596d39347be534ee387d6cd0b8cced0f34d2601c..23c027909512e34d9b1881e1acc7835d307cec81 100644 (file)
--- a/PVE/API2/Disks/LVMThin.pm
+++ b/PVE/API2/Disks/LVMThin.pm
@@ -103,7 +103,7 @@ __PACKAGE__->register_method ({
        my $node = $param->{node};
 
        $dev = PVE::Diskmanage::verify_blockdev_path($dev);
-       PVE::Diskmanage::check_unused($dev);
+       PVE::Diskmanage::assert_disk_unused($dev);
        PVE::Storage::assert_sid_unused($name) if $param->{add_storage};
 
        my $worker = sub {

diff --git a/PVE/API2/Disks/ZFS.pm b/PVE/API2/Disks/ZFS.pm
index f187eb2dec8f3a018ff2784fbe27031444688f75..371cc5a57062bd5e65694c00ddc99a61b8052cf4 100644 (file)
--- a/PVE/API2/Disks/ZFS.pm
+++ b/PVE/API2/Disks/ZFS.pm
@@ -341,7 +341,7 @@ __PACKAGE__->register_method ({
 
        foreach my $dev (@$devs) {
            $dev = PVE::Diskmanage::verify_blockdev_path($dev);
-           PVE::Diskmanage::check_unused($dev);
+           PVE::Diskmanage::assert_disk_unused($dev);
        }
 
        PVE::Storage::assert_sid_unused($name) if $param->{add_storage};

diff --git a/PVE/Diskmanage.pm b/PVE/Diskmanage.pm
index 5a5fc87799fc767406fadac086391352d39c2b4a..def0791d720ba5d3430a0a8d31465e703b72fe64 100644 (file)
--- a/PVE/Diskmanage.pm
+++ b/PVE/Diskmanage.pm
@@ -602,10 +602,10 @@ sub locked_disk_action {
     return $res;
 }
 
-sub check_unused {
+sub assert_disk_unused {
     my ($dev) = @_;
 
-    die "device $dev is already in use\n" if disk_is_used($dev);
+    die "device '$dev' is already in use\n" if disk_is_used($dev);
 
     return undef;
 }