From 6159ae7faf4cb293de400f81e2554ac35072faa1 Mon Sep 17 00:00:00 2001 From: Amir Goldstein Date: Mon, 26 Apr 2021 19:01:43 +0300 Subject: [PATCH] overlay/065: Adapt test to relaxed rules Kernel commit 708fa01597fa ("ovl: allow upperdir inside lowerdir") changes the rules w.r.t allowed overlayfs configurations, so the upperdir/lowerdir test that expects an error fails. Adapt the test to check the configuration that is still not allowed (lowerdir inside upperdir), which had no test coverage. Signed-off-by: Amir Goldstein Reviewed-by: Eryu Guan Signed-off-by: Eryu Guan --- tests/overlay/065 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/overlay/065 b/tests/overlay/065 index aaf58938..481d8cca 100755 --- a/tests/overlay/065 +++ b/tests/overlay/065 @@ -85,11 +85,12 @@ _overlay_scratch_mount_dirs $workdir $upperdir $workdir \ $UMOUNT_PROG $SCRATCH_MNT 2>/dev/null rm -rf $upperdir $workdir -mkdir $upperdir $workdir +mkdir -p $upperdir/lower $workdir # Try to mount an overlay with overlapping upperdir/lowerdir - expect ELOOP +# upperdir inside lowerdir is allowed, lowerdir inside upperdir is not allowed echo Overlapping upperdir/lowerdir -_overlay_scratch_mount_dirs $basedir $upperdir $workdir \ +_overlay_scratch_mount_dirs $upperdir/lower $upperdir $workdir \ 2>&1 | _filter_error_mount $UMOUNT_PROG $SCRATCH_MNT 2>/dev/null -- 2.39.5