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 <amir73il@gmail.com>
Reviewed-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>

diff --git a/tests/overlay/065 b/tests/overlay/065
index aaf589388413112a50ec0b602f3f8f1ed88a3d5a..481d8cca26a552b22394c7f5ae80f49748d74782 100755 (executable)
--- 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
 $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
 
 # 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
 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>&1 | _filter_error_mount
 $UMOUNT_PROG $SCRATCH_MNT 2>/dev/null