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

delete trailing white-space

Browse Source
This commit is contained in:
Dietmar Maurer
2013-08-12 11:56:41 +02:00
parent f4648aef06
commit 1a3459ac78
3 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
PVE/Storage/GlusterfsPlugin.pm
View File

@ -14,9 +14,9 @@ use base qw(PVE::Storage::Plugin);
# Glusterfs helper functions
sub read_proc_mounts {
local $/; # enable slurp mode
my $data = "";
if (my $fd = IO::File->new("/proc/mounts", "r")) {
$data = <$fd>;
@ -35,7 +35,7 @@ sub glusterfs_is_mounted {
if ($mountdata =~ m|^$source/?\s$mountpoint\sfuse.glusterfs|m) {
return $mountpoint;
}
}
return undef;
}
@ -62,7 +62,7 @@ sub plugindata {
{ images => 1 }],
format => [ { raw => 1, qcow2 => 1, vmdk => 1 } , 'raw' ],
};
}
}
sub properties {
return {
@ -127,7 +127,7 @@ sub status {
my $volume = $scfg->{volume};
return undef if !glusterfs_is_mounted($server, $volume, $path, $cache->{mountdata});
return undef if !glusterfs_is_mounted($server, $volume, $path, $cache->{mountdata});
return $class->SUPER::status($storeid, $scfg, $cache);
}
@ -141,8 +141,8 @@ sub activate_storage {
my $server = $scfg->{server} ? $scfg->{server} : 'localhost';
my $volume = $scfg->{volume};
if (!glusterfs_is_mounted($server, $volume, $path, $cache->{mountdata})) {
if (!glusterfs_is_mounted($server, $volume, $path, $cache->{mountdata})) {
mkpath $path;
die "unable to activate storage '$storeid' - " .
@ -163,9 +163,9 @@ sub deactivate_storage {
my $server = $scfg->{server} ? $scfg->{server} : 'localhost';
my $volume = $scfg->{volume};
if (glusterfs_is_mounted($server, $volume, $path, $cache->{mountdata})) {
if (glusterfs_is_mounted($server, $volume, $path, $cache->{mountdata})) {
my $cmd = ['/bin/umount', $path];
run_command($cmd, errmsg => 'umount error');
run_command($cmd, errmsg => 'umount error');
}
}

22
PVE/Storage/Plugin.pm
View File

@ -421,7 +421,7 @@ sub create_base {
# this only works for file based storage types
die "storage definintion has no path\n" if !$scfg->{path};
my ($vtype, $name, $vmid, $basename, $basevmid, $isBase) =
my ($vtype, $name, $vmid, $basename, $basevmid, $isBase) =
$class->parse_volname($volname);
die "create_base on wrong vtype '$vtype'\n" if $vtype ne 'images';
@ -446,7 +446,7 @@ sub create_base {
die "file '$newpath' already exists\n" if -f $newpath;
rename($path, $newpath) ||
rename($path, $newpath) ||
die "rename '$path' to '$newpath' failed - $!\n";
# We try to protect base volume
@ -456,7 +456,7 @@ sub create_base {
# also try to set immutable flag
eval { run_command(['/usr/bin/chattr', '+i', $newpath]); };
warn $@ if $@;
return $newvolname;
}
@ -464,10 +464,10 @@ my $find_free_diskname = sub {
my ($imgdir, $vmid, $fmt) = @_;
my $disk_ids = {};
PVE::Tools::dir_glob_foreach($imgdir,
PVE::Tools::dir_glob_foreach($imgdir,
qr!(vm|base)-$vmid-disk-(\d+)\..*!,
sub {
my ($fn, $type, $disk) = @_;
my ($fn, $type, $disk) = @_;
$disk_ids->{$disk} = 1;
});
@ -486,7 +486,7 @@ sub clone_image {
# this only works for file based storage types
die "storage definintion has no path\n" if !$scfg->{path};
my ($vtype, $basename, $basevmid, undef, undef, $isBase) =
my ($vtype, $basename, $basevmid, undef, undef, $isBase) =
$class->parse_volname($volname);
die "clone_image on wrong vtype '$vtype'\n" if $vtype ne 'images';
@ -506,13 +506,13 @@ sub clone_image {
my $path = $class->path($scfg, $newvol);
# Note: we use relative paths, so we need to call chdir before qemu-img
# Note: we use relative paths, so we need to call chdir before qemu-img
eval {
local $CWD = $imagedir;
my $cmd = ['/usr/bin/qemu-img', 'create', '-b', "../$basevmid/$basename",
my $cmd = ['/usr/bin/qemu-img', 'create', '-b', "../$basevmid/$basename",
'-f', 'qcow2', $path];
run_command($cmd);
};
my $err = $@;
@ -531,7 +531,7 @@ sub alloc_image {
mkpath $imagedir;
$name = &$find_free_diskname($imagedir, $vmid, $fmt) if !$name;
my (undef, $tmpfmt) = parse_name_dir($name);
die "illegal name '$name' - wrong extension for format ('$tmpfmt != '$fmt')\n"
@ -745,7 +745,7 @@ sub list_images {
push @$res, {
volid => $volid, format => $format,
size => $size, vmid => $owner, used => $used, parent => $parent
size => $size, vmid => $owner, used => $used, parent => $parent
};
}