From e1c5fd00295b041eadebd9578db234269708595e Mon Sep 17 00:00:00 2001 From: Axel Burri Date: Sat, 24 Jul 2021 20:45:18 +0200 Subject: [PATCH] btrbk: remove superfluous checks on volume --- btrbk | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/btrbk b/btrbk index f656a60..2218b15 100755 --- a/btrbk +++ b/btrbk @@ -6644,12 +6644,7 @@ MAIN: # read volume btrfs tree, and make sure subvolume exist foreach my $sroot (vinfo_subsection($config, 'volume')) { DEBUG "Initializing volume section: $sroot->{PRINT}"; - unless(vinfo_init_root($sroot)) { - ABORTED($sroot, "Failed to fetch subvolume detail"); - WARN "Skipping volume \"$sroot->{PRINT}\": " . ABORTED_TEXT($sroot), @stderr; - next; - } - unless(scalar(vinfo_subsection($sroot, 'subvolume'))) { + unless(scalar(vinfo_subsection($sroot, 'subvolume', 1))) { WARN "No subvolume configured for \"volume $sroot->{URL}\""; } foreach my $svol (vinfo_subsection($sroot, 'subvolume')) { @@ -6674,15 +6669,6 @@ MAIN: WARN "Skipping subvolume \"$svol->{PRINT}\": " . ABORTED_TEXT($svol); next; } - if(_is_child_of($sroot->{node}, $svol->{node}{uuid}) || - ($svol->{node}{uuid} eq $sroot->{node}{uuid})) - { - DEBUG "Found \"$svol->{PRINT}\" (id=$svol->{node}{id}) in btrfs tree of: $sroot->{PRINT}"; - } else { - ABORTED($svol, "Not a child subvolume of: $sroot->{PRINT}"); - WARN "Skipping subvolume \"$svol->{PRINT}\": " . ABORTED_TEXT($svol); - next; - } my $snaproot = vinfo_snapshot_root($svol); unless(vinfo_init_root($snaproot)) {