Skip to contentSkip to conversation

generic: remove incorrect _require_idmapped_mounts checks

PATCH In review Amir Goldstein 2 participants 2 messages May 26, 2025 – May 30, 2025 VFS

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 generic: remove incorrect _require_idmapped_mounts checks

commit f5661920 ("generic: add missed _require_idmapped_mounts check") wrongly adds _require_idmapped_mounts to tests that do not require idmapped mounts support.

The added _require_idmapped_mounts in test generic/633 goes against commit d8dee122 ("idmapped-mounts: always run generic vfs tests") that intentionally removed this requirement from the generic tests.

The added _require_idmapped_mounts in tests generic/69{6,7} causes those tests not to run with overlayfs, which does not support idmapped mounts. However, those tests are regression tests to kernel commit 1639a49ccdce ("fs: move S_ISGID stripping into the vfs_*() helpers") which is documented as also solving a correction issue with overlayfs, so removing this test converage is very much undesired.

Remove the incorrectly added _require_idmapped_mounts checks. Also fix the log in _require_idmapped_mounts to say that "idmapped mounts not support by $FSTYP", which is what the helper checks instead of "vfstests not support by $FSTYP" which is incorrect.

Cc Yang Xu <[email protected]>
Cc Anthony Iliopoulos <[email protected]>
Cc David Disseldorp <[email protected]>

---

Christian,

Please confirm that I am not missing anything.

should we leave those tests or remove them from the idmapped test group?

Thanks,
Amir.

 common/rc         | 2 +-
 tests/generic/633 | 1 -
 tests/generic/696 | 1 -
 tests/generic/697 | 1 -
 4 files changed, 1 insertion(+), 4 deletions(-)
common/rc +1 -1
index bffd576a..96d65d1c 100644
@@ -2639,7 +2639,7 @@ _require_idmapped_mounts()
 		--fstype "$FSTYP"
 
 	if [ $? -ne 0 ]; then
-		_notrun "vfstest not support by $FSTYP"
+		_notrun "idmapped mounts not support by $FSTYP"
 	fi
 }
 
tests/generic/633 +0 -1
index f58dbbf5..b683c427 100755
@@ -12,7 +12,6 @@ _begin_fstest auto quick atime attr cap idmapped io_uring mount perms rw unlink
 # Import common functions.
 . ./common/filter
 
-_require_idmapped_mounts
 _require_test
 
 echo "Silence is golden"
tests/generic/696 +0 -1
index d2e86c96..48b3aea0 100755
@@ -17,7 +17,6 @@ _begin_fstest auto quick cap idmapped mount perms rw unlink
 # Import common functions.
 . ./common/filter
 
-_require_idmapped_mounts
 _require_test
 _require_scratch
 _fixed_by_kernel_commit ac6800e279a2 \
tests/generic/697 +0 -1
index 1ce673f7..66444a95 100755
@@ -17,7 +17,6 @@ _begin_fstest auto quick cap acl idmapped mount perms rw unlink
 . ./common/filter
 . ./common/attr
 
-_require_idmapped_mounts
 _require_test
 _require_acls
 _fixed_by_kernel_commit 1639a49ccdce \
Signature · 1 line
2.34.1
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 20 lines · Amir Goldstein

commit f5661920 ("generic: add missed _require_idmapped_mounts check") wrongly adds _require_idmapped_mounts to tests that do not require idmapped mounts support.

The added _require_idmapped_mounts in test generic/633 goes against commit d8dee122 ("idmapped-mounts: always run generic vfs tests") that intentionally removed this requirement from the generic tests.

The added _require_idmapped_mounts in tests generic/69{6,7} causes those tests not to run with overlayfs, which does not support idmapped mounts. However, those tests are regression tests to kernel commit 1639a49ccdce ("fs: move S_ISGID stripping into the vfs_*() helpers") which is documented as also solving a correction issue with overlayfs, so removing this test converage is very much undesired.

Remove the incorrectly added _require_idmapped_mounts checks. Also fix the log in _require_idmapped_mounts to say that "idmapped mounts not support by $FSTYP", which is what the helper checks instead of "vfstests not support by $FSTYP" which is incorrect.

Quoted 5 lines
Cc Yang Xu <[email protected]>
Cc Anthony Iliopoulos <[email protected]>
Cc David Disseldorp <[email protected]>

---

Seems correct to me: