From 88d842435ef21b82af931f48ed3711a853bd0631 Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Sat, 5 Jan 2019 21:14:42 +0000 Subject: [PATCH] xlat: update FAN_* constants * xlat/fan_event_flags.in (FAN_OPEN_EXEC, FAN_OPEN_EXEC_PERM): New constants introduced by Linux kernel commits v5.0-rc1~124^2~5 and v5.0-rc1~124^2~3, respectively. * NEWS: Mention this. * tests/fanotify_mark.c (main): Update expected output. --- NEWS | 2 +- tests/fanotify_mark.c | 6 +++--- xlat/fan_event_flags.in | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index 19c173d6..43c8b491 100644 --- a/NEWS +++ b/NEWS @@ -2,7 +2,7 @@ Noteworthy changes in release ?.?? (????-??-??) =============================================== * Improvements - * Updated lists of BPF_*, BTRFS_*, IFLA_*, KERN_*, KVM_CAP_*, NDA_*, + * Updated lists of BPF_*, BTRFS_*, FAN_*, IFLA_*, KERN_*, KVM_CAP_*, NDA_*, NETNSA_*, NT_*, PR_*, SECCOMP_*, SCTP_*, V4L2_*, and *_MAGIC constants. * Bug fixes diff --git a/tests/fanotify_mark.c b/tests/fanotify_mark.c index e7ab7c3e..b19bcff7 100644 --- a/tests/fanotify_mark.c +++ b/tests/fanotify_mark.c @@ -133,14 +133,14 @@ main(void) # endif # if !XLAT_RAW "FAN_ACCESS|FAN_MODIFY|FAN_CLOSE_WRITE|FAN_OPEN|" - "FAN_ACCESS_PERM|FAN_ONDIR|FAN_EVENT_ON_CHILD|" - "0xdeadfeedb2ccbec4" + "FAN_OPEN_EXEC|FAN_ACCESS_PERM|FAN_OPEN_EXEC_PERM|" + "FAN_ONDIR|FAN_EVENT_ON_CHILD|0xdeadfeedb2c8aec4" # endif # if XLAT_VERBOSE " */" # endif }, - { ARG_ULL_STR(0xffffffffb7fcbfc4) + { ARG_ULL_STR(0xffffffffb7f8afc4) # if !XLAT_RAW " /* FAN_??? */" # endif diff --git a/xlat/fan_event_flags.in b/xlat/fan_event_flags.in index c8d4552b..119063b7 100644 --- a/xlat/fan_event_flags.in +++ b/xlat/fan_event_flags.in @@ -3,8 +3,10 @@ FAN_MODIFY 0x00000002 FAN_CLOSE_WRITE 0x00000008 FAN_CLOSE_NOWRITE 0x00000010 FAN_OPEN 0x00000020 +FAN_OPEN_EXEC 0x00001000 FAN_Q_OVERFLOW 0x00004000 FAN_OPEN_PERM 0x00010000 FAN_ACCESS_PERM 0x00020000 +FAN_OPEN_EXEC_PERM 0x00040000 FAN_ONDIR 0x40000000 FAN_EVENT_ON_CHILD 0x08000000 -- 2.40.0