aboutsummaryrefslogtreecommitdiffstats
path: root/include
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 /include
parentecf081d1a73b077916f514f2ec744ded32b88ca1 (diff)
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>
Diffstat (limited to 'include')
-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 009bd6149d99..e3cbc38bdcc2 100644
--- a/include/asm-generic/fcntl.h
+++ b/include/asm-generic/fcntl.h
@@ -5,7 +5,7 @@
5 5
6/* 6/*
7 * FMODE_EXEC is 0x20 7 * FMODE_EXEC is 0x20
8 * FMODE_NONOTIFY is 0x800000 8 * FMODE_NONOTIFY is 0x1000000
9 * These cannot be used by userspace O_* until internal and external open 9 * These cannot be used by userspace O_* until internal and external open
10 * flags are split. 10 * flags are split.
11 * -Eric Paris 11 * -Eric Paris
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 50ef4d4c95bf..f9a003278758 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -91,7 +91,7 @@ struct inodes_stat_t {
91#define FMODE_RANDOM ((__force fmode_t)0x1000) 91#define FMODE_RANDOM ((__force fmode_t)0x1000)
92 92
93/* File was opened by fanotify and shouldn't generate fanotify events */ 93/* File was opened by fanotify and shouldn't generate fanotify events */
94#define FMODE_NONOTIFY ((__force fmode_t)8388608) 94#define FMODE_NONOTIFY ((__force fmode_t)16777216) /* 0x1000000 */
95 95
96/* 96/*
97 * The below are the various read and write types that we support. Some of 97 * The below are the various read and write types that we support. Some of