@@ -201,11 +201,6 @@ static inline int fanotify_init_flags_supported_on_fs(unsigned int flags, const
return fanotify_flags_supported_on_fs(flags, FAN_MARK_INODE, FAN_ACCESS, fname);
}
-static inline int fanotify_init_flags_supported_by_kernel(unsigned int flags)
-{
- return fanotify_init_flags_supported_on_fs(flags, NULL);
-}
-
static inline int fanotify_mark_supported_on_fs(uint64_t flag, const char *fname)
{
return fanotify_flags_supported_on_fs(FAN_CLASS_NOTIF, flag, FAN_ACCESS, fname);
@@ -280,10 +275,6 @@ static inline void fanotify_flags_err_msg(const char *flags_str,
fanotify_flags_err_msg(#flags, __FILE__, __LINE__, tst_brk_, \
fanotify_init_flags_supported_on_fs(flags, fname))
-#define REQUIRE_FANOTIFY_INIT_FLAGS_SUPPORTED_BY_KERNEL(flags) \
- fanotify_flags_err_msg(#flags, __FILE__, __LINE__, tst_brk_, \
- fanotify_init_flags_supported_by_kernel(flags))
-
static inline int fanotify_handle_supported_by_kernel(int flag)
{
/*
@@ -50,7 +50,8 @@ static void do_setup(void)
* An explicit check for FAN_REPORT_PIDFD is performed early on in the
* test initialization as it's a prerequisite for all test cases.
*/
- REQUIRE_FANOTIFY_INIT_FLAGS_SUPPORTED_BY_KERNEL(FAN_REPORT_PIDFD);
+ REQUIRE_FANOTIFY_INIT_FLAGS_SUPPORTED_ON_FS(FAN_REPORT_PIDFD,
+ MOUNT_PATH);
}
static void do_test(unsigned int i)
@@ -119,7 +119,8 @@ static void do_setup(void)
* on in the test initialization as it's a prerequisite for
* all test cases.
*/
- REQUIRE_FANOTIFY_INIT_FLAGS_SUPPORTED_BY_KERNEL(FAN_REPORT_PIDFD);
+ REQUIRE_FANOTIFY_INIT_FLAGS_SUPPORTED_ON_FS(FAN_REPORT_PIDFD,
+ TEST_FILE);
fanotify_fd = SAFE_FANOTIFY_INIT(FAN_REPORT_PIDFD, O_RDONLY);
SAFE_FANOTIFY_MARK(fanotify_fd, FAN_MARK_ADD, FAN_OPEN, AT_FDCWD,