fanotify: FMODE_NONOTIFY and __O_SYNC in sparc conflict

sparc used the same value as FMODE_NONOTIFY so change FMODE_NONOTIFY to be
something unique.

Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Eric Paris <eparis@redhat.com>

diff --git a/include/asm-generic/fcntl.h b/include/asm-generic/fcntl.h
index 009bd6149d99518f983e6529cc9f6c2b59ab104d..e3cbc38bdcc215bf95b890c340c23da5ecf88d47 100644 (file)
--- a/include/asm-generic/fcntl.h
+++ b/include/asm-generic/fcntl.h
@@ -5,7 +5,7 @@
 
 /*
  * FMODE_EXEC is 0x20
- * FMODE_NONOTIFY is 0x800000
+ * FMODE_NONOTIFY is 0x1000000
  * These cannot be used by userspace O_* until internal and external open
  * flags are split.
  * -Eric Paris

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 50ef4d4c95bf0baaac2f74578e5a64acd8b9e460..f9a00327875886090988b2974c5fa0276c839d2f 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -91,7 +91,7 @@ struct inodes_stat_t {
 #define FMODE_RANDOM           ((__force fmode_t)0x1000)
 
 /* File was opened by fanotify and shouldn't generate fanotify events */
-#define FMODE_NONOTIFY         ((__force fmode_t)8388608)
+#define FMODE_NONOTIFY         ((__force fmode_t)16777216) /* 0x1000000 */
 
 /*
  * The below are the various read and write types that we support. Some of