5
0
mirror of git://git.proxmox.com/git/pve-storage.git synced 2025-02-03 13:47:16 +03:00

zfs: fix unmount request

by not dying when the dataset is already unmounted. Can be triggered
for a container by doing two rollbacks in a row.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fabian Ebner 2021-08-05 10:33:43 +02:00 committed by Fabian Grünbichler
parent 04bb277db4
commit ab3516a6d7

View File

@ -477,7 +477,10 @@ sub volume_snapshot_rollback {
# caches, they get mounted in activate volume again
# see zfs bug #10931 https://github.com/openzfs/zfs/issues/10931
if ($format eq 'subvol') {
$class->zfs_request($scfg, undef, 'unmount', "$scfg->{pool}/$vname");
eval { $class->zfs_request($scfg, undef, 'unmount', "$scfg->{pool}/$vname"); };
if (my $err = $@) {
die $err if $err !~ m/not currently mounted$/;
}
}
return $msg;