From: "Christian Brauner (Microsoft)" <brauner@xxxxxxxxxx> Hey everyone, As announced multiple times already we need to rename and split the idmapped mount testsuite into separate source files and also give it a better name to reflect the fact that it covers a lot more than just idmapped mounts. I have decided against compiling different binaries for now. Instead we compile a single vfstest binary that can be called with various command line switches to run the various test suites. This is not different than what we did for the idmapped-mounts binary. Of course, nothing prevents us from using multiple binaries in the future. Note that this will have a conflict with Jan's series at: https://lore.kernel.org/fstests/20220425131809.qzjrah7cw67mzzcw@zlang-mailbox/T/#m47d8da68ef1aff250918398e8d2228729a6acf97 If this patch series here is acceptable I'd pick up Jan's patch and apply it on top of mine as rebasing will introduce too many conflicts. Thanks! Christian Christian Brauner (11): src: rename idmapped-mounts folder src/vfs: rename idmapped-mounts.c file vfstest: rename struct t_idmapped_mounts utils: add missing global.h include utils: add struct vfstest_info utils: move helpers into utils missing: move sys_execveat() to missing.h utils: add struct test_suite vfstests: split idmapped mount tests into separate suite vfstest: split out btrfs idmapped mounts test vfstest: split out remaining idmapped mount tests .gitignore | 4 +- common/rc | 32 +- src/Makefile | 2 +- src/detached_mounts_propagation.c | 2 +- src/feature.c | 2 +- src/idmapped-mounts/utils.c | 425 - src/idmapped-mounts/utils.h | 130 - src/{idmapped-mounts => vfs}/Makefile | 14 +- src/vfs/btrfs-idmapped-mounts.c | 3854 +++++ src/vfs/btrfs-idmapped-mounts.h | 15 + .../idmapped-mounts.c | 11865 ++++------------ src/vfs/idmapped-mounts.h | 17 + src/{idmapped-mounts => vfs}/missing.h | 11 + src/{idmapped-mounts => vfs}/mount-idmapped.c | 0 src/vfs/utils.c | 1003 ++ src/vfs/utils.h | 364 + src/vfs/vfstest.c | 1952 +++ tests/btrfs/245 | 2 +- tests/generic/633 | 2 +- tests/generic/644 | 2 +- tests/generic/645 | 2 +- tests/generic/656 | 2 +- tests/xfs/152 | 4 +- tests/xfs/153 | 2 +- 24 files changed, 9952 insertions(+), 9756 deletions(-) delete mode 100644 src/idmapped-mounts/utils.c delete mode 100644 src/idmapped-mounts/utils.h rename src/{idmapped-mounts => vfs}/Makefile (59%) create mode 100644 src/vfs/btrfs-idmapped-mounts.c create mode 100644 src/vfs/btrfs-idmapped-mounts.h rename src/{idmapped-mounts => vfs}/idmapped-mounts.c (50%) create mode 100644 src/vfs/idmapped-mounts.h rename src/{idmapped-mounts => vfs}/missing.h (93%) rename src/{idmapped-mounts => vfs}/mount-idmapped.c (100%) create mode 100644 src/vfs/utils.c create mode 100644 src/vfs/utils.h create mode 100644 src/vfs/vfstest.c -- 2.32.0
