mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
overlay/041: fix call to _overlay_check_scratch_dirs
_overlay_check_scratch_dirs needs to base scratch fs to be mounted, so only unmount overlay before check. Remove redundant definition of upperdir/workdir path, which also uses hardcoded path instead of the config vars OVL_UPPER/OVL_WORK. Signed-off-by: Amir Goldstein <amir73il@gmail.com> Reviewed-by: Eryu Guan <guaneryu@gmail.com> Signed-off-by: Eryu Guan <guaneryu@gmail.com>
This commit is contained in:
committed by
Eryu Guan
parent
91481af949
commit
e9f768ef0e
+1
-4
@@ -168,7 +168,7 @@ subdir_d=$($here/src/t_dir_type $pure_lower_dir $pure_lower_subdir_st_ino)
|
||||
[[ $subdir_d == "subdir d" ]] || \
|
||||
echo "Merged dir: Invalid d_ino reported for subdir"
|
||||
|
||||
_scratch_unmount
|
||||
$UMOUNT_PROG $SCRATCH_MNT
|
||||
|
||||
# check overlayfs
|
||||
_overlay_check_scratch_dirs $lowerdir $upperdir $workdir
|
||||
@@ -186,9 +186,6 @@ mkdir -p $lowerdir/test_dir/pure_lower_dir/subdir
|
||||
|
||||
_scratch_mkfs
|
||||
|
||||
upperdir=$OVL_BASE_SCRATCH_MNT/ovl-upper
|
||||
workdir=$OVL_BASE_SCRATCH_MNT/ovl-work
|
||||
|
||||
_overlay_scratch_mount_dirs $middir:$lowerdir $upperdir $workdir
|
||||
|
||||
# Copy up test_dir
|
||||
|
||||
Reference in New Issue
Block a user