ambiser
/
btrbk
mirror of https://github.com/digint/btrbk
9
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrbk: use vinfo_realpath

pull/542/head
Axel Burri 2023-03-26 13:21:35 +02:00
parent 30b22d49d2
commit 2bdd5eb8fc
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
btrbk
View File

@ -2915,16 +2915,11 @@ sub vinfo_mountpoint
my %args = @_; my %args = @_;
DEBUG "Resolving mount point for: $vol->{PRINT}"; DEBUG "Resolving mount point for: $vol->{PRINT}";
my $mountinfo_root = mountinfo_tree($vol); my $mountinfo_root = mountinfo_tree($vol)
return undef unless($mountinfo_root); or return undef;
my $realpath = $realpath_cache{$vol->{URL}}; my $realpath = vinfo_realpath($vol)
unless(defined($realpath)) { or return undef;
$realpath = system_realpath($vol);
# set to empty string on errors (try only once)
$realpath_cache{$vol->{URL}} = $realpath // "";
}
return undef unless($realpath);
my $mountpoint = _find_mountpoint($mountinfo_root, $realpath); my $mountpoint = _find_mountpoint($mountinfo_root, $realpath);
@ -3000,7 +2995,7 @@ sub vinfo_init_raw_root($;@)
my $tree_root = $raw_url_cache{$droot->{URL}}; my $tree_root = $raw_url_cache{$droot->{URL}};
TRACE "raw_url_cache " . ($tree_root ? "HIT" : "MISS") . ": URL=$droot->{URL}" if($do_trace); TRACE "raw_url_cache " . ($tree_root ? "HIT" : "MISS") . ": URL=$droot->{URL}" if($do_trace);
unless($tree_root) { unless($tree_root) {
if(my $real_path = $realpath_cache{$droot->{URL}}) { if(my $real_path = vinfo_realpath($droot)) {
my $real_url = $droot->{URL_PREFIX} . $real_path; my $real_url = $droot->{URL_PREFIX} . $real_path;
$tree_root = $raw_url_cache{$real_url}; $tree_root = $raw_url_cache{$real_url};
TRACE "raw_url_cache " . ($tree_root ? "HIT" : "MISS") . ": REAL_URL=$real_url" if($do_trace); TRACE "raw_url_cache " . ($tree_root ? "HIT" : "MISS") . ": REAL_URL=$real_url" if($do_trace);