dir plugin: code cleanup

mostly re-ordering to improve statement grouping and avoiding the
need for an intermediate variable

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

diff --git a/PVE/Storage/DirPlugin.pm b/PVE/Storage/DirPlugin.pm
index b36eec5fc60605edffaf053fbb370cf466e4965c..7bb85e824194f02b3bde600df8ac01eb806d8189 100644 (file)
--- a/PVE/Storage/DirPlugin.pm
+++ b/PVE/Storage/DirPlugin.pm
@@ -89,32 +89,27 @@ sub parse_is_mountpoint {
 
 sub get_volume_notes {
     my ($class, $scfg, $storeid, $volname, $timeout) = @_;
+
     my $path = $class->filesystem_path($scfg, $volname);
     $path .= $class->SUPER::NOTES_EXT;
 
-    my $notes = "";
-
-    if (-f $path) {
-       $notes = PVE::Tools::file_get_contents($path);
-    }
+    return PVE::Tools::file_get_contents($path) if -f $path;
 
-    return $notes;
+    return '';
 }
 
 sub update_volume_notes {
     my ($class, $scfg, $storeid, $volname, $notes, $timeout) = @_;
-    my $path = $class->filesystem_path($scfg, $volname);
-    my ($vtype, undef, undef, undef, undef, undef, undef) = $class->parse_volname($volname);
 
-    if ($vtype ne 'backup') {
-       die "only backups can have notes\n";
-    }
+    my ($vtype) = $class->parse_volname($volname);
+    die "only backups can have notes\n" if $vtype ne 'backup';
 
+    my $path = $class->filesystem_path($scfg, $volname);
     $path .= $class->SUPER::NOTES_EXT;
 
     PVE::Tools::file_set_contents($path, $notes);
 
-    return undef;
+    return;
 }
 
 sub status {