Merge tag 'for_v4.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

Pull fsnotify updates from Jan Kara:
 "Amir's patches to implement superblock fanotify watches, Xiaoming's
  patch to enable reporting of thread IDs in fanotify events instead of
  TGIDs (sadly the patch got mis-attributed to Amir and I've noticed
  only now), and a fix of possible oops on umount caused by fsnotify
  infrastructure"

* tag 'for_v4.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  fsnotify: Fix busy inodes during unmount
  fs: group frequently accessed fields of struct super_block together
  fanotify: support reporting thread id instead of process id
  fanotify: add BUILD_BUG_ON() to count the bits of fanotify constants
  fsnotify: convert runtime BUG_ON() to BUILD_BUG_ON()
  fanotify: deprecate uapi FAN_ALL_* constants
  fanotify: simplify handling of FAN_ONDIR
  fsnotify: generalize handling of extra event flags
  fanotify: fix collision of internal and uapi mark flags
  fanotify: store fanotify_init() flags in group's fanotify_data
  fanotify: add API to attach/detach super block mark
  fsnotify: send path type events to group with super block marks
  fsnotify: add super block object type

1 files changed, 18 insertions, 7 deletions

diff --git a/include/uapi/linux/fanotify.h b/include/uapi/linux/fanotify.h
index 74247917de04..b86740d1c50a 100644
--- a/include/uapi/linux/fanotify.h
+++ b/include/uapi/linux/fanotify.h
@@ -27,10 +27,12 @@
 #define FAN_CLOEXEC             0x00000001
 #define FAN_NONBLOCK            0x00000002
 
-/* These are NOT bitwise flags.  Both bits are used togther.  */
+/* These are NOT bitwise flags.  Both bits are used together.  */
 #define FAN_CLASS_NOTIF         0x00000000
 #define FAN_CLASS_CONTENT       0x00000004
 #define FAN_CLASS_PRE_CONTENT   0x00000008
+
+/* Deprecated - do not use this in programs and do not add new flags here! */
 #define FAN_ALL_CLASS_BITS      (FAN_CLASS_NOTIF | FAN_CLASS_CONTENT | \
                                  FAN_CLASS_PRE_CONTENT)
 
@@ -38,6 +40,10 @@
 #define FAN_UNLIMITED_MARKS     0x00000020
 #define FAN_ENABLE_AUDIT        0x00000040
 
+/* Flags to determine fanotify event format */
+#define FAN_REPORT_TID          0x00000100      /* event->pid is thread id */
+
+/* Deprecated - do not use this in programs and do not add new flags here! */
 #define FAN_ALL_INIT_FLAGS      (FAN_CLOEXEC | FAN_NONBLOCK | \
                                  FAN_ALL_CLASS_BITS | FAN_UNLIMITED_QUEUE |\
                                  FAN_UNLIMITED_MARKS)
@@ -47,11 +53,18 @@
 #define FAN_MARK_REMOVE         0x00000002
 #define FAN_MARK_DONT_FOLLOW    0x00000004
 #define FAN_MARK_ONLYDIR        0x00000008
-#define FAN_MARK_MOUNT          0x00000010
+/* FAN_MARK_MOUNT is            0x00000010 */
 #define FAN_MARK_IGNORED_MASK   0x00000020
 #define FAN_MARK_IGNORED_SURV_MODIFY    0x00000040
 #define FAN_MARK_FLUSH          0x00000080
+/* FAN_MARK_FILESYSTEM is       0x00000100 */
 
+/* These are NOT bitwise flags.  Both bits can be used togther.  */
+#define FAN_MARK_INODE          0x00000000
+#define FAN_MARK_MOUNT          0x00000010
+#define FAN_MARK_FILESYSTEM     0x00000100
+
+/* Deprecated - do not use this in programs and do not add new flags here! */
 #define FAN_ALL_MARK_FLAGS      (FAN_MARK_ADD |\
                                  FAN_MARK_REMOVE |\
                                  FAN_MARK_DONT_FOLLOW |\
@@ -61,11 +74,7 @@
                                  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
- * the future and not break backward compatibility.  Apps will get only the
- * events that they originally wanted.  Be sure to add new events here!
- */
+/* Deprecated - do not use this in programs and do not add new flags here! */
 #define FAN_ALL_EVENTS (FAN_ACCESS |\
                         FAN_MODIFY |\
                         FAN_CLOSE |\
@@ -74,9 +83,11 @@
 /*
  * All events which require a permission response from userspace
  */
+/* Deprecated - do not use this in programs and do not add new flags here! */
 #define FAN_ALL_PERM_EVENTS (FAN_OPEN_PERM |\
                              FAN_ACCESS_PERM)
 
+/* Deprecated - do not use this in programs and do not add new flags here! */
 #define FAN_ALL_OUTGOING_EVENTS (FAN_ALL_EVENTS |\
                                  FAN_ALL_PERM_EVENTS |\
                                  FAN_Q_OVERFLOW)