summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSigned-off-by: Wu Fengguang <fengguang.wu@intel.com>2010-02-08 12:31:29 -0500
committerEric Paris <eparis@redhat.com>2010-07-28 09:58:54 -0400
commit12ed2e36c98aec6c41559222e311f4aa15d254b6 (patch)
tree0fa2fd70e4b3f6a7315d037d27fde94641c5f204
parentecf081d1a73b077916f514f2ec744ded32b88ca1 (diff)
downloadop-kernel-dev-12ed2e36c98aec6c41559222e311f4aa15d254b6.zip
op-kernel-dev-12ed2e36c98aec6c41559222e311f4aa15d254b6.tar.gz
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>
-rw-r--r--include/asm-generic/fcntl.h2
-rw-r--r--include/linux/fs.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-generic/fcntl.h b/include/asm-generic/fcntl.h
index 009bd61..e3cbc38 100644
--- 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 50ef4d4..f9a0032 100644
--- 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
OpenPOWER on IntegriCloud