The idmapped mounts test suite has grown to cover a lot of generic vfs
functionality that is not concerned with idmapped mounts at all.
As was discussed upstream it's time to rename it to something that
reflects its generic nature.
Rename the basic structure used for the tests from struct
t_idmapped_mounts to struct test_struct.
Cc: Dave Chinner <david@xxxxxxxxxxxxx>
Cc: Amir Goldstein <amir73il@xxxxxxxxx>
Cc: Eryu Guan <guaneryu@xxxxxxxxx>
Cc: Christoph Hellwig <hch@xxxxxx>
Cc: Zorro Lang <zlang@xxxxxxxxxx>
Cc: "Darrick J. Wong" <djwong@xxxxxxxxxx>
Cc: fstests <fstests@xxxxxxxxxxxxxxx>
Signed-off-by: Christian Brauner (Microsoft) <brauner@xxxxxxxxxx>
---
src/vfs/utils.h | 6 ++++++
src/vfs/vfstest.c | 18 +++++++-----------
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/vfs/utils.h b/src/vfs/utils.h
index afb3c228..06247ec7 100644
--- a/src/vfs/utils.h
+++ b/src/vfs/utils.h
@@ -49,6 +49,12 @@
__internal_ret__; \
})
+struct test_struct {
+ int (*test)(void);
+ bool require_fs_allow_idmap;
+ const char *description;
+};
+
typedef enum idmap_type_t {
ID_TYPE_UID,
ID_TYPE_GID
diff --git a/src/vfs/vfstest.c b/src/vfs/vfstest.c
index 66768175..4d2fc93e 100644
--- a/src/vfs/vfstest.c
+++ b/src/vfs/vfstest.c
@@ -13829,11 +13829,7 @@ static const struct option longopts[] = {
{NULL, 0, 0, 0},
};
-struct t_idmapped_mounts {
- int (*test)(void);
- bool require_fs_allow_idmap;
- const char *description;
-} basic_suite[] = {
+struct test_struct basic_suite[] = {
{ acls, true, "posix acls on regular mounts", },
{ create_in_userns, true, "create operations in user namespace", },
{ device_node_in_userns, true, "device node in user namespace", },
@@ -13885,15 +13881,15 @@ struct t_idmapped_mounts {
{ threaded_idmapped_mount_interactions, true, "threaded operations on idmapped mounts", },
};
-struct t_idmapped_mounts fscaps_in_ancestor_userns[] = {
+struct test_struct fscaps_in_ancestor_userns[] = {
{ fscaps_idmapped_mounts_in_userns_valid_in_ancestor_userns, true, "fscaps on idmapped mounts in user namespace writing fscap valid in ancestor userns", },
};
-struct t_idmapped_mounts t_nested_userns[] = {
+struct test_struct t_nested_userns[] = {
{ nested_userns, true, "test that nested user namespaces behave correctly when attached to idmapped mounts", },
};
-struct t_idmapped_mounts t_btrfs[] = {
+struct test_struct t_btrfs[] = {
{ btrfs_subvolumes_fsids_mapped, true, "test subvolumes with mapped fsids", },
{ btrfs_subvolumes_fsids_mapped_userns, true, "test subvolumes with mapped fsids inside user namespace", },
{ btrfs_subvolumes_fsids_mapped_user_subvol_rm_allowed, true, "test subvolume deletion with user_subvol_rm_allowed mount option", },
@@ -13919,16 +13915,16 @@ struct t_idmapped_mounts t_btrfs[] = {
};
/* Test for commit 968219708108 ("fs: handle circular mappings correctly"). */
-struct t_idmapped_mounts t_setattr_fix_968219708108[] = {
+struct test_struct t_setattr_fix_968219708108[] = {
{ setattr_fix_968219708108, true, "test that setattr works correctly", },
};
-static bool run_test(struct t_idmapped_mounts suite[], size_t suite_size)
+static bool run_test(struct test_struct suite[], size_t suite_size)
{
int i;
for (i = 0; i < suite_size; i++) {
- struct t_idmapped_mounts *t = &suite[i];
+ struct test_struct *t = &suite[i];
int ret;
pid_t pid;
--
2.32.0
