overlay/065: Adapt test to relaxed rules
authorAmir Goldstein <amir73il@gmail.com>
Mon, 26 Apr 2021 16:01:43 +0000 (19:01 +0300)
committerEryu Guan <guaneryu@gmail.com>
Sun, 9 May 2021 13:50:22 +0000 (21:50 +0800)
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 <amir73il@gmail.com>
Reviewed-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
tests/overlay/065

index aaf5893..481d8cc 100755 (executable)
@@ -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