From 3b385bf1e90f9d59213b4c198cabe2480d9ca9ef Mon Sep 17 00:00:00 2001 From: Amir Goldstein Date: Tue, 3 Jun 2025 12:07:42 +0200 Subject: [PATCH] generic/604: do not run with overlayfs MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Overlayfs does not allow mounting over again with the same layers until umount is fully completed, so is not appropriate for this test which tries to mount in parallel to umount. This is manifested as the test failure below when overlayfs strict mount checks are enabled by enabling the index feature: $ echo Y > /sys/module/overlay/parameters/index ... +mount: /vdf/ovl-mnt: /vdf already mounted or mount point busy. + dmesg(1) may have more information after failed mount system call. +mount /vdf /vdf/ovl-mnt failed Opt-out of this test with overlayfs and remove the hacks that were placed by commit 06cee932 ("generic/604: Fix for overlayfs") to make the test pass with overlayfs in the first place. Tested-by: André Almeida Signed-off-by: Amir Goldstein Reviewed-by: Zorro Lang Signed-off-by: Zorro Lang --- tests/generic/604 | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/generic/604 b/tests/generic/604 index 744d3456..481250fd 100755 --- a/tests/generic/604 +++ b/tests/generic/604 @@ -13,6 +13,9 @@ _begin_fstest auto quick mount # Import common functions. . ./common/filter +# Overlayfs does not allow mounting over again with the same layers +# until umount is fully completed, so is not appropriate for this test. +_exclude_fs overlay # Modify as appropriate. _require_scratch @@ -22,11 +25,9 @@ _scratch_mount for i in $(seq 0 500); do $XFS_IO_PROG -f -c "pwrite 0 4K" $SCRATCH_MNT/$i >/dev/null done -# For overlayfs, avoid unmounting the base fs after _scratch_mount tries to -# mount the base fs. Delay the mount attempt by a small amount in the hope -# that the mount() call will try to lock s_umount /after/ umount has already -# taken it. -_unmount $SCRATCH_MNT & +# Delay the mount attempt by a small amount in the hope that the mount() call +# will try to lock s_umount /after/ umount has already taken it. +_scratch_unmount & sleep 0.01s ; _scratch_mount wait -- 2.39.5