[pve-devel] [RFC pve-storage 26/36] plugin: gluster: make helper subroutines private

[Max Carrara <m.carrara@proxmox.com>]

.. and also use a regular sub definition for `get_active_server` in
order to avoid the sub prefix deref syntax when calling it.

Signed-off-by: Max Carrara <m.carrara@proxmox.com>
---
 src/PVE/Storage/GlusterfsPlugin.pm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/PVE/Storage/GlusterfsPlugin.pm b/src/PVE/Storage/GlusterfsPlugin.pm
index 2b7f9e1..634a090 100644
--- a/src/PVE/Storage/GlusterfsPlugin.pm
+++ b/src/PVE/Storage/GlusterfsPlugin.pm
@@ -16,7 +16,7 @@ use base qw(PVE::Storage::Plugin);
 
 my $server_test_results = {};
 
-my $get_active_server = sub {
+my sub get_active_server {
     my ($scfg, $return_default_if_offline) = @_;
 
     my $defaultserver = $scfg->{server} ? $scfg->{server} : 'localhost';
@@ -66,7 +66,7 @@ my $get_active_server = sub {
     return undef;
 };
 
-sub glusterfs_is_mounted {
+my sub glusterfs_is_mounted {
     my ($volume, $mountpoint, $mountdata) = @_;
 
     $mountdata = PVE::ProcFSTools::parse_proc_mounts() if !$mountdata;
@@ -79,7 +79,7 @@ sub glusterfs_is_mounted {
     return undef;
 }
 
-sub glusterfs_mount {
+my sub glusterfs_mount {
     my ($server, $volume, $mountpoint) = @_;
 
     my $source = "$server:$volume";
@@ -179,7 +179,7 @@ sub path {
     my $path = undef;
     if ($vtype eq 'images') {
 
-	my $server = &$get_active_server($scfg, 1);
+	my $server = get_active_server($scfg, 1);
 	my $glustervolume = $scfg->{volume};
 	my $transport = $scfg->{transport};
 	my $protocol = "gluster";
@@ -227,7 +227,7 @@ sub clone_image {
 
     die "disk image '$path' already exists\n" if -e $path;
 
-    my $server = &$get_active_server($scfg, 1);
+    my $server = get_active_server($scfg, 1);
     my $glustervolume = $scfg->{volume};
     my $volumepath = "gluster://$server/$glustervolume/images/$vmid/$name";
 
@@ -258,7 +258,7 @@ sub alloc_image {
 
     die "disk image '$path' already exists\n" if -e $path;
 
-    my $server = &$get_active_server($scfg, 1);
+    my $server = get_active_server($scfg, 1);
     my $glustervolume = $scfg->{volume};
     my $volumepath = "gluster://$server/$glustervolume/images/$vmid/$name";
 
@@ -309,7 +309,7 @@ sub activate_storage {
 	die "unable to activate storage '$storeid' - " .
 	    "directory '$path' does not exist\n" if ! -d $path;
 
-	my $server = &$get_active_server($scfg, 1);
+	my $server = get_active_server($scfg, 1);
 
 	glusterfs_mount($server, $volume, $path);
     }
@@ -347,7 +347,7 @@ sub deactivate_volume {
 sub check_connection {
     my ($class, $storeid, $scfg, $cache) = @_;
 
-    my $server = &$get_active_server($scfg);
+    my $server = get_active_server($scfg);
 
     return defined($server) ? 1 : 0;
 }
-- 
2.39.2



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel