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

zfs: move code

Browse Source 
move parse_volume from ZFSPlugin to ZFSDirPlugin, to avoid duplication

Signed-off-by: Wolfgang Link <w.link@proxmox.com>
This commit is contained in:
Wolfgang Link
2015-01-23 10:32:38 +01:00
committed by Dietmar Maurer
parent b3ba95e493
commit cc80ed9c00
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
PVE/Storage/ZFSDirPlugin.pm
View File

@ -120,6 +120,16 @@ sub zfs_parse_zvol_list {
return $list; return $list;
} }
sub parse_volname {
my ($class, $volname) = @_;
if ($volname =~ m/^(((base|vm)-(\d+)-\S+)\/)?((base)?(vm)?-(\d+)-\S+)$/) {
return ('images', $5, $8, $2, $4, $6);
}
die "unable to parse zfs volume name '$volname'\n";
}
# virtual zfs methods (subclass can overwrite them) # virtual zfs methods (subclass can overwrite them)
sub zfs_request { sub zfs_request {

10
PVE/Storage/ZFSPlugin.pm
View File

@ -207,16 +207,6 @@ sub options {
# Storage implementation # Storage implementation
sub parse_volname {
my ($class, $volname) = @_;
if ($volname =~ m/^(((base|vm)-(\d+)-\S+)\/)?((base)?(vm)?-(\d+)-\S+)$/) {
return ('images', $5, $8, $2, $4, $6);
}
die "unable to parse zfs volume name '$volname'\n";
}
sub path { sub path {
my ($class, $scfg, $volname) = @_; my ($class, $scfg, $volname) = @_;