xlat: update FAN_* constants

* xlat/fan_init_flags.in (FAN_REPORT_FID): New constant introduced
by Linux kernel commit v5.1-rc1~139^2~18.
* xlat/fan_event_flags.in (FAN_ATTRIB, FAN_MOVED_FROM, FAN_MOVED_TO,
FAN_CREATE, FAN_DELETE, FAN_DELETE_SELF, FAN_MOVE_SELF): New constants
introduced by Linux kernel commit v5.1-rc1~139^2~9.
* NEWS: Mention this.
* tests/fanotify_init.c (main): Update expected output.
* tests/fanotify_mark.c (main): Likewise.

diff --git a/NEWS b/NEWS
index 9dd2973af8af80b7ff7b6e6bdacd2f0c503dd764..b5431dbf2778b100873f6ff005b7c7217c8631d7 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -28,7 +28,7 @@ Noteworthy changes in release ?.? (????-??-??)
     and xtensa.
   * Wired up direct ipc syscalls on m68k, mips o32, powerpc, powerpc64,
     s390, s390x, sh, sparc, sparc64, and x86.
-  * Updated lists of BPF_*, NT_*, PR_SPEC_*, SO_*, and V4L2_* constants.
+  * Updated lists of BPF_*, FAN_*, NT_*, PR_SPEC_*, SO_*, and V4L2_* constants.
 
 Noteworthy changes in release 5.0 (2019-03-19)
 ==============================================

diff --git a/tests/fanotify_init.c b/tests/fanotify_init.c
index f139d971dab6c4f59b1848557c4a0bdd2d21987b..6e76e0a1234df08eab65d95d37c3e846b156434f 100644 (file)
--- a/tests/fanotify_init.c
+++ b/tests/fanotify_init.c
@@ -49,7 +49,8 @@ main(void)
                { (kernel_ulong_t) 0xffffffffffffffffULL,
                        "0xc /* FAN_CLASS_??? */|FAN_CLOEXEC|FAN_NONBLOCK|"
                        "FAN_UNLIMITED_QUEUE|FAN_UNLIMITED_MARKS|"
-                       "FAN_ENABLE_AUDIT|FAN_REPORT_TID|0xfffffe80" },
+                       "FAN_ENABLE_AUDIT|FAN_REPORT_TID|FAN_REPORT_FID|"
+                       "0xfffffc80" },
        };
        static const struct strval event_f_flags[] = {
                { F8ILL_KULONG_MASK, "O_RDONLY" },

diff --git a/tests/fanotify_mark.c b/tests/fanotify_mark.c
index cc6f3a44cb5bd39d48eb2e946070a678d46cc36f..10a8e5ffdf8ac2a1c401b51f25aff8eaf589b9ff 100644 (file)
--- a/tests/fanotify_mark.c
+++ b/tests/fanotify_mark.c
@@ -124,23 +124,40 @@ main(void)
        };
        static const struct strval64 masks[] = {
                { ARG_ULL_STR(0) },
-               { 0xdeadfeedfacebeefULL,
+               { 0xdeadfeedffffffffULL,
 # if XLAT_RAW || XLAT_VERBOSE
-                       "0xdeadfeedfacebeef"
+                       "0xdeadfeedffffffff"
 # endif
 # if XLAT_VERBOSE
                        " /* "
 # endif
 # if !XLAT_RAW
-                       "FAN_ACCESS|FAN_MODIFY|FAN_CLOSE_WRITE|FAN_OPEN|"
-                       "FAN_OPEN_EXEC|FAN_ACCESS_PERM|FAN_OPEN_EXEC_PERM|"
-                       "FAN_ONDIR|FAN_EVENT_ON_CHILD|0xdeadfeedb2c8aec4"
+                       "FAN_ACCESS|"
+                       "FAN_MODIFY|"
+                       "FAN_ATTRIB|"
+                       "FAN_CLOSE_WRITE|"
+                       "FAN_CLOSE_NOWRITE|"
+                       "FAN_OPEN|"
+                       "FAN_MOVED_FROM|"
+                       "FAN_MOVED_TO|"
+                       "FAN_CREATE|"
+                       "FAN_DELETE|"
+                       "FAN_DELETE_SELF|"
+                       "FAN_MOVE_SELF|"
+                       "FAN_OPEN_EXEC|"
+                       "FAN_Q_OVERFLOW|"
+                       "FAN_OPEN_PERM|"
+                       "FAN_ACCESS_PERM|"
+                       "FAN_OPEN_EXEC_PERM|"
+                       "FAN_ONDIR|"
+                       "FAN_EVENT_ON_CHILD|"
+                       "0xdeadfeedb7f8a000"
 # endif
 # if XLAT_VERBOSE
                        " */"
 # endif
                        },
-               { ARG_ULL_STR(0xffffffffb7f8afc4)
+               { ARG_ULL_STR(0xffffffffb7f8a000)
 # if !XLAT_RAW
                        " /* FAN_??? */"
 # endif

diff --git a/xlat/fan_event_flags.in b/xlat/fan_event_flags.in
index 119063b756062756ed097ae91c83bde865ce6920..53ecdb694f46bbb9b49b5971c2b5d95573ec731d 100644 (file)
--- a/xlat/fan_event_flags.in
+++ b/xlat/fan_event_flags.in
@@ -1,12 +1,19 @@
-FAN_ACCESS 0x00000001
-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
+FAN_ACCESS             0x00000001
+FAN_MODIFY             0x00000002
+FAN_ATTRIB             0x00000004
+FAN_CLOSE_WRITE                0x00000008
+FAN_CLOSE_NOWRITE      0x00000010
+FAN_OPEN               0x00000020
+FAN_MOVED_FROM         0x00000040
+FAN_MOVED_TO           0x00000080
+FAN_CREATE             0x00000100
+FAN_DELETE             0x00000200
+FAN_DELETE_SELF                0x00000400
+FAN_MOVE_SELF          0x00000800
+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

diff --git a/xlat/fan_init_flags.in b/xlat/fan_init_flags.in
index 54d681f8e85353d4bea996035a93dbce3b5008da..14a9fd242dcb9fb14def28bb12e980167431e939 100644 (file)
--- a/xlat/fan_init_flags.in
+++ b/xlat/fan_init_flags.in
@@ -4,3 +4,4 @@ FAN_UNLIMITED_QUEUE 0x00000010
 FAN_UNLIMITED_MARKS 0x00000020
 FAN_ENABLE_AUDIT 0x00000040
 FAN_REPORT_TID 0x00000100
+FAN_REPORT_FID 0x00000200