@@ -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
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> --- Eryu, Test overlay/065 started failing on linux-next. With this fix the test passes on both master and linux-next. Thanks, Amir. tests/overlay/065 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)