Remove linux/fanotify.h

* linux/fanotify.h: Remove.
* Makefile.am (EXTRA_DIST): Remove it.
* fanotify.c: Do not include <linux/fanotify.h>.
* xlat/fan_classes.in: Add default values.
* xlat/fan_event_flags.in: Likewise.
* xlat/fan_init_flags.in: Likewise.
* xlat/fan_mark_flags.in: Likewise.

diff --git a/Makefile.am b/Makefile.am
index ddd2d0b0aed7d200fb14271ab4e2ecbdf1097860..35ba7b8eae81d567d4b71ee0560847fe2f970b34 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -199,7 +199,6 @@ EXTRA_DIST =                                \
        linux/crisv32/userent.h         \
        linux/dummy.h                   \
        linux/errnoent.h                \
-       linux/fanotify.h                \
        linux/hppa/arch_regs.h          \
        linux/hppa/errnoent.h           \
        linux/hppa/ioctls_arch0.h       \

diff --git a/fanotify.c b/fanotify.c
index 02094eab2bf1cf9eb6f0cc06aa9a50183b58bc76..e421b01e23ef572c7bafcedc4bb9f4a0782ce635 100644 (file)
--- a/fanotify.c
+++ b/fanotify.c
@@ -1,9 +1,15 @@
 #include "defs.h"
-#include <linux/fanotify.h>
 
 #include "xlat/fan_classes.h"
 #include "xlat/fan_init_flags.h"
 
+#ifndef FAN_ALL_CLASS_BITS
+# define FAN_ALL_CLASS_BITS (FAN_CLASS_NOTIF | FAN_CLASS_CONTENT | FAN_CLASS_PRE_CONTENT)
+#endif
+#ifndef FAN_NOFD
+# define FAN_NOFD -1
+#endif
+
 int
 sys_fanotify_init(struct tcb *tcp)
 {

diff --git a/linux/fanotify.h b/linux/fanotify.h
deleted file mode 100644 (file)
index 9934e08..0000000
--- a/linux/fanotify.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef _LINUX_FANOTIFY_H
-#define _LINUX_FANOTIFY_H
-
-/* the following events that user-space can register for */
-#define FAN_ACCESS             0x00000001      /* File was accessed */
-#define FAN_MODIFY             0x00000002      /* File was modified */
-#define FAN_CLOSE_WRITE                0x00000008      /* Writtable file closed */
-#define FAN_CLOSE_NOWRITE      0x00000010      /* Unwrittable file closed */
-#define FAN_OPEN               0x00000020      /* File was opened */
-
-#define FAN_Q_OVERFLOW         0x00004000      /* Event queued overflowed */
-
-#define FAN_OPEN_PERM          0x00010000      /* File open in perm check */
-#define FAN_ACCESS_PERM                0x00020000      /* File accessed in perm check */
-
-#define FAN_ONDIR              0x40000000      /* event occurred against dir */
-
-#define FAN_EVENT_ON_CHILD     0x08000000      /* interested in child events */
-
-/* helper events */
-#define FAN_CLOSE              (FAN_CLOSE_WRITE | FAN_CLOSE_NOWRITE) /* close */
-
-/* flags used for fanotify_init() */
-#define FAN_CLOEXEC            0x00000001
-#define FAN_NONBLOCK           0x00000002
-
-/* These are NOT bitwise flags.  Both bits are used togther.  */
-#define FAN_CLASS_NOTIF                0x00000000
-#define FAN_CLASS_CONTENT      0x00000004
-#define FAN_CLASS_PRE_CONTENT  0x00000008
-#define FAN_ALL_CLASS_BITS     (FAN_CLASS_NOTIF | FAN_CLASS_CONTENT | \
-                                FAN_CLASS_PRE_CONTENT)
-
-#define FAN_UNLIMITED_QUEUE    0x00000010
-#define FAN_UNLIMITED_MARKS    0x00000020
-
-#define FAN_ALL_INIT_FLAGS     (FAN_CLOEXEC | FAN_NONBLOCK | \
-                                FAN_ALL_CLASS_BITS | FAN_UNLIMITED_QUEUE |\
-                                FAN_UNLIMITED_MARKS)
-
-/* flags used for fanotify_modify_mark() */
-#define FAN_MARK_ADD           0x00000001
-#define FAN_MARK_REMOVE                0x00000002
-#define FAN_MARK_DONT_FOLLOW   0x00000004
-#define FAN_MARK_ONLYDIR       0x00000008
-#define FAN_MARK_MOUNT         0x00000010
-#define FAN_MARK_IGNORED_MASK  0x00000020
-#define FAN_MARK_IGNORED_SURV_MODIFY   0x00000040
-#define FAN_MARK_FLUSH         0x00000080
-
-/* No fd set in event */
-#define FAN_NOFD       -1
-
-#endif /* _LINUX_FANOTIFY_H */

