On Wed 13-08-25 15:55:23, Xing Guo wrote:
> Commit c6d9775c2066 ("selftests/fs/mount-notify: build with tools include
> dir") introduces the struct __kernel_fsid_t to decouple dependency with
> headers_install. The commit forgets to define a macro for __kernel_fsid_t
> and it will cause type re-definition issue.
>
> Reported-by: kernel test robot <[email protected]>
> Closes: https://lore.kernel.org/oe-lkp/[email protected]
> Signed-off-by: Xing Guo <[email protected]>
> Acked-by: Amir Goldstein <[email protected]>
Christian, quick search didn't find this patch in your tree. Any reason you
didn't pick it up?
Honza
> ---
> .../mount-notify/mount-notify_test.c | 17 ++++++++---------
> .../mount-notify/mount-notify_test_ns.c | 18 ++++++++----------
> 2 files changed, 16 insertions(+), 19 deletions(-)
>
> diff --git
> a/tools/testing/selftests/filesystems/mount-notify/mount-notify_test.c
> b/tools/testing/selftests/filesystems/mount-notify/mount-notify_test.c
> index 63ce708d93ed..e4b7c2b457ee 100644
> --- a/tools/testing/selftests/filesystems/mount-notify/mount-notify_test.c
> +++ b/tools/testing/selftests/filesystems/mount-notify/mount-notify_test.c
> @@ -2,6 +2,13 @@
> // Copyright (c) 2025 Miklos Szeredi <[email protected]>
>
> #define _GNU_SOURCE
> +
> +// Needed for linux/fanotify.h
> +typedef struct {
> + int val[2];
> +} __kernel_fsid_t;
> +#define __kernel_fsid_t __kernel_fsid_t
> +
> #include <fcntl.h>
> #include <sched.h>
> #include <stdio.h>
> @@ -10,20 +17,12 @@
> #include <sys/mount.h>
> #include <unistd.h>
> #include <sys/syscall.h>
> +#include <sys/fanotify.h>
>
> #include "../../kselftest_harness.h"
> #include "../statmount/statmount.h"
> #include "../utils.h"
>
> -// Needed for linux/fanotify.h
> -#ifndef __kernel_fsid_t
> -typedef struct {
> - int val[2];
> -} __kernel_fsid_t;
> -#endif
> -
> -#include <sys/fanotify.h>
> -
> static const char root_mntpoint_templ[] =
> "/tmp/mount-notify_test_root.XXXXXX";
>
> static const int mark_cmds[] = {
> diff --git
> a/tools/testing/selftests/filesystems/mount-notify/mount-notify_test_ns.c
> b/tools/testing/selftests/filesystems/mount-notify/mount-notify_test_ns.c
> index 090a5ca65004..9f57ca46e3af 100644
> --- a/tools/testing/selftests/filesystems/mount-notify/mount-notify_test_ns.c
> +++ b/tools/testing/selftests/filesystems/mount-notify/mount-notify_test_ns.c
> @@ -2,6 +2,13 @@
> // Copyright (c) 2025 Miklos Szeredi <[email protected]>
>
> #define _GNU_SOURCE
> +
> +// Needed for linux/fanotify.h
> +typedef struct {
> + int val[2];
> +} __kernel_fsid_t;
> +#define __kernel_fsid_t __kernel_fsid_t
> +
> #include <fcntl.h>
> #include <sched.h>
> #include <stdio.h>
> @@ -10,21 +17,12 @@
> #include <sys/mount.h>
> #include <unistd.h>
> #include <sys/syscall.h>
> +#include <sys/fanotify.h>
>
> #include "../../kselftest_harness.h"
> -#include "../../pidfd/pidfd.h"
> #include "../statmount/statmount.h"
> #include "../utils.h"
>
> -// Needed for linux/fanotify.h
> -#ifndef __kernel_fsid_t
> -typedef struct {
> - int val[2];
> -} __kernel_fsid_t;
> -#endif
> -
> -#include <sys/fanotify.h>
> -
> static const char root_mntpoint_templ[] =
> "/tmp/mount-notify_test_root.XXXXXX";
>
> static const int mark_types[] = {
> --
> 2.50.1
>
--
Jan Kara <[email protected]>
SUSE Labs, CR
