diff options
| author | Amir Goldstein <amir73il@gmail.com> | 2018-04-25 23:53:25 -0600 |
|---|---|---|
| committer | Eryu Guan <guaneryu@gmail.com> | 2018-04-27 10:46:09 +0800 |
| commit | e9f768ef0ebb71d39ced4c6ff7ff796018958648 (patch) | |
| tree | f43ec1df34943a1f0643632befd0cb59107844cc | |
| parent | 91481af94986d17f95a7b0e0d41d771374112d6f (diff) | |
| download | xfstests-dev-e9f768ef0ebb71d39ced4c6ff7ff796018958648.tar.gz | |
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>
| -rwxr-xr-x | tests/overlay/041 | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/tests/overlay/041 b/tests/overlay/041 index 4e72348d3d..f3be746a0f 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 |