From 20471dfd95bf40a0e8480320700a3257ad488611 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Mon, 7 Dec 2020 16:07:36 +0100 Subject: [PATCH] dir plugin: code cleanup mostly re-ordering to improve statement grouping and avoiding the need for an intermediate variable Signed-off-by: Thomas Lamprecht --- PVE/Storage/DirPlugin.pm | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/PVE/Storage/DirPlugin.pm b/PVE/Storage/DirPlugin.pm index b36eec5..7bb85e8 100644 --- 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 = ""; + return PVE::Tools::file_get_contents($path) if -f $path; - if (-f $path) { - $notes = PVE::Tools::file_get_contents($path); - } - - return $notes; + return ''; } sub update_volume_notes { my ($class, $scfg, $storeid, $volname, $notes, $timeout) = @_; + + my ($vtype) = $class->parse_volname($volname); + die "only backups can have notes\n" if $vtype ne 'backup'; + 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"; - } - $path .= $class->SUPER::NOTES_EXT; PVE::Tools::file_set_contents($path, $notes); - return undef; + return; } sub status {