apfs/apfstests
0
0
Fork 0
mirror of https://github.com/linux-apfs/apfstests.git synced 2026-05-01 15:01:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

overlay/036: fix upper/lower dir mismatch

Browse Source 
Mount option index=on checks on mount that upper dir is not being
reused with a different lower dir than the first lower dir it was
mounted with. This behavior is verified by test overlay/037.

In this test however, it is not desired to fail mount on mismatch of
upper/lower, so use the matching upper/lower dirs in this test.

The mismatch went unnoticed because the index=off mounts do not
verify lower dir and the index=on mounts fails on EBUSY (dir in use
by another live mount) before failing on ESTALE (upper/lower dir
mismatch).

Never the less, fix the mismatch, so a change in the kernel between
the two sanity checks (EBUSY vs. ESTALE) won't break the test.

Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
This commit is contained in:
Amir Goldstein
2018-01-26 09:59:06 +02:00
committed by Eryu Guan
parent aee21da0fd
commit 7aa1d4bcd4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/overlay/036
+2 -2
View File
@@ -90,7 +90,7 @@ _overlay_mount_dirs $lowerdir $upperdir $workdir \
# Try to mount another overlay with the same upperdir # Try to mount another overlay with the same upperdir
# with index=off - expect success # with index=off - expect success
_overlay_mount_dirs $lowerdir2 $upperdir $workdir2 \ _overlay_mount_dirs $lowerdir $upperdir $workdir2 \
overlay0 $SCRATCH_MNT -oindex=off && \ overlay0 $SCRATCH_MNT -oindex=off && \
$UMOUNT_PROG $SCRATCH_MNT $UMOUNT_PROG $SCRATCH_MNT
@@ -102,7 +102,7 @@ _overlay_mount_dirs $lowerdir2 $upperdir2 $workdir \
# Try to mount another overlay with the same upperdir # Try to mount another overlay with the same upperdir
# with index=on - expect EBUSY # with index=on - expect EBUSY
_overlay_mount_dirs $lowerdir2 $upperdir $workdir2 \ _overlay_mount_dirs $lowerdir $upperdir $workdir2 \
overlay2 $SCRATCH_MNT -oindex=on 2>&1 | _filter_busy_mount overlay2 $SCRATCH_MNT -oindex=on 2>&1 | _filter_busy_mount
# Try to mount another overlay with the same workdir # Try to mount another overlay with the same workdir