nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

fanotify: FMODE_NONOTIFY and __O_SYNC in sparc conflict

Browse source 
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>
This commit is contained in:
Signed-off-by: Wu Fengguang 2010-02-08 12:31:29 -05:00 committed by Eric Paris
parent ecf081d1a7
commit 12ed2e36c9
2 changed files with 2 additions and 2 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
include/asm-generic/fcntl.h
View file

@ -5,7 +5,7 @@
/* /*
* FMODE_EXEC is 0x20 * FMODE_EXEC is 0x20
* FMODE_NONOTIFY is 0x800000 * FMODE_NONOTIFY is 0x1000000
* These cannot be used by userspace O_* until internal and external open * These cannot be used by userspace O_* until internal and external open
* flags are split. * flags are split.
* -Eric Paris * -Eric Paris

2
include/linux/fs.h
View file

@ -91,7 +91,7 @@ struct inodes_stat_t {
#define FMODE_RANDOM ((__force fmode_t)0x1000) #define FMODE_RANDOM ((__force fmode_t)0x1000)
/* File was opened by fanotify and shouldn't generate fanotify events */ /* 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 * The below are the various read and write types that we support. Some of