From: Amir Goldstein Date: Thu, 26 Apr 2018 05:53:25 +0000 (-0600) Subject: overlay/041: fix call to _overlay_check_scratch_dirs X-Git-Tag: v2022.05.01~1591 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e9f768ef0ebb71d39ced4c6ff7ff796018958648;p=users%2Fhch%2Fxfstests-dev.git 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 Reviewed-by: Eryu Guan Signed-off-by: Eryu Guan --- diff --git a/tests/overlay/041 b/tests/overlay/041 index 4e72348d3..f3be746a0 100755 --- a/tests/overlay/041 +++ b/tests/overlay/041 @@ -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