On Sat, 30 Jan 2010 17:45:16 +0800 Wu Fengguang <fengguang.wu@xxxxxxxxx> wrote: > FMODE_NONOTIFY=0x800000 collides with __O_SYNC in sparc, > so change it to 0x1000000. > > CC: Eric Paris <eparis@xxxxxxxxxx> > Signed-off-by: Wu Fengguang <fengguang.wu@xxxxxxxxx> > --- > include/asm-generic/fcntl.h | 2 +- > include/linux/fs.h | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > --- linux-mm.orig/include/asm-generic/fcntl.h 2010-01-13 10:16:27.000000000 +0800 > +++ linux-mm/include/asm-generic/fcntl.h 2010-01-30 17:40:48.000000000 +0800 > @@ -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 > --- linux-mm.orig/include/linux/fs.h 2010-01-30 17:14:14.000000000 +0800 > +++ linux-mm/include/linux/fs.h 2010-01-30 17:41:04.000000000 +0800 > @@ -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)0x800000) > +#define FMODE_NONOTIFY ((__force fmode_t)0x1000000) > > /* > * The below are the various read and write types that we support. Some of > Eric, please fix up "vfs: introduce FMODE_NONOTIFY" in your tree? -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html