diff --git a/xlat/fan_classes.in b/xlat/fan_classes.in
index d9f24dec46a3c53626cda9817588a7236cd96ad4..e7cd307872fbce7e74d69b9f45e56b2a0f732fb0 100644 (file)
--- a/xlat/fan_classes.in
+++ b/xlat/fan_classes.in
@@ -1,3 +1,3 @@
-FAN_CLASS_NOTIF
-FAN_CLASS_CONTENT
-FAN_CLASS_PRE_CONTENT
+FAN_CLASS_NOTIF 0x00000000
+FAN_CLASS_CONTENT 0x00000004
+FAN_CLASS_PRE_CONTENT 0x00000008

diff --git a/xlat/fan_event_flags.in b/xlat/fan_event_flags.in
index 79c6b2b5fd95f36a0bd5b3e5c8345376c29f7bdf..c8d4552b2b589d24c56a25a8a715914402a01c77 100644 (file)
--- a/xlat/fan_event_flags.in
+++ b/xlat/fan_event_flags.in
@@ -1,11 +1,10 @@
-FAN_ACCESS
-FAN_MODIFY
-FAN_CLOSE
-FAN_CLOSE_WRITE
-FAN_CLOSE_NOWRITE
-FAN_OPEN
-FAN_Q_OVERFLOW
-FAN_OPEN_PERM
-FAN_ACCESS_PERM
-FAN_ONDIR
-FAN_EVENT_ON_CHILD
+FAN_ACCESS 0x00000001
+FAN_MODIFY 0x00000002
+FAN_CLOSE_WRITE 0x00000008
+FAN_CLOSE_NOWRITE 0x00000010
+FAN_OPEN 0x00000020
+FAN_Q_OVERFLOW 0x00004000
+FAN_OPEN_PERM 0x00010000
+FAN_ACCESS_PERM 0x00020000
+FAN_ONDIR 0x40000000
+FAN_EVENT_ON_CHILD 0x08000000

diff --git a/xlat/fan_init_flags.in b/xlat/fan_init_flags.in
index 2752269fc31630577720c5c7397576934fb30943..ca33039236fda7d42951789ce2c0c0a03f480bea 100644 (file)
--- a/xlat/fan_init_flags.in
+++ b/xlat/fan_init_flags.in
@@ -1,4 +1,4 @@
-FAN_CLOEXEC
-FAN_NONBLOCK
-FAN_UNLIMITED_QUEUE
-FAN_UNLIMITED_MARKS
+FAN_CLOEXEC 0x00000001
+FAN_NONBLOCK 0x00000002
+FAN_UNLIMITED_QUEUE 0x00000010
+FAN_UNLIMITED_MARKS 0x00000020

diff --git a/xlat/fan_mark_flags.in b/xlat/fan_mark_flags.in
index 45266653c338eb9d8277d3be0186bc19ca2a7a57..134af4b28a2d6ae00c24349675d0d23ede5ce71a 100644 (file)
--- a/xlat/fan_mark_flags.in
+++ b/xlat/fan_mark_flags.in
@@ -1,8 +1,8 @@
-FAN_MARK_ADD
-FAN_MARK_REMOVE
-FAN_MARK_DONT_FOLLOW
-FAN_MARK_ONLYDIR
-FAN_MARK_MOUNT
-FAN_MARK_IGNORED_MASK
-FAN_MARK_IGNORED_SURV_MODIFY
-FAN_MARK_FLUSH
+FAN_MARK_ADD 0x00000001
+FAN_MARK_REMOVE 0x00000002
+FAN_MARK_DONT_FOLLOW 0x00000004
+FAN_MARK_ONLYDIR 0x00000008
+FAN_MARK_MOUNT 0x00000010
+FAN_MARK_IGNORED_MASK 0x00000020
+FAN_MARK_IGNORED_SURV_MODIFY 0x00000040
+FAN_MARK_FLUSH 0x00000080