1 files changed, 29 insertions, 18 deletions

diff --git a/include/linux/fanotify.h b/include/linux/fanotify.h
index f0949a57ca9d..0f0121467fc4 100644
--- a/include/linux/fanotify.h
+++ b/include/linux/fanotify.h
@@ -6,18 +6,19 @@
 /* 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      /* Unwrittable file closed */
-#define FAN_CLOSE_NOWRITE       0x00000010      /* Writtable file closed */
+#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_EVENT_ON_CHILD      0x08000000      /* interested in child events */
-
-/* FIXME currently Q's have no limit.... */
 #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 */
 
@@ -25,7 +26,19 @@
 #define FAN_CLOEXEC             0x00000001
 #define FAN_NONBLOCK            0x00000002
 
-#define FAN_ALL_INIT_FLAGS      (FAN_CLOEXEC | FAN_NONBLOCK)
+/* 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
@@ -36,6 +49,10 @@
 #define FAN_MARK_IGNORED_MASK   0x00000020
 #define FAN_MARK_IGNORED_SURV_MODIFY    0x00000040
 #define FAN_MARK_FLUSH          0x00000080
+#ifdef __KERNEL__
+/* not valid from userspace, only kernel internal */
+#define FAN_MARK_ONDIR          0x00000100
+#endif
 
 #define FAN_ALL_MARK_FLAGS      (FAN_MARK_ADD |\
                                  FAN_MARK_REMOVE |\
@@ -43,7 +60,8 @@
                                  FAN_MARK_ONLYDIR |\
                                  FAN_MARK_MOUNT |\
                                  FAN_MARK_IGNORED_MASK |\
-                                 FAN_MARK_IGNORED_SURV_MODIFY)
+                                 FAN_MARK_IGNORED_SURV_MODIFY |\
+                                 FAN_MARK_FLUSH)
 
 /*
  * All of the events - we build the list by hand so that we can add flags in
@@ -65,15 +83,15 @@
                                  FAN_ALL_PERM_EVENTS |\
                                  FAN_Q_OVERFLOW)
 
-#define FANOTIFY_METADATA_VERSION       1
+#define FANOTIFY_METADATA_VERSION       2
 
 struct fanotify_event_metadata {
         __u32 event_len;
         __u32 vers;
+        __aligned_u64 mask;
         __s32 fd;
-        __u64 mask;
-        __s64 pid;
-} __attribute__ ((packed));
+        __s32 pid;
+};
 
 struct fanotify_response {
         __s32 fd;
@@ -95,11 +113,4 @@ struct fanotify_response {
                                 (long)(meta)->event_len >= (long)FAN_EVENT_METADATA_LEN && \
                                 (long)(meta)->event_len <= (long)(len))
 
-#ifdef __KERNEL__
-
-struct fanotify_wait {
-        struct fsnotify_event *event;
-        __s32 fd;
-};
-#endif /* __KERNEL__ */
 #endif /* _LINUX_FANOTIFY_H */