fsnotify: tidy up FS_ and FAN_ constants

Order by value, so the free value ranges are easier to find.

Link: https://lore.kernel.org/r/20200319151022.31456-2-amir73il@gmail.com
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Jan Kara <jack@suse.cz>

diff --git a/include/linux/fsnotify_backend.h b/include/linux/fsnotify_backend.h
index 1915bdba2fad9a64407850c376e21eca8f0ecf41..db3cabb4600e0eec37730e9592a389135c84b787 100644 (file)
--- a/include/linux/fsnotify_backend.h
+++ b/include/linux/fsnotify_backend.h
@@ -49,16 +49,15 @@
 #define FS_OPEN_EXEC_PERM      0x00040000      /* open/exec event in a permission hook */
 
 #define FS_EXCL_UNLINK         0x04000000      /* do not send events if object is unlinked */
-#define FS_ISDIR               0x40000000      /* event occurred against dir */
-#define FS_IN_ONESHOT          0x80000000      /* only send event once */
-
-#define FS_DN_RENAME           0x10000000      /* file renamed */
-#define FS_DN_MULTISHOT                0x20000000      /* dnotify multishot */
-
 /* This inode cares about things that happen to its children.  Always set for
  * dnotify and inotify. */
 #define FS_EVENT_ON_CHILD      0x08000000
 
+#define FS_DN_RENAME           0x10000000      /* file renamed */
+#define FS_DN_MULTISHOT                0x20000000      /* dnotify multishot */
+#define FS_ISDIR               0x40000000      /* event occurred against dir */
+#define FS_IN_ONESHOT          0x80000000      /* only send event once */
+
 #define FS_MOVE                        (FS_MOVED_FROM | FS_MOVED_TO)
 
 /*

diff --git a/include/uapi/linux/fanotify.h b/include/uapi/linux/fanotify.h
index b9effa6f8503767a43ba167acd62bce7e94c2eb8..2a1844edda47679caf2e7de1078df1d430103596 100644 (file)
--- a/include/uapi/linux/fanotify.h
+++ b/include/uapi/linux/fanotify.h
@@ -25,9 +25,9 @@
 #define FAN_ACCESS_PERM                0x00020000      /* File accessed in perm check */
 #define FAN_OPEN_EXEC_PERM     0x00040000      /* File open/exec in perm check */
 
-#define FAN_ONDIR              0x40000000      /* event occurred against dir */
+#define FAN_EVENT_ON_CHILD     0x08000000      /* Interested in child events */
 
-#define FAN_EVENT_ON_CHILD     0x08000000      /* interested in child events */
+#define FAN_ONDIR              0x40000000      /* Event occurred against dir */
 
 /* helper events */
 #define FAN_CLOSE              (FAN_CLOSE_WRITE | FAN_CLOSE_NOWRITE) /* close */