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

make use of the new ProcFSTools::parse_proc_mounts

Browse Source
This commit is contained in:
Wolfgang Bumiller
2015-11-13 12:21:44 +01:00
committed by Dietmar Maurer
parent 30650d3c46
commit 80b647882e
2 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
PVE/Storage/GlusterfsPlugin.pm
View File

@ -70,12 +70,13 @@ my $get_active_server = sub {
sub glusterfs_is_mounted {
my ($volume, $mountpoint, $mountdata) = @_;
$mountdata = PVE::ProcFSTools::read_proc_mounts() if !$mountdata;
if ($mountdata =~ m|^\S+:$volume/?\s$mountpoint\sfuse.glusterfs|m) {
return $mountpoint;
}
$mountdata = PVE::ProcFSTools::parse_proc_mounts() if !$mountdata;
return $mountpoint if grep {
$_->[2] eq 'fuse.glusterfs' &&
$_->[0] eq $volume &&
$_->[1] eq $mountpoint
} @$mountdata;
return undef;
}
@ -248,7 +249,7 @@ sub alloc_image {
sub status {
my ($class, $storeid, $scfg, $cache) = @_;
$cache->{mountdata} = PVE::ProcFSTools::read_proc_mounts()
$cache->{mountdata} = PVE::ProcFSTools::parse_proc_mounts()
if !$cache->{mountdata};
my $path = $scfg->{path};
@ -263,7 +264,7 @@ sub status {
sub activate_storage {
my ($class, $storeid, $scfg, $cache) = @_;
$cache->{mountdata} = PVE::ProcFSTools::read_proc_mounts()
$cache->{mountdata} = PVE::ProcFSTools::parse_proc_mounts()
if !$cache->{mountdata};
my $path = $scfg->{path};
@ -287,7 +288,7 @@ sub activate_storage {
sub deactivate_storage {
my ($class, $storeid, $scfg, $cache) = @_;
$cache->{mountdata} = PVE::ProcFSTools::read_proc_mounts()
$cache->{mountdata} = PVE::ProcFSTools::parse_proc_mounts()
if !$cache->{mountdata};
my $path = $scfg->{path};

18
PVE/Storage/NFSPlugin.pm
View File

@ -20,12 +20,12 @@ sub nfs_is_mounted {
$server = "[$server]" if Net::IP::ip_is_ipv6($server);
my $source = "$server:$export";
$mountdata = PVE::ProcFSTools::read_proc_mounts() if !$mountdata;
if ($mountdata =~ m|^\Q$source\E/?\s\Q$mountpoint\E\snfs|m) {
return $mountpoint;
}
$mountdata = PVE::ProcFSTools::parse_proc_mounts() if !$mountdata;
return $mountpoint if grep {
$_->[2] eq 'nfs' &&
$_->[0] eq $source &&
$_->[1] eq $mountpoint
} @$mountdata;
return undef;
}
@ -102,7 +102,7 @@ sub check_config {
sub status {
my ($class, $storeid, $scfg, $cache) = @_;
$cache->{mountdata} = PVE::ProcFSTools::read_proc_mounts()
$cache->{mountdata} = PVE::ProcFSTools::parse_proc_mounts()
if !$cache->{mountdata};
my $path = $scfg->{path};
@ -117,7 +117,7 @@ sub status {
sub activate_storage {
my ($class, $storeid, $scfg, $cache) = @_;
$cache->{mountdata} = PVE::ProcFSTools::read_proc_mounts()
$cache->{mountdata} = PVE::ProcFSTools::parse_proc_mounts()
if !$cache->{mountdata};
my $path = $scfg->{path};
@ -143,7 +143,7 @@ sub activate_storage {
sub deactivate_storage {
my ($class, $storeid, $scfg, $cache) = @_;
$cache->{mountdata} = PVE::ProcFSTools::read_proc_mounts()
$cache->{mountdata} = PVE::ProcFSTools::parse_proc_mounts()
if !$cache->{mountdata};
my $path = $scfg->{path};