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

zfs: white space cleanups

Browse Source
This commit is contained in:
Dietmar Maurer
2015-01-22 09:45:32 +01:00
parent 34eaae3f8d
commit 6b5bca68e6
1 changed files with 70 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
PVE/Storage/ZFSPlugin.pm
View File

@ -106,7 +106,7 @@ sub zfs_get_lu_name {
sub zfs_add_lun_mapping_entry { sub zfs_add_lun_mapping_entry {
my ($class, $scfg, $zvol, $guid) = @_; my ($class, $scfg, $zvol, $guid) = @_;
if (! defined($guid)) { if (!defined($guid)) {
$guid = $class->zfs_get_lu_name($scfg, $zvol); $guid = $class->zfs_get_lu_name($scfg, $zvol);
} }
@ -307,15 +307,13 @@ sub free_image {
my ($vtype, $name, $vmid) = $class->parse_volname($volname); my ($vtype, $name, $vmid) = $class->parse_volname($volname);
$class->zfs_delete_lu($scfg, $name); $class->zfs_delete_lu($scfg, $name);
eval {
$class->zfs_delete_zvol($scfg, $name); eval { $class->zfs_delete_zvol($scfg, $name); };
}; if (my $err = $@) {
do {
my $err = $@;
my $guid = $class->zfs_create_lu($scfg, $name); my $guid = $class->zfs_create_lu($scfg, $name);
$class->zfs_add_lun_mapping_entry($scfg, $name, $guid); $class->zfs_add_lun_mapping_entry($scfg, $name, $guid);
die $err; die $err;
} if $@; }
return undef; return undef;
} }