Christian, I was cleaning up my test env today to prepare for the test of fanotify mount ns notifications inside userns and tried to disolve the headers_install depenency. These patches got rid of the dependency for my kvm setup for the affected filesystems tests. Building with TOOLS_INCLUDES dir was recommended by John Hubbard [1]. NOTE #1: these patches are based on a merge of vfs-6.16.mount (changes wrappers.h) into v6.15-rc5 (changes mount-notify_test.c), so if this cleanup is acceptable, we should probably setup a stable branch for 6.16, so that I can base my fanotify patches on it. NOTE #2: some of the defines in wrappers.h are only left for mount_setattr, which was not converted to use TOOLS_INCLUDES. I did not want to mess with it. Thanks, Amir. [1] https://lore.kernel.org/linux-fsdevel/6dd57f0e-34b4-4456-854b-a8abdba9163b@xxxxxxxxxx/ Amir Goldstein (5): selftests/filesystems: move wrapper.h out of overlayfs subdir selftests/fs/statmount: build with tools include dir selftests/fs/mount-notify: build with tools include dir selftests/filesystems: create get_unique_mnt_id() helper selftests/filesystems: create setup_userns() helper tools/include/uapi/linux/fanotify.h | 274 ++++++++++++++++++ tools/include/uapi/linux/mount.h | 235 +++++++++++++++ tools/include/uapi/linux/nsfs.h | 45 +++ .../filesystems/mount-notify/Makefile | 6 +- .../mount-notify/mount-notify_test.c | 38 +-- .../selftests/filesystems/overlayfs/Makefile | 2 +- .../filesystems/overlayfs/dev_in_maps.c | 2 +- .../overlayfs/set_layers_via_fds.c | 2 +- .../selftests/filesystems/statmount/Makefile | 6 +- .../filesystems/statmount/statmount.h | 12 + .../filesystems/statmount/statmount_test_ns.c | 88 +----- tools/testing/selftests/filesystems/utils.c | 85 ++++++ tools/testing/selftests/filesystems/utils.h | 3 + .../filesystems/{overlayfs => }/wrappers.h | 0 .../testing/selftests/mount_setattr/Makefile | 2 + .../mount_setattr/mount_setattr_test.c | 2 +- 16 files changed, 684 insertions(+), 118 deletions(-) create mode 100644 tools/include/uapi/linux/fanotify.h create mode 100644 tools/include/uapi/linux/mount.h create mode 100644 tools/include/uapi/linux/nsfs.h rename tools/testing/selftests/filesystems/{overlayfs => }/wrappers.h (100%) -- 2.34.1