Commit 12ed2e36 authored Feb 08, 2010 by Signed-off-by: Wu Fengguang Committed by Eric Paris Jul 28, 2010

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>

parent ecf081d1

include/asm-generic/fcntl.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

include/linux/fs.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -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