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

diskmanage: rename check_unused to assert_disk_unused

Browse Source 
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>
This commit is contained in:
Thomas Lamprecht
2018-10-03 14:51:35 +02:00
parent 9280153e10
commit 0370861cfd
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PVE/API2/Disks/Directory.pm
View File

@ -201,7 +201,7 @@ __PACKAGE__->register_method ({
my $type = $param->{filesystem} // 'ext4'; my $type = $param->{filesystem} // 'ext4';
$dev = PVE::Diskmanage::verify_blockdev_path($dev); $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}; PVE::Storage::assert_sid_unused($name) if $param->{add_storage};
my $worker = sub { my $worker = sub {

2
PVE/API2/Disks/LVM.pm
View File

@ -149,7 +149,7 @@ __PACKAGE__->register_method ({
my $node = $param->{node}; my $node = $param->{node};
$dev = PVE::Diskmanage::verify_blockdev_path($dev); $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}; PVE::Storage::assert_sid_unused($name) if $param->{add_storage};
my $worker = sub { my $worker = sub {

2
PVE/API2/Disks/LVMThin.pm
View File

@ -103,7 +103,7 @@ __PACKAGE__->register_method ({
my $node = $param->{node}; my $node = $param->{node};
$dev = PVE::Diskmanage::verify_blockdev_path($dev); $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}; PVE::Storage::assert_sid_unused($name) if $param->{add_storage};
my $worker = sub { my $worker = sub {

2
PVE/API2/Disks/ZFS.pm
View File

@ -341,7 +341,7 @@ __PACKAGE__->register_method ({
foreach my $dev (@$devs) { foreach my $dev (@$devs) {
$dev = PVE::Diskmanage::verify_blockdev_path($dev); $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}; PVE::Storage::assert_sid_unused($name) if $param->{add_storage};

4
PVE/Diskmanage.pm
View File

@ -602,10 +602,10 @@ sub locked_disk_action {
return $res; return $res;
} }
sub check_unused { sub assert_disk_unused {
my ($dev) = @_; 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; return undef;
} }